arm: samsung: Convert s5p_goni and smdkc100 to DM_I2C

[u-boot] / board / samsung / goni / goni.c

diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 2725a46858565cb936c536b2f45f585bd4ec5138..b066832e5fa0425191d47744392c43f505d30f00 100644 (file)
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -10,7 +10,7 @@
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <power/pmic.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
 #include <power/max8998_pmic.h>
 #include <samsung/misc.h>
@@ -45,17 +45,15 @@ void i2c_init_board(void)
 
 int power_init_board(void)
 {
-       int ret;
-
+#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
        /*
         * For PMIC the I2C bus is named as I2C5, but it is connected
         * to logical I2C adapter 0
         */
-       ret = pmic_init(I2C_0);
-       if (ret)
-               return ret;
-
+       return pmic_init(I2C_0);
+#else
        return 0;
+#endif
 }
 
 int dram_init(void)
@@ -148,6 +146,7 @@ int board_mmc_init(bd_t *bis)
 #ifdef CONFIG_USB_GADGET
 static int s5pc1xx_phy_control(int on)
 {
+#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
        int ret;
        static int status;
        struct pmic *p = pmic_get("MAX8998_PMIC");
@@ -179,7 +178,7 @@ static int s5pc1xx_phy_control(int on)
                status = 0;
        }
        udelay(10000);
-
+#endif
        return 0;
 }