colibri_imx7: remove legancy I2C support

Remove legancy I2C config and code in favor of upcomming DM/DT
enable I2C support.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index 8eedd65bf074a13190dcfa2d9b16bf7af7ce2845..ddb308548e2c68e2aa2119b1056bcd56c77400e9 100644 (file)
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -12,13 +12,11 @@
 #include <asm/gpio.h>
 #include <asm/imx-common/boot_mode.h>
 #include <asm/imx-common/iomux-v3.h>
-#include <asm/imx-common/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
 #include <dm.h>
 #include <dm/platform_data/serial_mxc.h>
 #include <fsl_esdhc.h>
-#include <i2c.h>
 #include <linux/sizes.h>
 #include <mmc.h>
 #include <miiphy.h>
@@ -38,9 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define ENET_RX_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
 
-#define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
-       PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
 #define LCD_PAD_CTRL    (PAD_CTL_HYS | PAD_CTL_PUS_PU100KOHM | \
        PAD_CTL_DSE_3P3V_49OHM)
 
@@ -48,36 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define NAND_PAD_READY0_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU5KOHM)
 
-#ifdef CONFIG_SYS_I2C_MXC
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-/* I2C1 for PMIC */
-static struct i2c_pads_info i2c_pad_info1 = {
-       .scl = {
-               .i2c_mode = MX7D_PAD_GPIO1_IO04__I2C1_SCL | PC,
-               .gpio_mode = MX7D_PAD_GPIO1_IO04__GPIO1_IO4 | PC,
-               .gp = IMX_GPIO_NR(1, 4),
-       },
-       .sda = {
-               .i2c_mode = MX7D_PAD_GPIO1_IO05__I2C1_SDA | PC,
-               .gpio_mode = MX7D_PAD_GPIO1_IO05__GPIO1_IO5 | PC,
-               .gp = IMX_GPIO_NR(1, 5),
-       },
-};
-/* I2C4 for Colibri I2C */
-static struct i2c_pads_info i2c_pad_info4 = {
-       .scl = {
-               .i2c_mode = MX7D_PAD_ENET1_RGMII_TD2__I2C4_SCL | PC,
-               .gpio_mode = MX7D_PAD_ENET1_RGMII_TD2__GPIO7_IO8 | PC,
-               .gp = IMX_GPIO_NR(7, 8),
-       },
-       .sda = {
-               .i2c_mode = MX7D_PAD_ENET1_RGMII_TD3__I2C4_SDA | PC,
-               .gpio_mode = MX7D_PAD_ENET1_RGMII_TD3__GPIO7_IO9 | PC,
-               .gp = IMX_GPIO_NR(7, 9),
-       },
-};
-#endif
-
 int dram_init(void)
 {
        gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
@@ -331,11 +296,6 @@ int board_early_init_f(void)
 {
        setup_iomux_uart();
 
-#ifdef CONFIG_SYS_I2C_MXC
-       setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-       setup_i2c(3, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info4);
-#endif
-
        return 0;
 }
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 16ae952f37ccc711b80072c25f1ad68c2a31d79a..55d8fcf4d422a67ff6a1953f01deb738711209a9 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -59,9 +59,7 @@
 #undef CONFIG_BOOTM_RTEMS
 
 /* I2C configs */
-#define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_SPEED           100000
 
 #define CONFIG_IPADDR                  192.168.10.2