imx6: aristainetos: add DM_I2C support

enable DM_I2C in defconfig and remove i2c specific
board code.

Signed-off-by: Heiko Schocher <hs@denx.de>

diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 8d07edd3e0fbe4ac0cbb4d8fdaae34a46d3ac8a9..0d1c06da5d8c3f4de1d8861a355b1bd74167137a 100644 (file)
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -17,7 +17,6 @@
 #include <asm/gpio.h>
 #include <asm/mach-imx/iomux-v3.h>
 #include <asm/mach-imx/boot_mode.h>
-#include <asm/mach-imx/mxc_i2c.h>
 #include <asm/mach-imx/video.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/io.h>
@@ -35,12 +34,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define I2C_PAD_CTRL   (PAD_CTL_PUS_100K_UP |                  \
-       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |   \
-       PAD_CTL_ODE | PAD_CTL_SRE_FAST)
-
-#define PC MUX_PAD_CTRL(I2C_PAD_CTRL)
-
 enum {
        BOARD_TYPE_4 = 4,
        BOARD_TYPE_7 = 7,
@@ -49,32 +42,6 @@ enum {
 #define ARI_BT_4 "aristainetos2_4@2"
 #define ARI_BT_7 "aristainetos2_7@1"
 
-struct i2c_pads_info i2c_pad_info3 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_GPIO_5__I2C3_SCL | PC,
-               .gpio_mode = MX6_PAD_GPIO_5__GPIO1_IO05 | PC,
-               .gp = IMX_GPIO_NR(1, 5)
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_GPIO_6__I2C3_SDA | PC,
-               .gpio_mode = MX6_PAD_GPIO_6__GPIO1_IO06 | PC,
-               .gp = IMX_GPIO_NR(1, 6)
-       }
-};
-
-struct i2c_pads_info i2c_pad_info4 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_GPIO_7__I2C4_SCL | PC,
-               .gpio_mode = MX6_PAD_GPIO_7__GPIO1_IO07 | PC,
-               .gp = IMX_GPIO_NR(1, 7)
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_GPIO_8__I2C4_SDA | PC,
-               .gpio_mode = MX6_PAD_GPIO_8__GPIO1_IO08 | PC,
-               .gp = IMX_GPIO_NR(1, 8)
-       }
-};
-
 static iomux_v3_cfg_t const backlight_pads[] = {
        /* backlight PWM brightness control */
        MX6_PAD_GPIO_9__PWM1_OUT | MUX_PAD_CTRL(NO_PAD_CTRL),
@@ -346,12 +313,6 @@ int board_early_init_f(void)
        return 0;
 }
 
-static void setup_i2c4(void)
-{
-       setup_i2c(3, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-                 &i2c_pad_info4);
-}
-
 static void setup_one_led(char *label, int state)
 {
        struct udevice *dev;
@@ -430,32 +391,6 @@ int board_late_init(void)
        return 0;
 }
 
-struct i2c_pads_info i2c_pad_info1 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_CSI0_DAT9__I2C1_SCL | PC,
-               .gpio_mode = MX6_PAD_CSI0_DAT9__GPIO5_IO27 | PC,
-               .gp = IMX_GPIO_NR(5, 27)
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_CSI0_DAT8__I2C1_SDA | PC,
-               .gpio_mode = MX6_PAD_CSI0_DAT8__GPIO5_IO26 | PC,
-               .gp = IMX_GPIO_NR(5, 26)
-       }
-};
-
-struct i2c_pads_info i2c_pad_info2 = {
-       .scl = {
-               .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | PC,
-               .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | PC,
-               .gp = IMX_GPIO_NR(4, 12)
-       },
-       .sda = {
-               .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | PC,
-               .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | PC,
-               .gp = IMX_GPIO_NR(4, 13)
-       }
-};
-
 int dram_init(void)
 {
        gd->ram_size = imx_ddr_size();
@@ -575,14 +510,6 @@ int board_init(void)
        /* address of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
-       setup_i2c(0, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-                 &i2c_pad_info1);
-       setup_i2c(1, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-                 &i2c_pad_info2);
-       setup_i2c(2, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE,
-                 &i2c_pad_info3);
-       setup_i2c4();
-
        setup_board_gpio();
        setup_gpmi_nand();
        setup_display();

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 243b4ff5aa0f1e8fc8750e1dd08dad567a51d879..fd58aad4c26721582e2beea2eab3044d943ddd73 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -36,7 +36,6 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
-CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
@@ -57,8 +56,11 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM_GPIO=y
 CONFIG_GPIO_HOG=y
 CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
@@ -85,6 +87,8 @@ CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_PWM_IMX=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_DS1307=y
 CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 45699dc614e9285a859586baf0ba763483243f10..1999c5c6168de9885052d1691b6aafbde2dc583a 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -165,12 +165,6 @@
 
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-/* I2C */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_SPEED           100000
-#define CONFIG_SYS_I2C_SLAVE           0x7f
-#define CONFIG_SYS_I2C_NOPROBES                { {0, 0x00} }
-
 /* NAND stuff */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           0x40000000
@@ -179,11 +173,6 @@
 
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
-/* RTC */
-#define CONFIG_SYS_I2C_RTC_ADDR        0x68
-#define CONFIG_SYS_RTC_BUS_NUM 2
-#define CONFIG_RTC_M41T11
-
 /* USB Configs */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)