December 2010 - U-Boot

[U-Boot] [PATCH V4] mpc83xx:pcie:bugfix for mpc83xx pcie enumeration
by Baidu Boy 14 Dec '10

14 Dec '10

This patch fix a problem for the pcie enumeration for mpc83xx cpus.Without this we will not get correct value in hose->regions[...]. The pointer *reg in function mpc83xx_pcie_init_bus() shall not be changed. Because we will use this pointer as a parameter to call function mpc83xx_pcie_register_hose(). Signed-off-by: Baidu Boy <liucai.lfn(a)gmail.com> --- Changes for v2: - Add some description for the patch Changes for V3: - Avoid line wrap in the patch Changes for V4: - There are some errors in V3, resubmit the patch --- arch/powerpc/cpu/mpc83xx/pcie.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c index 1771c48..46a706d 100644 --- a/arch/powerpc/cpu/mpc83xx/pcie.c +++ b/arch/powerpc/cpu/mpc83xx/pcie.c @@ -201,18 +201,18 @@ static void mpc83xx_pcie_init_bus(int bus, out_le32(&out_win->tarl, 0); out_le32(&out_win->tarh, 0); - for (i = 0; i < 2; i++, reg++) { + for (i = 0; i < 2; i++) { u32 ar; - if (reg->size == 0) + if (reg[i].size == 0) break; out_win = &pex->bridge.pex_outbound_win[i + 1]; - out_le32(&out_win->bar, reg->phys_start); - out_le32(&out_win->tarl, reg->bus_start); + out_le32(&out_win->bar, reg[i].phys_start); + out_le32(&out_win->tarl, reg[i].bus_start); out_le32(&out_win->tarh, 0); - ar = PEX_OWAR_EN | (reg->size & PEX_OWAR_SIZE); - if (reg->flags & PCI_REGION_IO) + ar = PEX_OWAR_EN | (reg[i].size & PEX_OWAR_SIZE); + if (reg[i].flags & PCI_REGION_IO) ar |= PEX_OWAR_TYPE_IO; else ar |= PEX_OWAR_TYPE_MEM; -- 1.7.3.1.msysgit.0

2 1

[U-Boot] Please pull u-boot-mpc85xx.git
by Kumar Gala 14 Dec '10

14 Dec '10

The following changes since commit ac8983bcba75576c50307b5e8dc8fb848740ee61: Merge branch 'master' of git://git.denx.de/u-boot-imx (2010-12-09 20:52:44 +0100) are available in the git repository at: git://git.denx.de/u-boot-mpc85xx master John Schmoller (1): fsl_upm: Add MxMR/MDR synchronization Kumar Gala (1): tsec: Revert to setting TBICR_ANEG_ENABLE by default for SGMII P.V.Suresh (1): fsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after resetting the controller drivers/mmc/fsl_esdhc.c | 8 ++++---- drivers/mtd/nand/fsl_upm.c | 2 ++ drivers/net/tsec.c | 9 ++++----- include/configs/P1_P2_RDB.h | 8 -------- include/configs/xpedite537x.h | 10 ++++++++++ include/configs/xpedite550x.h | 10 ++++++++++ 6 files changed, 30 insertions(+), 17 deletions(-)

2 2

[U-Boot] Pull request: u-boot-arm (master + next)
by Wolfgang Denk 14 Dec '10

14 Dec '10

The following changes since commit ac8983bcba75576c50307b5e8dc8fb848740ee61: Merge branch 'master' of git://git.denx.de/u-boot-imx (2010-12-09 20:52:44 +0100) are available in the git repository at: git://git.denx.de/u-boot-arm.git ..BRANCH.NOT.VERIFIED.. Dirk Behme (1): OMAP: Timer: Replace bss variable by gd Nick Thompson (1): davinci: Rewrite timer.c to use tbl/tbu emulation variables in gd Nishanth Menon (1): omap3: emif|sdrc: use a single global data define Sandeep Paulraj (1): DaVinci DM6446: Config Update Wolfgang Denk (1): ARM: */start.S: use canonical asm syntax arch/arm/cpu/arm1136/start.S | 2 +- arch/arm/cpu/arm1176/start.S | 2 +- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/cpu/arm925t/start.S | 2 +- arch/arm/cpu/arm926ejs/davinci/timer.c | 77 ++++++++++++-------------------- arch/arm/cpu/arm926ejs/start.S | 2 +- arch/arm/cpu/arm946es/start.S | 2 +- arch/arm/cpu/arm_intcm/start.S | 2 +- arch/arm/cpu/armv7/omap-common/timer.c | 22 +++++----- arch/arm/cpu/armv7/omap3/emif4.c | 3 +- arch/arm/cpu/armv7/omap3/sdrc.c | 3 +- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/ixp/start.S | 2 +- arch/arm/cpu/lh7a40x/start.S | 2 +- arch/arm/cpu/pxa/start.S | 2 +- arch/arm/cpu/s3c44b0/start.S | 2 +- arch/arm/cpu/sa1100/start.S | 2 +- include/configs/davinci_dvevm.h | 19 +++++--- 19 files changed, 66 insertions(+), 86 deletions(-) The following changes since commit 917a62c0d292d9da45100a76151a9fa2d13a9cdc: Merge branch 'next' of git://git.denx.de/u-boot into next (2010-12-11 10:35:40 -0500) are available in the git repository at: git://git.denx.de/u-boot-arm.git next Balaji T K (1): ARMV7: OMAP4: twl6030 add battery charging support Dirk Behme (1): OMAP3: SPI driver board/ti/sdp4430/Makefile | 2 +- board/ti/sdp4430/cmd_bat.c | 58 +++++++ board/ti/sdp4430/sdp.c | 4 + drivers/power/twl6030.c | 124 ++++++++++++++- drivers/spi/Makefile | 1 + drivers/spi/omap3_spi.c | 352 +++++++++++++++++++++++++++++++++++++++ drivers/spi/omap3_spi.h | 117 +++++++++++++ include/configs/omap3_beagle.h | 2 + include/configs/omap4_sdp4430.h | 1 + include/twl6030.h | 45 +++++- 10 files changed, 701 insertions(+), 5 deletions(-) create mode 100644 board/ti/sdp4430/cmd_bat.c create mode 100644 drivers/spi/omap3_spi.c create mode 100644 drivers/spi/omap3_spi.h Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de The speed of time is one second per second.

1 0

[U-Boot] [PATCH] ARM: */start.S: use canonical asm syntax
by Wolfgang Denk 13 Dec '10

13 Dec '10

Make code build with older tool chains. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- arch/arm/cpu/arm1136/start.S | 2 +- arch/arm/cpu/arm1176/start.S | 2 +- arch/arm/cpu/arm720t/start.S | 2 +- arch/arm/cpu/arm920t/start.S | 2 +- arch/arm/cpu/arm925t/start.S | 2 +- arch/arm/cpu/arm926ejs/start.S | 2 +- arch/arm/cpu/arm946es/start.S | 2 +- arch/arm/cpu/arm_intcm/start.S | 2 +- arch/arm/cpu/armv7/start.S | 2 +- arch/arm/cpu/ixp/start.S | 2 +- arch/arm/cpu/lh7a40x/start.S | 2 +- arch/arm/cpu/pxa/start.S | 2 +- arch/arm/cpu/s3c44b0/start.S | 2 +- arch/arm/cpu/sa1100/start.S | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index d14a7bb..9a6f6cb 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -234,7 +234,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S index dc692ed..237dcfe 100644 --- a/arch/arm/cpu/arm1176/start.S +++ b/arch/arm/cpu/arm1176/start.S @@ -288,7 +288,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index f048bad..abfa124 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -203,7 +203,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S index aa014d0..08f178d 100644 --- a/arch/arm/cpu/arm920t/start.S +++ b/arch/arm/cpu/arm920t/start.S @@ -249,7 +249,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index 67e706b..2c0c869 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -240,7 +240,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 6c49c83..5519252 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -239,7 +239,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S index 4e75109..f9c9470 100644 --- a/arch/arm/cpu/arm946es/start.S +++ b/arch/arm/cpu/arm946es/start.S @@ -211,7 +211,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S index cbbc612..d28e745 100644 --- a/arch/arm/cpu/arm_intcm/start.S +++ b/arch/arm/cpu/arm_intcm/start.S @@ -207,7 +207,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index c71ef6c..684f2d2 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -209,7 +209,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index 87942cd..9f8c15b 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -333,7 +333,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/lh7a40x/start.S b/arch/arm/cpu/lh7a40x/start.S index 499b632..32dfe8b 100644 --- a/arch/arm/cpu/lh7a40x/start.S +++ b/arch/arm/cpu/lh7a40x/start.S @@ -220,7 +220,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index 0580adc..fbd0def 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -287,7 +287,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S index 50e3f21..9379af6 100644 --- a/arch/arm/cpu/s3c44b0/start.S +++ b/arch/arm/cpu/s3c44b0/start.S @@ -192,7 +192,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S index b34e946..7c2db4f 100644 --- a/arch/arm/cpu/sa1100/start.S +++ b/arch/arm/cpu/sa1100/start.S @@ -196,7 +196,7 @@ fixabs: mov r1, r1, LSR #4 /* r1 <- symbol index in .dynsym */ add r1, r10, r1 /* r1 <- address of symbol in table */ ldr r1, [r1, #4] /* r1 <- symbol value */ - add r1, r9 /* r1 <- relocated sym addr */ + add r1, r1, r9 /* r1 <- relocated sym addr */ b fixnext fixrel: /* relative fix: increase location by offset */ -- 1.7.3.2

1 1

[U-Boot] Please pull u-boot-ti/next
by s-paulraj＠ti.com 13 Dec '10

13 Dec '10

Wolfgang, Please pull u-boot-ti/next After adding the twl6030 patch i realized that Albert delegated this patch to himself. But i have seen no comments from him. So i did not ammend the pull request. If he has issues with this patch, we can drop it. Thanks, Sandeep The following changes since commit 917a62c0d292d9da45100a76151a9fa2d13a9cdc: Sandeep Paulraj (1): Merge branch 'next' of git://git.denx.de/u-boot into next are available in the git repository at: git://git.denx.de/u-boot-ti.git next Balaji T K (1): ARMV7: OMAP4: twl6030 add battery charging support Dirk Behme (1): OMAP3: SPI driver board/ti/sdp4430/Makefile | 2 +- board/ti/sdp4430/cmd_bat.c | 58 +++++++ board/ti/sdp4430/sdp.c | 4 + drivers/power/twl6030.c | 124 ++++++++++++++- drivers/spi/Makefile | 1 + drivers/spi/omap3_spi.c | 352 +++++++++++++++++++++++++++++++++++++++ drivers/spi/omap3_spi.h | 117 +++++++++++++ include/configs/omap3_beagle.h | 2 + include/configs/omap4_sdp4430.h | 1 + include/twl6030.h | 45 +++++- 10 files changed, 701 insertions(+), 5 deletions(-) create mode 100644 board/ti/sdp4430/cmd_bat.c create mode 100644 drivers/spi/omap3_spi.c create mode 100644 drivers/spi/omap3_spi.h

3 2

[U-Boot] Please pull u-boot-ti/master
by s-paulraj＠ti.com 13 Dec '10

13 Dec '10

The following changes since commit ac8983bcba75576c50307b5e8dc8fb848740ee61: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-imx are available in the git repository at: git://git.denx.de/u-boot-ti.git master Dirk Behme (1): OMAP: Timer: Replace bss variable by gd Nick Thompson (1): davinci: Rewrite timer.c to use tbl/tbu emulation variables in gd Sandeep Paulraj (1): DaVinci DM6446: Config Update arch/arm/cpu/arm926ejs/davinci/timer.c | 77 ++++++++++++-------------------- arch/arm/cpu/armv7/omap-common/timer.c | 22 +++++----- include/configs/davinci_dvevm.h | 19 +++++--- 3 files changed, 50 insertions(+), 68 deletions(-)

2 1

Re: [U-Boot] Pull request u-boot-marvell.git
by Wolfgang Denk 13 Dec '10

13 Dec '10

Dear Prafulla Wadaskar, In message <F766E4F80769BD478052FB6533FA745D19F11C124E(a)SC-VEXCH4.marvell.com> you wrote: > > are available in the git repository at: > > u-boot-marvell.git master branch. > > Prafulla Wadaskar (8): > (Ignore-already pulled by wolfgang) ARM: make timer variables in gt_t available for all ARM platforms > arm: Add Support for Marvell ARMADA 100 Familiy SoCs > gpio: Add Multi-Function-Pin configuration driver for Marvell SoCs > add Multi Function Pin configuration support for ARMADA100 > Serial: ns16550: Add support for CONFIG_SYS_NS16550_IER macro > Serial: Add UART support for Marvell ARMADA 100 SoCs. > mv-common.h: Add support for ARMADA100 Platforms > Armada100: Add Board Support for Marvell Aspenite-DB Are you sure this pull request is for "master"? These commits don't look like bug fixes to me; they appear to add new stuff instead? So should these go into "next" ? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de That Microsoft, the Trabant of the operating system world, may be glancing over the Berlin Wall at the Audis and BMWs and Mercedes. In their own universe Trabants and Ladas were mainstream too... -- Evan Leibovitch

1 0

[U-Boot] hello
by Jacob Josh 13 Dec '10

13 Dec '10

Hello, My name is Jacob Josh, I am the branch manager of Banco pichincha Quito Ecuador. I got your information during my search through the Internet.. I am 47years of age and married with 3 kids. It may interest you to hear that I am a Man of peace, but I do not know how you will feel about this because you may have double mind. But I am telling you that this is real and you are not going to regret after doing this transaction with me. I only hope that we can assist each other. But if you don't want this business offer kindly forget it and I will not contact you again. I have packaged a financial transaction that will benefit both of us, as the regional manager of Banco pichincha Quito Ecuador; it is my duty to send in a financial report to my head office in the capital city (Quito Ecuador) at the end of each year. On the course of the year 2009 end of year report, I discovered that my branch in which I am the manager made three million seven hundred and fifty thousand dollar [3, 750.000.00] which my head office is not aware of it and will never be aware of. I have since place this fund on what we call SUSPENSE ACCOUNT without any beneficiary. As an official of the bank I can not be directly connected to this fund, so this informed me of contacting you for us to work, so that you can assist and receive this fund into your bank account for us to SHARE. Mean While you will have 35% of the total fund, Note there are practically no risk involved, it will be bank to bank transfer, all I need from you is to stand claim as the original depositor of this fund who made the deposit with our branch so that my Head office can order the transfer to your designated bank account. If you accept this offer to work with me, I will appreciate it very much as soon as I receive your response I will give you details on how we can achieve it successfully. Please contact me with this email address: jacob.josh02(a)gala.net Best Regards Mr.Jacob Josh

1 0

[U-Boot] [PATCH] [v2] p1022ds: fix switching of DIU/LBC signals
by Timur Tabi 13 Dec '10

13 Dec '10

On the P1022, the pins which drive the video display (DIU) are muxed with the local bus controller (LBC), so if the DIU is active, the pins need to be temporarily muxed to LBC whenever accessing NOR flash. The code which handled this transition is checking and changing the wrong bits in PMUXCR. Also add a follow-up read after a write to NOR flash if we're going to mux back to DIU after the write, as described in the P1022 RM. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- I have no idea how this ever worked before, but without this fix, video on the P1022DS is completely broken. board/freescale/p1022ds/diu.c | 67 ++++++++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 10 deletions(-) diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c index 12b40a0..8f5305c 100644 --- a/board/freescale/p1022ds/diu.c +++ b/board/freescale/p1022ds/diu.c @@ -32,6 +32,7 @@ #define PMUXCR_ELBCDIU_MASK 0xc0000000 #define PMUXCR_ELBCDIU_NOR16 0x80000000 +#define PMUXCR_ELBCDIU_DIU 0x40000000 /* * DIU Area Descriptor @@ -131,9 +132,8 @@ int platform_diu_init(unsigned int *xres, unsigned int *yres) px_brdcfg0 = in_8(lbc_lcs1_ba); out_8(lbc_lcs1_ba, px_brdcfg0 | PX_BRDCFG0_ELBC_DIU); - /* Setting PMUXCR to switch to DVI from ELBC */ - clrsetbits_be32(&gur->pmuxcr, - PMUXCR_ELBCDIU_MASK, PMUXCR_ELBCDIU_NOR16); + /* Set PMUXCR to switch the muxed pins from the LBC to the DIU */ + clrsetbits_be32(&gur->pmuxcr, PMUXCR_ELBCDIU_MASK, PMUXCR_ELBCDIU_DIU); pmuxcr = in_be32(&gur->pmuxcr); return fsl_diu_init(*xres, pixel_format, 0); @@ -161,7 +161,7 @@ static int set_mux_to_lbc(void) ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; /* Switch the muxes only if they're currently set to DIU mode */ - if ((in_be32(&gur->pmuxcr) & PMUXCR_ELBCDIU_MASK) == + if ((in_be32(&gur->pmuxcr) & PMUXCR_ELBCDIU_MASK) != PMUXCR_ELBCDIU_NOR16) { /* * In DIU mode, the PIXIS can only be accessed indirectly @@ -216,8 +216,17 @@ void flash_write8(u8 value, void *addr) int sw = set_mux_to_lbc(); __raw_writeb(value, addr); - if (sw) + if (sw) { + /* + * To ensure the post-write is completed to eLBC, software must + * perform a dummy read from one valid address from eLBC space + * before changing the eLBC_DIU from NOR mode to DIU mode. + * set_mux_to_diu() includes a sync that will ensure the + * __raw_readb() completes before it switches the mux. + */ + __raw_readb(addr); set_mux_to_diu(); + } } void flash_write16(u16 value, void *addr) @@ -225,8 +234,17 @@ void flash_write16(u16 value, void *addr) int sw = set_mux_to_lbc(); __raw_writew(value, addr); - if (sw) + if (sw) { + /* + * To ensure the post-write is completed to eLBC, software must + * perform a dummy read from one valid address from eLBC space + * before changing the eLBC_DIU from NOR mode to DIU mode. + * set_mux_to_diu() includes a sync that will ensure the + * __raw_readb() completes before it switches the mux. + */ + __raw_readb(addr); set_mux_to_diu(); + } } void flash_write32(u32 value, void *addr) @@ -234,18 +252,47 @@ void flash_write32(u32 value, void *addr) int sw = set_mux_to_lbc(); __raw_writel(value, addr); - if (sw) + if (sw) { + /* + * To ensure the post-write is completed to eLBC, software must + * perform a dummy read from one valid address from eLBC space + * before changing the eLBC_DIU from NOR mode to DIU mode. + * set_mux_to_diu() includes a sync that will ensure the + * __raw_readb() completes before it switches the mux. + */ + __raw_readb(addr); set_mux_to_diu(); + } } void flash_write64(u64 value, void *addr) { int sw = set_mux_to_lbc(); + uint32_t *p = addr; - /* There is no __raw_writeq(), so do the write manually */ - *(volatile u64 *)addr = value; - if (sw) + /* + * There is no __raw_writeq(), so do the write manually. We don't trust + * the compiler, so we use inline assembly. + */ + __asm__ __volatile__( + "stw%U0%X0 %2,%0;\n" + "stw%U1%X1 %3,%1;\n" + : "=m" (*p), "=m" (*(p + 1)) + : "r" ((uint32_t) (value >> 32)), "r" ((uint32_t) (value))); + + if (sw) { + /* + * To ensure the post-write is completed to eLBC, software must + * perform a dummy read from one valid address from eLBC space + * before changing the eLBC_DIU from NOR mode to DIU mode. We + * read addr+4 because we just wrote to addr+4, so that's how we + * maintain execution order. set_mux_to_diu() includes a sync + * that will ensure the __raw_readb() completes before it + * switches the mux. + */ + __raw_readb(addr + 4); set_mux_to_diu(); + } } u8 flash_read8(void *addr) -- 1.7.2.3

2 2

[U-Boot] [PATCH] drivers/mmc/fsl_esdhc: Set the eSHDC DMACTL[SNOOP] bit after the completion of Host Controller reset.
by P.V.Suresh 13 Dec '10

13 Dec '10

eSDHC host controller reset results in clearing of snoop bit also. This patch sets the SNOOP bit after the completion of host controller reset. Without this patch mmc reads are not consistent. Signed-off-by: P.V.Suresh <pala(a)freescale.com> --- This patch applies to master branch of git://git.denx.de/u-boot.git drivers/mmc/fsl_esdhc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index a368fe6..57cd4ee 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -384,10 +384,6 @@ static int esdhc_init(struct mmc *mmc) int ret = 0; u8 card_absent; - /* Enable cache snooping */ - if (cfg && !cfg->no_snoop) - esdhc_write32(&regs->scr, 0x00000040); - /* Reset the entire host controller */ esdhc_write32(&regs->sysctl, SYSCTL_RSTA); @@ -395,6 +391,10 @@ static int esdhc_init(struct mmc *mmc) while ((esdhc_read32(&regs->sysctl) & SYSCTL_RSTA) && --timeout) udelay(1000); + /* Enable cache snooping */ + if (cfg && !cfg->no_snoop) + esdhc_write32(&regs->scr, 0x00000040); + esdhc_write32(&regs->sysctl, SYSCTL_HCKEN | SYSCTL_IPGEN); /* Set the initial clock speed */ -- 1.5.6.5

2 1