summaryrefslogtreecommitdiff
path: root/board/wandboard/wandboard.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-10-31 08:14:53 -0400
committerTom Rini <trini@konsulko.com>2017-10-31 08:14:53 -0400
commit3c1af17c5eebc3718095907c254ae3eb8a3412f8 (patch)
treeac2b1fea2f8c5638b52f7184ba506a4665128b3d /board/wandboard/wandboard.c
parentda125b72fdd596dddcc87e9c2917be322d27ef03 (diff)
parent40b0dae15159bf14f24cf7714ddd690ae3ca65e3 (diff)
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/wandboard/wandboard.c')
-rw-r--r--board/wandboard/wandboard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 6d2609ce11..1e7c11e670 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -435,9 +435,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 +510,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 +534,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 {