Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / freescale / mx6sabresd / mx6sabresd.c

diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index d2fe1d4490db83e79e7c1beb13ef6f5412fcccec..878e1e7c0b6caa509bd628551f3e8e1dacfabf87 100644 (file)
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -10,12 +10,13 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-pins.h>
+#include <asm/mach-imx/spi.h>
 #include <linux/errno.h>
 #include <asm/gpio.h>
-#include <asm/imx-common/mxc_i2c.h>
-#include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/boot_mode.h>
-#include <asm/imx-common/video.h>
+#include <asm/mach-imx/mxc_i2c.h>
+#include <asm/mach-imx/iomux-v3.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/video.h>
 #include <mmc.h>
 #include <fsl_esdhc.h>
 #include <miiphy.h>
@@ -25,10 +26,12 @@
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <i2c.h>
+#include <input.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
 #include "../common/pfuze.h"
 #include <usb.h>
+#include <usb/ehci-ci.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -620,9 +623,6 @@ int board_ehci_power(int port, int on)
 int board_early_init_f(void)
 {
        setup_iomux_uart();
-#if defined(CONFIG_VIDEO_IPUV3)
-       setup_display();
-#endif
 
        return 0;
 }
@@ -639,6 +639,9 @@ int board_init(void)
                setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c_pad_info1);
        else
                setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c_pad_info1);
+#if defined(CONFIG_VIDEO_IPUV3)
+       setup_display();
+#endif
 #ifdef CONFIG_USB_EHCI_MX6
        setup_usb();
 #endif
@@ -700,14 +703,14 @@ int board_late_init(void)
 #endif
 
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       setenv("board_name", "SABRESD");
+       env_set("board_name", "SABRESD");
 
        if (is_mx6dqp())
-               setenv("board_rev", "MX6QP");
+               env_set("board_rev", "MX6QP");
        else if (is_mx6dq())
-               setenv("board_rev", "MX6Q");
+               env_set("board_rev", "MX6Q");
        else if (is_mx6sdl())
-               setenv("board_rev", "MX6DL");
+               env_set("board_rev", "MX6DL");
 #endif
 
        return 0;
@@ -747,23 +750,6 @@ static void ccgr_init(void)
        writel(0x000003FF, &ccm->CCGR6);
 }
 
-static void gpr_init(void)
-{
-       struct iomuxc *iomux = (struct iomuxc *)IOMUXC_BASE_ADDR;
-
-       /* enable AXI cache for VDOA/VPU/IPU */
-       writel(0xF00000CF, &iomux->gpr[4]);
-       if (is_mx6dqp()) {
-               /* set IPU AXI-id1 Qos=0x1 AXI-id0/2/3 Qos=0x7 */
-               writel(0x007F007F, &iomux->gpr[6]);
-               writel(0x007F007F, &iomux->gpr[7]);
-       } else {
-               /* set IPU AXI-id0 Qos=0xf(bypass) AXI-id1 Qos=0x7 */
-               writel(0x007F007F, &iomux->gpr[6]);
-               writel(0x007F007F, &iomux->gpr[7]);
-       }
-}
-
 static int mx6q_dcd_table[] = {
        0x020e0798, 0x000C0000,
        0x020e0758, 0x00000000,
@@ -946,6 +932,92 @@ static int mx6qp_dcd_table[] = {
        0x021b001c, 0x00000000,
 };
 
+static int mx6dl_dcd_table[] = {
+       0x020e0774, 0x000C0000,
+       0x020e0754, 0x00000000,
+       0x020e04ac, 0x00000030,
+       0x020e04b0, 0x00000030,
+       0x020e0464, 0x00000030,
+       0x020e0490, 0x00000030,
+       0x020e074c, 0x00000030,
+       0x020e0494, 0x00000030,
+       0x020e04a0, 0x00000000,
+       0x020e04b4, 0x00000030,
+       0x020e04b8, 0x00000030,
+       0x020e076c, 0x00000030,
+       0x020e0750, 0x00020000,
+       0x020e04bc, 0x00000030,
+       0x020e04c0, 0x00000030,
+       0x020e04c4, 0x00000030,
+       0x020e04c8, 0x00000030,
+       0x020e04cc, 0x00000030,
+       0x020e04d0, 0x00000030,
+       0x020e04d4, 0x00000030,
+       0x020e04d8, 0x00000030,
+       0x020e0760, 0x00020000,
+       0x020e0764, 0x00000030,
+       0x020e0770, 0x00000030,
+       0x020e0778, 0x00000030,
+       0x020e077c, 0x00000030,
+       0x020e0780, 0x00000030,
+       0x020e0784, 0x00000030,
+       0x020e078c, 0x00000030,
+       0x020e0748, 0x00000030,
+       0x020e0470, 0x00000030,
+       0x020e0474, 0x00000030,
+       0x020e0478, 0x00000030,
+       0x020e047c, 0x00000030,
+       0x020e0480, 0x00000030,
+       0x020e0484, 0x00000030,
+       0x020e0488, 0x00000030,
+       0x020e048c, 0x00000030,
+       0x021b0800, 0xa1390003,
+       0x021b080c, 0x001F001F,
+       0x021b0810, 0x001F001F,
+       0x021b480c, 0x001F001F,
+       0x021b4810, 0x001F001F,
+       0x021b083c, 0x4220021F,
+       0x021b0840, 0x0207017E,
+       0x021b483c, 0x4201020C,
+       0x021b4840, 0x01660172,
+       0x021b0848, 0x4A4D4E4D,
+       0x021b4848, 0x4A4F5049,
+       0x021b0850, 0x3F3C3D31,
+       0x021b4850, 0x3238372B,
+       0x021b081c, 0x33333333,
+       0x021b0820, 0x33333333,
+       0x021b0824, 0x33333333,
+       0x021b0828, 0x33333333,
+       0x021b481c, 0x33333333,
+       0x021b4820, 0x33333333,
+       0x021b4824, 0x33333333,
+       0x021b4828, 0x33333333,
+       0x021b08b8, 0x00000800,
+       0x021b48b8, 0x00000800,
+       0x021b0004, 0x0002002D,
+       0x021b0008, 0x00333030,
+       0x021b000c, 0x3F435313,
+       0x021b0010, 0xB66E8B63,
+       0x021b0014, 0x01FF00DB,
+       0x021b0018, 0x00001740,
+       0x021b001c, 0x00008000,
+       0x021b002c, 0x000026d2,
+       0x021b0030, 0x00431023,
+       0x021b0040, 0x00000027,
+       0x021b0000, 0x831A0000,
+       0x021b001c, 0x04008032,
+       0x021b001c, 0x00008033,
+       0x021b001c, 0x00048031,
+       0x021b001c, 0x05208030,
+       0x021b001c, 0x04008040,
+       0x021b0020, 0x00005800,
+       0x021b0818, 0x00011117,
+       0x021b4818, 0x00011117,
+       0x021b0004, 0x0002556D,
+       0x021b0404, 0x00011006,
+       0x021b001c, 0x00000000,
+};
+
 static void ddr_init(int *table, int size)
 {
        int i;
@@ -960,6 +1032,8 @@ static void spl_dram_init(void)
                ddr_init(mx6q_dcd_table, ARRAY_SIZE(mx6q_dcd_table));
        else if (is_mx6dqp())
                ddr_init(mx6qp_dcd_table, ARRAY_SIZE(mx6qp_dcd_table));
+       else if (is_mx6sdl())
+               ddr_init(mx6dl_dcd_table, ARRAY_SIZE(mx6dl_dcd_table));
 }
 
 void board_init_f(ulong dummy)