Merge git://git.denx.de/u-boot-imx

[u-boot] / board / wandboard / wandboard.c

diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 6d2609ce119639fd1e916cc16ed854369cca4af6..b7c6c6cb18e17162db05e5a785b3eebd5ac7a678 100644 (file)
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -28,7 +28,6 @@
 #include <miiphy.h>
 #include <netdev.h>
 #include <phy.h>
-#include <input.h>
 #include <i2c.h>
 #include <power/pmic.h>
 #include <power/pfuze100_pmic.h>
@@ -435,9 +434,7 @@ int board_early_init_f(void)
 {
        setup_iomux_uart();
 #ifdef CONFIG_SATA
-       /* Only mx6q wandboard has SATA */
-       if (is_cpu_type(MXC_CPU_MX6Q))
-               setup_sata();
+       setup_sata();
 #endif
 
        return 0;
@@ -512,7 +509,9 @@ int board_late_init(void)
 #endif
 
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       if (is_mx6dq())
+       if (is_mx6dqp())
+               env_set("board_rev", "MX6QP");
+       else if (is_mx6dq())
                env_set("board_rev", "MX6Q");
        else
                env_set("board_rev", "MX6DL");
@@ -534,7 +533,7 @@ int board_init(void)
 
 #if defined(CONFIG_VIDEO_IPUV3)
        setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6dl_i2c2_pad_info);
-       if (is_mx6dq()) {
+       if (is_mx6dq() || is_mx6dqp()) {
                setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c2_pad_info);
                setup_i2c(2, CONFIG_SYS_I2C_SPEED, 0x7f, &mx6q_i2c3_pad_info);
        } else {