Merge branch 'master' of git://git.denx.de/u-boot-arm

[kernel/u-boot.git] / board / ti / am43xx / board.c

diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index ed87cd9..95fd137 100644 (file)
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -188,7 +188,7 @@ const struct ctrl_ioregs ioregs_ddr3 = {
        .dt1ioctl               = DDR3_DATA0_IOCTRL_VALUE,
        .dt2ioctrl              = DDR3_DATA0_IOCTRL_VALUE,
        .dt3ioctrl              = DDR3_DATA0_IOCTRL_VALUE,
-       .emif_sdram_config_ext  = 0x0043,
+       .emif_sdram_config_ext  = 0x0143,
 };
 
 const struct emif_regs ddr3_emif_regs_400Mhz = {
@@ -346,14 +346,14 @@ static void enable_vtt_regulator(void)
        u32 temp;
 
        /* enable module */
-       writel(GPIO_CTRL_ENABLEMODULE, AM33XX_GPIO0_BASE + OMAP_GPIO_CTRL);
-
-       /* enable output for GPIO0_22 */
-       writel(GPIO_SETDATAOUT(GPIO_22),
-              AM33XX_GPIO0_BASE + OMAP_GPIO_SETDATAOUT);
-       temp = readl(AM33XX_GPIO0_BASE + OMAP_GPIO_OE);
-       temp = temp & ~(GPIO_OE_ENABLE(GPIO_22));
-       writel(temp, AM33XX_GPIO0_BASE + OMAP_GPIO_OE);
+       writel(GPIO_CTRL_ENABLEMODULE, AM33XX_GPIO5_BASE + OMAP_GPIO_CTRL);
+
+       /* enable output for GPIO5_7 */
+       writel(GPIO_SETDATAOUT(7),
+              AM33XX_GPIO5_BASE + OMAP_GPIO_SETDATAOUT);
+       temp = readl(AM33XX_GPIO5_BASE + OMAP_GPIO_OE);
+       temp = temp & ~(GPIO_OE_ENABLE(7));
+       writel(temp, AM33XX_GPIO5_BASE + OMAP_GPIO_OE);
 }
 
 void sdram_init(void)