| Message ID | 1325184437-12663-1-git-send-email-aneesh@ti.com |
|---|---|
| State | Accepted, archived |
| Commit | fe7104b307a12f0d5f02526bea00162d95589616 |
| Delegated to: | Tom Rini |
| Headers | show |
On 12/29/2011 07:47 PM, Aneesh V wrote: > Fix boot issue on ES2.0 Panda by tuning some > IO settings. The CONTROL_EFUSE_2 register has > to be over-ridden in software for 4430 boards. > > Commit 23e9f0723e48615332119de4f4ec7a833a282628 > wrongly did this for CONTROL_EFUSE_1. Reverting > this and doing it for CONTROL_EFUSE_2. > > Signed-off-by: Aneesh V <aneesh@ti.com> [snip] Hi, works fine: U-Boot SPL 2011.12-00046-gbfcc40b-dirty (Dec 31 2011 - 12:14:09) Texas Instruments OMAP4430 ES2.0 OMAP SD/MMC: 0 reading u-boot.img reading u-boot.img U-Boot 2011.12-00046-gbfcc40b-dirty (Dec 31 2011 - 12:14:09) CPU : OMAP4430 ES2.0 Board: OMAP4 Panda I2C: ready DRAM: 1 GiB MMC: OMAP SD/MMC: 0 Using default environment Thanks! Tested-by: Raúl Porcel <armin76@gentoo.org>
On 12/31/2011 01:27 PM, asad wrote: [snip] Jeez, obviously this is me... Thanks and sorry
On Sat, Dec 31, 2011 at 5:27 AM, asad <armin@example.net> wrote: > On 12/29/2011 07:47 PM, Aneesh V wrote: >> Fix boot issue on ES2.0 Panda by tuning some >> IO settings. The CONTROL_EFUSE_2 register has >> to be over-ridden in software for 4430 boards. >> >> Commit 23e9f0723e48615332119de4f4ec7a833a282628 >> wrongly did this for CONTROL_EFUSE_1. Reverting >> this and doing it for CONTROL_EFUSE_2. >> >> Signed-off-by: Aneesh V <aneesh@ti.com> > [snip] > > Hi, > > works fine: > > U-Boot SPL 2011.12-00046-gbfcc40b-dirty (Dec 31 2011 - 12:14:09) > Texas Instruments OMAP4430 ES2.0 > OMAP SD/MMC: 0 > reading u-boot.img > reading u-boot.img > > > U-Boot 2011.12-00046-gbfcc40b-dirty (Dec 31 2011 - 12:14:09) > > CPU : OMAP4430 ES2.0 > Board: OMAP4 Panda > I2C: ready > DRAM: 1 GiB > MMC: OMAP SD/MMC: 0 > Using default environment > > Thanks! > > Tested-by: Raúl Porcel <armin76@gentoo.org> Applied to u-boot-ti/master, thanks!
diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c index 37a86b4..91f8320 100644 --- a/arch/arm/cpu/armv7/omap4/hwinit.c +++ b/arch/arm/cpu/armv7/omap4/hwinit.c @@ -110,10 +110,10 @@ void do_io_settings(void) * i. unconditionally for all 4430 * ii. only if un-trimmed for 4460 */ - if ((omap4_rev < OMAP4460_ES1_0) || !readl(&ctrl->control_efuse_1)) + if (!readl(&ctrl->control_efuse_1)) writel(CONTROL_EFUSE_1_OVERRIDE, &ctrl->control_efuse_1); - if (!readl(&ctrl->control_efuse_2)) + if ((omap4_rev < OMAP4460_ES1_0) || !readl(&ctrl->control_efuse_2)) writel(CONTROL_EFUSE_2_OVERRIDE, &ctrl->control_efuse_2); } #endif diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 4d8c89f..416c6de 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -116,7 +116,7 @@ #define LDOSRAM_ACTMODE_VSET_IN_MASK (0x1F << 5) #define LDOSRAM_VOLT_CTRL_OVERRIDE 0x0401040f #define CONTROL_EFUSE_1_OVERRIDE 0x1C4D0110 -#define CONTROL_EFUSE_2_OVERRIDE 0x00084000 +#define CONTROL_EFUSE_2_OVERRIDE 0x99084000 /* LPDDR2 IO regs */ #define CONTROL_LPDDR2IO_SLEW_125PS_DRV8_PULL_DOWN 0x1C1C1C1C
Fix boot issue on ES2.0 Panda by tuning some IO settings. The CONTROL_EFUSE_2 register has to be over-ridden in software for 4430 boards. Commit 23e9f0723e48615332119de4f4ec7a833a282628 wrongly did this for CONTROL_EFUSE_1. Reverting this and doing it for CONTROL_EFUSE_2. Signed-off-by: Aneesh V <aneesh@ti.com> --- arch/arm/cpu/armv7/omap4/hwinit.c | 4 ++-- arch/arm/include/asm/arch-omap4/omap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)