board/BuR/brppt1: drop DM_I2C_COMPAT

The TPS62517 PMIC driver has been partially converted to DM, so the
legacy I2C access layer isn't needed anymore.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>

diff --git a/board/BuR/brppt1/board.c b/board/BuR/brppt1/board.c
index d2e7c7224238974f8408af08eba3b581a06dd008..b8ab19c0e712d51149ce4d10debda382ff32a8ed 100644 (file)
--- a/board/BuR/brppt1/board.c
+++ b/board/BuR/brppt1/board.c
@@ -106,9 +106,8 @@ void am33xx_spl_board_init(void)
 
        /* setup I2C */
        enable_i2c_pin_mux();
-       i2c_set_bus_num(0);
-       i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-       pmicsetup(0);
+
+       pmicsetup(0, 0);
 
        /* peripheral reset */
        rc = gpio_request(64 + 29, "GPMC_WAIT1");

diff --git a/board/BuR/brxre1/board.c b/board/BuR/brxre1/board.c
index 41ed28b4bc51fbbd6557c11485bf4bbd899eaef9..82c53d5bc2bcba6b09c0a1267c2f37349843fd17 100644 (file)
--- a/board/BuR/brxre1/board.c
+++ b/board/BuR/brxre1/board.c
@@ -132,7 +132,7 @@ void am33xx_spl_board_init(void)
                puts("ERROR: i2c_set_bus_speed failed! (turn on PWR_nEN)\n");
        }
 
-       pmicsetup(0);
+       pmicsetup(0, 0);
 }
 
 const struct dpll_params *get_dpll_ddr_params(void)

diff --git a/board/BuR/common/bur_common.h b/board/BuR/common/bur_common.h
index 5f2d0d055fd4388223fd378346f7b21ce4569eed..f743194c346da53ba0b7ef7ed0c8cc4398ec3f08 100644 (file)
--- a/board/BuR/common/bur_common.h
+++ b/board/BuR/common/bur_common.h
@@ -15,7 +15,7 @@
 
 int load_lcdtiming(struct am335x_lcdpanel *panel);
 void br_summaryscreen(void);
-void pmicsetup(u32 mpupll);
+void pmicsetup(u32 mpupll, unsigned int bus);
 void enable_uart0_pin_mux(void);
 void enable_i2c_pin_mux(void);
 void enable_board_pin_mux(void);

diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c
index f3eae5cbc1ecb9d7c79f3ce237a425012be6b9d3..a1f7c44abfe7dbf8d478e94c55af7f76762cd9ea 100644 (file)
--- a/board/BuR/common/common.c
+++ b/board/BuR/common/common.c
@@ -269,13 +269,14 @@ int ft_board_setup(void *blob, bd_t *bd)
 
 static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
 
-void pmicsetup(u32 mpupll)
+void pmicsetup(u32 mpupll, unsigned int bus)
 {
        int mpu_vdd;
        int usb_cur_lim;
 
-       if (i2c_probe(TPS65217_CHIP_PM)) {
-               puts("PMIC (0x24) not found! skip further initalization.\n");
+       if (power_tps65217_init(bus)) {
+               printf("WARN: cannot setup PMIC 0x24 @ bus #%d, not found!.\n",
+                      bus);
                return;
        }
 

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 083b5f7e5f28590d15b836f04a6dd4d7b8ae78b9..f2d8220126192a24d7113a251fb38e035d68b259 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -71,7 +71,6 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
-CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 1cfd5fc709f7eab2214adff5b313bbbeed406f7c..275727d11f32707429f8a9bc1daf0bf13ed67d80 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -73,7 +73,6 @@ CONFIG_BLK=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
-CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 # CONFIG_MMC is not set

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 37373967df663e258689779a36a94f31c762aa74..668c4c22c27f2f8e9b6e6da7aa2cc3d490b2b9f3 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -76,7 +76,6 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y
-CONFIG_DM_I2C_COMPAT=y
 CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y