karo: tx6: factor out PMIC initialization

[karo-tx-uboot.git] / include / configs / tx6.h

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index de2d343c28b72ead7d4d8d02a7d48781c1cc1560..0d34a9a7033a3fd4aea100aa049547f188f74264 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -31,7 +31,7 @@
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
 #define CONFIG_VIDEO_IPUV3
-#define CONFIG_IPUV3_CLK               266000000
+#define CONFIG_IPUV3_CLK               (CONFIG_SYS_SDRAM_CLK * 1000000 / 2)
 #define CONFIG_LCD_LOGO
 #define LCD_BPP                                LCD_COLOR24
 #define CONFIG_CMD_BMP
@@ -130,6 +130,11 @@
 #define CONFIG_SYS_FDT_ADDR            _pfx(0x, CONFIG_FDTADDR)
 #define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS  3000
+#ifndef CONFIG_SYS_LVDS_IF
+#define DEFAULT_VIDEO_MODE             "VGA"
+#else
+#define DEFAULT_VIDEO_MODE             "HSD100PXN1"
+#endif
 
 /*
  * Extra Environments
@@ -176,7 +181,7 @@
        "otg_mode=device\0"                                             \
        ROOTPART_UUID_STR                                               \
        "touchpanel=tsc2007\0"                                          \
-       "video_mode=VGA\0"
+       "video_mode=" DEFAULT_VIDEO_MODE "\0"
 #endif /*  CONFIG_ENV_IS_NOWHERE */
 #endif /*  CONFIG_MFG */
 
@@ -271,8 +276,10 @@
 #define CONFIG_SYS_I2C_SPEED           400000
 #ifndef CONFIG_TX6_V2
 #define CONFIG_SYS_I2C_SLAVE           0x3c
+#define CONFIG_LTC3676
 #else
 #define CONFIG_SYS_I2C_SLAVE           0x32
+#define CONFIG_RN5T618
 #endif
 #endif