warp7: defconfig: Switch to DM for I2C

This commit switches to DM I2C for warp7 and warp7_bl33 defconfigs.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>

diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 146d722b15cd69b1ace8dd9695eeb9bb2a5e583e..19f0df4d097d5a5660cbb6dd0aaca244997bb126 100644 (file)
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -31,26 +31,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU100KOHM | \
                        PAD_CTL_HYS)
 
-#define I2C_PAD_CTRL   (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
-       PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
-
-#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_I2C1_SCL__I2C1_SCL | PC,
-               .gpio_mode = MX7D_PAD_I2C1_SCL__GPIO4_IO8 | PC,
-               .gp = IMX_GPIO_NR(4, 8),
-       },
-       .sda = {
-               .i2c_mode = MX7D_PAD_I2C1_SDA__I2C1_SDA | PC,
-               .gpio_mode = MX7D_PAD_I2C1_SDA__GPIO4_IO9 | PC,
-               .gp = IMX_GPIO_NR(4, 9),
-       },
-};
-#endif
-
 int dram_init(void)
 {
        gd->ram_size = PHYS_SDRAM_SIZE;
@@ -130,10 +110,6 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-       #ifdef CONFIG_SYS_I2C_MXC
-               setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
-       #endif
-
        return 0;
 }
 

diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
index c7b8c5494167ca7ed975bc198c886e1bc50051c0..4758d2bcfab6ee066d2e6414fbf2f4f1f1ae0bf1 100644 (file)
--- a/configs/warp7_bl33_defconfig
+++ b/configs/warp7_bl33_defconfig
@@ -45,3 +45,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y

diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 44d7742ca903b06f28a0649de0b73a78558b6c9c..25cf2786dfa2e8f65fe60c1e8670d07fc702f1d6 100644 (file)
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -58,3 +58,4 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_I2C=y

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index a391dfb5c108300c77d0db87a4a8e77d3afed503..41eb8d7e1dd468c8c9b3190ed08d29331b30a719 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -126,9 +126,7 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* I2C configs */
-#define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* PMIC */