]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
am43xx: Drop non-DM_I2C code
authorTom Rini <trini@konsulko.com>
Thu, 19 Aug 2021 03:12:28 +0000 (23:12 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 30 Aug 2021 18:10:07 +0000 (14:10 -0400)
On this platform, we have DM_I2C and SPL_DM_I2C always enabled.
Remove legacy options.

Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
board/ti/am43xx/board.c

index a71b588efcb0addeee7fefb91737d26cd8986cf3..e4e0c67275f77ff22c04e50af234d5c9ea4af5fc 100644 (file)
@@ -393,13 +393,8 @@ void scale_vcores_generic(u32 m)
 {
        int mpu_vdd, ddr_volt;
 
-#if !CONFIG_IS_ENABLED(DM_I2C)
-       if (i2c_probe(TPS65218_CHIP_PM))
-               return;
-#else
        if (power_tps65218_init(0))
                return;
-#endif
 
        switch (m) {
        case 1000:
@@ -451,13 +446,8 @@ void scale_vcores_idk(u32 m)
 {
        int mpu_vdd;
 
-#if !CONFIG_IS_ENABLED(DM_I2C)
-       if (i2c_probe(TPS62362_I2C_ADDR))
-               return;
-#else
        if (power_tps62362_init(0))
                return;
-#endif
 
        switch (m) {
        case 1000:
@@ -492,10 +482,6 @@ void gpi2c_init(void)
 
        if (first_time) {
                enable_i2c0_pin_mux();
-#if !CONFIG_IS_ENABLED(DM_I2C)
-               i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED,
-                        CONFIG_SYS_OMAP24_I2C_SLAVE);
-#endif
                first_time = false;
        }
 }
@@ -632,28 +618,15 @@ void sdram_init(void)
 int power_init_board(void)
 {
        int rc;
-#if !CONFIG_IS_ENABLED(DM_I2C)
-       struct pmic *p = NULL;
-#endif
        if (board_is_idk()) {
                rc = power_tps62362_init(0);
                if (rc)
                        goto done;
-#if !CONFIG_IS_ENABLED(DM_I2C)
-               p = pmic_get("TPS62362");
-               if (!p || pmic_probe(p))
-                       goto done;
-#endif
                puts("PMIC:  TPS62362\n");
        } else {
                rc = power_tps65218_init(0);
                if (rc)
                        goto done;
-#if !CONFIG_IS_ENABLED(DM_I2C)
-               p = pmic_get("TPS65218_PMIC");
-               if (!p || pmic_probe(p))
-                       goto done;
-#endif
                puts("PMIC:  TPS65218\n");
        }
 done: