karo: tx6ul: enable soft_i2c for PMIC access

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index d00f64ac28cad747ccaca448902a6b50f6acd7ff..3395a026dde25c9f233d4d9794df48fc71398912 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -40,8 +40,8 @@
 #define TX6UL_LCD_RST_GPIO             IMX_GPIO_NR(3, 4)
 #define TX6UL_LCD_BACKLIGHT_GPIO       IMX_GPIO_NR(4, 16)
 
 #define TX6UL_LCD_RST_GPIO             IMX_GPIO_NR(3, 4)
 #define TX6UL_LCD_BACKLIGHT_GPIO       IMX_GPIO_NR(4, 16)
 

-#define TX6UL_I2C1_SCL_GPIO            IMX_GPIO_NR(5, 0)
-#define TX6UL_I2C1_SDA_GPIO            IMX_GPIO_NR(5, 1)
+#define TX6UL_I2C1_SCL_GPIO            CONFIG_SOFT_I2C_GPIO_SCL
+#define TX6UL_I2C1_SDA_GPIO            CONFIG_SOFT_I2C_GPIO_SDA

 
 #define TX6UL_SD1_CD_GPIO              IMX_GPIO_NR(4, 14)
 
 
 #define TX6UL_SD1_CD_GPIO              IMX_GPIO_NR(4, 14)
 

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index 06e6f630f090b143b7a173957d4c61d1a5fc1865..b19ec91b2d956a3faf27b5ad994b6be36422daf7 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -284,26 +284,31 @@
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           400000
 #ifdef CONFIG_HARD_I2C
 #define CONFIG_SYS_I2C_BASE            I2C1_BASE_ADDR
 #define CONFIG_SYS_I2C_SPEED           400000

+#endif /* CONFIG_HARD_I2C */

 #if defined(CONFIG_TX6_REV)
 #if CONFIG_TX6_REV == 0x1
 #if defined(CONFIG_TX6_REV)
 #if CONFIG_TX6_REV == 0x1

-#define CONFIG_SYS_I2C_SLAVE           0x3c

 #define CONFIG_LTC3676
 #elif CONFIG_TX6_REV == 0x2
 #define CONFIG_LTC3676
 #elif CONFIG_TX6_REV == 0x2

-#define CONFIG_SYS_I2C_SLAVE           0x32

 #define CONFIG_RN5T618
 #elif CONFIG_TX6_REV == 0x3
 #define CONFIG_RN5T618
 #elif CONFIG_TX6_REV == 0x3

-#define CONFIG_SYS_I2C_SLAVE           0x33

 #define CONFIG_RN5T567
 #else
 #error Unsupported TX6 module revision
 #endif
 #define CONFIG_RN5T567
 #else
 #error Unsupported TX6 module revision
 #endif

-#endif /* CONFIG_TX6_REV */
+#else /* CONFIG_TX6_REV */

 /* autodetect which PMIC is present to derive TX6_REV */
 /* autodetect which PMIC is present to derive TX6_REV */

-#ifndef CONFIG_SOC_MX6UL
+#ifdef CONFIG_SOC_MX6UL
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT
+#define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SOFT_I2C_GPIO_SCL       IMX_GPIO_NR(5, 0)
+#define CONFIG_SOFT_I2C_GPIO_SDA       IMX_GPIO_NR(5, 1)
+#define CONFIG_SOFT_I2C_READ_REPEATED_START
+#else

 #define CONFIG_LTC3676                 /* TX6_REV == 1 */
 #endif
 #define CONFIG_RN5T567                 /* TX6_REV == 3 */
 #define CONFIG_LTC3676                 /* TX6_REV == 1 */
 #endif
 #define CONFIG_RN5T567                 /* TX6_REV == 3 */

-#endif /* CONFIG_HARD_I2C */
+#endif /* CONFIG_TX6_REV */

 
 #define CONFIG_ENV_OVERWRITE
 
 
 #define CONFIG_ENV_OVERWRITE