karo: tx6ul: enable soft i2c driver and 'i2c' command

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index c01fbd5e82819dc2dde2d7d89eca63d141673ca3..11218913477c22ad2ea1a61c3e5449d055e4b4d1 100644 (file)
--- a/board/karo/tx6/Kconfig
+++ b/board/karo/tx6/Kconfig
@@ -54,6 +54,8 @@ config TX6_EMMC
 config TX6UL
        bool
        select SOC_MX6UL
+       select SYS_I2C
+       select SYS_I2C_SOFT
        select SYS_SDRAM_BUS_WIDTH_16
 
 config TX6QP

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index dd3507673857ffa32ee3eaff572a69b01422bb75..1817e2793bad3ca21e174da00d5f008a04c67c7d 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -467,7 +467,7 @@ static struct pmic_regs rn5t567_regs[] = {
        { RN5T567_LDORTC1_SLOT, 0x0f, ~0x3f, },
 };
 
-static int pmic_addr __maybe_unused = 0x33;
+static int pmic_addr = 0x33;
 #endif
 
 int board_init(void)

diff --git a/configs/tx6ul-0010_defconfig b/configs/tx6ul-0010_defconfig
index b0390d71678b106b2312eed9ada26d26957aa455..550e931aca77f32a99b7124883dc2a36d3c74975 100644 (file)
--- a/configs/tx6ul-0010_defconfig
+++ b/configs/tx6ul-0010_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_FUSE=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_MII=y

diff --git a/configs/tx6ul-0011_defconfig b/configs/tx6ul-0011_defconfig
index 478dcd4f145846d7971562d445381cef8196a85a..747cfecdde1311c533a491512fbef189e5d18a53 100644 (file)
--- a/configs/tx6ul-0011_defconfig
+++ b/configs/tx6ul-0011_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_FUSE=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_MII=y

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index fced6ebf9432ecf868d4b3d338231bc7cd4682f8..f0dc19ac088e609c1fb782b6b773fbc954ce8ce9 100644 (file)
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -10,6 +10,10 @@ config HARD_I2C
 config SYS_I2C
        bool
 
+config SYS_I2C_SOFT
+       bool "Software emulated I2C bus driver"
+       depends on SYS_I2C
+
 config DM_I2C
        bool "Enable Driver Model for I2C drivers"
        depends on DM

diff --git a/include/configs/tx6.h b/include/configs/tx6.h
index d8ab70c31e92af68878c0aeee18ca5a15ac0f59d..e4a2a6c88eac0132deee8107314e0d825e3e7db9 100644 (file)
--- a/include/configs/tx6.h
+++ b/include/configs/tx6.h
@@ -319,22 +319,21 @@
 #error Unsupported TX6 module revision
 #endif
 #else /* CONFIG_TX6_REV */
-/* autodetect which PMIC is present to derive TX6_REV */
 #ifdef CONFIG_SOC_MX6UL
-#ifndef CONFIG_TX6_UBOOT_NOENV
+#ifdef CONFIG_SYS_I2C_SOFT
 /* NOENV U-Boot is used for initial bootstrap.
  * Since the TAMPER_PIN_DISABLE fuses have to be programmed
  * to be able to use the TAMPER pins as GPIO to access the
  * PMIC I2C bus, this is not possible on virgin hardware.
  */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_SOFT
 #define CONFIG_SYS_I2C_SOFT_SPEED      400000
+#define CONFIG_SYS_I2C_SPEED           CONFIG_SYS_I2C_SOFT_SPEED
 #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
-#endif /* CONFIG_TX6_UBOOT_NOENV */
+#endif /* CONFIG_SYS_I2C_SOFT */
 #else /* !CONFIG_SOC_MX6UL */
+/* autodetect which PMIC is present to derive TX6_REV */
 #define CONFIG_LTC3676                 /* TX6_REV == 1 */
 #endif /*  CONFIG_SOC_MX6UL */
 #define CONFIG_RN5T567                 /* TX6_REV == 3 */