From c9edec61d68577b2217e23c93b0352878ce7f3ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 26 Nov 2015 14:05:17 +0100 Subject: [PATCH] karo: tx6ul: enable soft_i2c for PMIC access --- board/karo/tx6/tx6ul.c | 4 ++-- include/configs/tx6.h | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c index d00f64ac28..3395a026dd 100644 --- 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_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) diff --git a/include/configs/tx6.h b/include/configs/tx6.h index 06e6f630f0..b19ec91b2d 100644 --- 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 +#endif /* CONFIG_HARD_I2C */ #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_SYS_I2C_SLAVE 0x32 #define CONFIG_RN5T618 #elif CONFIG_TX6_REV == 0x3 -#define CONFIG_SYS_I2C_SLAVE 0x33 #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 */ -#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 */ -#endif /* CONFIG_HARD_I2C */ +#endif /* CONFIG_TX6_REV */ #define CONFIG_ENV_OVERWRITE -- 2.39.2