]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 14:20:26 +0000 (10:20 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 14:20:26 +0000 (10:20 -0400)
arch/arm/dts/exynos4210-trats.dts
arch/arm/dts/exynos4412-odroid.dts
arch/arm/dts/exynos4412-trats2.dts
board/samsung/trats/trats.c
board/samsung/trats2/trats2.c
configs/trats2_defconfig
configs/trats_defconfig

index 69c0605184c4544568909ff78577472beb76e92f..ac422e4fc405431d486a6df45a0fa4c37c6d949e 100644 (file)
@@ -23,6 +23,7 @@
                console = "/serial@13820000";
                mmc0 = "/sdhci@12510000";
                mmc2 = "/sdhci@12530000";
+               i2c8 = &i2c_fg;
        };
 
        fimd@11c00000 {
        dwmmc@12550000 {
                status = "disabled";
        };
+
+       i2c_fg: fuel-gauge {
+               compatible = "i2c-gpio";
+               gpios = <&gpy4 1 0>,    /* sda */
+                       <&gpy4 0 0>;    /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+               status = "okay";
+       };
 };
 
 &i2c_5 {
index 188cb939bb8a1795037c937b9b7101c0900a90ef..8710747e38e42d579a4f31b0b8c99b1dda70a4e2 100644 (file)
 
                                buck8_reg: BUCK8 {
                                        regulator-name = "VCC_P3V3_2.85V";
-                                       regulator-min-microvolt = <2850000>;
+                                       regulator-min-microvolt = <750000>;
                                        regulator-max-microvolt = <3300000>;
                                };
                        };
index 1fbcf8914fa50050fbdffbd64ed41b3262ad1fa7..fd9e48c899c3f20c4324f6c411b7eb6bc397c56a 100644 (file)
@@ -27,6 +27,8 @@
                i2c5 = "/i2c@138b0000";
                i2c6 = "/i2c@138c0000";
                i2c7 = "/i2c@138d0000";
+               i2c8 = &i2c_fg;
+               i2c9 = &i2c_max77693;
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
                mmc0 = "/sdhci@12510000";
                mshc0 = "/dwmmc@12550000";
        };
 
+       i2c_fg: fuel-gauge {
+               compatible = "i2c-gpio";
+               gpios = <&gpf1 5 0>,    /* sda */
+                       <&gpf1 4 0>;    /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+               status = "okay";
+       };
+
+       i2c_max77693: max77693 {
+               compatible = "i2c-gpio";
+               gpio = <&gpm2 0 0>,     /* sda */
+                      <&gpm2 1 0>;     /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+               status = "okay";
+       };
+
        i2c@138d0000 {
                samsung,i2c-sda-delay = <100>;
                samsung,i2c-slave-addr = <0x10>;
index 7200c2ee0b1e2a51075f2c53335e8780bf399be3..00059a13174af9968da5afa3bbe8138512b42361 100644 (file)
@@ -23,6 +23,7 @@
 #include <power/max8997_muic.h>
 #include <power/battery.h>
 #include <power/max17042_fg.h>
+#include <power/pmic.h>
 #include <libtizen.h>
 #include <usb.h>
 #include <usb_mass_storage.h>
@@ -51,26 +52,6 @@ int exynos_init(void)
        return 0;
 }
 
-void i2c_init_board(void)
-{
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       int err;
-
-       /* I2C_5 -> PMIC */
-       err = exynos_pinmux_config(PERIPH_ID_I2C5, PINMUX_FLAG_NONE);
-       if (err) {
-               debug("I2C%d not configured\n", (I2C_5));
-               return;
-       }
-
-       /* I2C_8 -> FG */
-       gpio_request(EXYNOS4_GPIO_Y40, "i2c_clk");
-       gpio_request(EXYNOS4_GPIO_Y41, "i2c_data");
-       gpio_direction_output(EXYNOS4_GPIO_Y40, 1);
-       gpio_direction_output(EXYNOS4_GPIO_Y41, 1);
-#endif
-}
-
 #ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
 static void trats_low_power_mode(void)
 {
@@ -129,156 +110,6 @@ static void trats_low_power_mode(void)
        writel(0x0, &clk->gate_ip_image);       /* IMAGE */
        writel(0x0, &clk->gate_ip_gps); /* GPS */
 }
-
-static int pmic_init_max8997(void)
-{
-       struct pmic *p = pmic_get("MAX8997_PMIC");
-       int i = 0, ret = 0;
-       u32 val;
-
-       if (pmic_probe(p))
-               return -1;
-
-       /* BUCK1 VARM: 1.2V */
-       val = (1200000 - 650000) / 25000;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK1DVS1, val);
-       val = ENBUCK | ACTIVE_DISCHARGE;                /* DVS OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK1CTRL, val);
-
-       /* BUCK2 VINT: 1.1V */
-       val = (1100000 - 650000) / 25000;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK2DVS1, val);
-       val = ENBUCK | ACTIVE_DISCHARGE;                /* DVS OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK2CTRL, val);
-
-
-       /* BUCK3 G3D: 1.1V - OFF */
-       ret |= pmic_reg_read(p, MAX8997_REG_BUCK3CTRL, &val);
-       val &= ~ENBUCK;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK3CTRL, val);
-
-       val = (1100000 - 750000) / 50000;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK3DVS, val);
-
-       /* BUCK4 CAMISP: 1.2V - OFF */
-       ret |= pmic_reg_read(p, MAX8997_REG_BUCK4CTRL, &val);
-       val &= ~ENBUCK;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK4CTRL, val);
-
-       val = (1200000 - 650000) / 25000;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK4DVS, val);
-
-       /* BUCK5 VMEM: 1.2V */
-       val = (1200000 - 650000) / 25000;
-       for (i = 0; i < 8; i++)
-               ret |= pmic_reg_write(p, MAX8997_REG_BUCK5DVS1 + i, val);
-
-       val = ENBUCK | ACTIVE_DISCHARGE;                /* DVS OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK5CTRL, val);
-
-       /* BUCK6 CAM AF: 2.8V */
-       /* No Voltage Setting Register */
-       /* GNSLCT 3.0X */
-       val = GNSLCT;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK6CTRL, val);
-
-       /* BUCK7 VCC_SUB: 2.0V */
-       val = (2000000 - 750000) / 50000;
-       ret |= pmic_reg_write(p, MAX8997_REG_BUCK7DVS, val);
-
-       /* LDO1 VADC: 3.3V */
-       val = max8997_reg_ldo(3300000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO1CTRL, val);
-
-       /* LDO1 Disable active discharging */
-       ret |= pmic_reg_read(p, MAX8997_REG_LDO1CONFIG, &val);
-       val &= ~LDO_ADE;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO1CONFIG, val);
-
-       /* LDO2 VALIVE: 1.1V */
-       val = max8997_reg_ldo(1100000) | EN_LDO;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO2CTRL, val);
-
-       /* LDO3 VUSB/MIPI: 1.1V */
-       val = max8997_reg_ldo(1100000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO3CTRL, val);
-
-       /* LDO4 VMIPI: 1.8V */
-       val = max8997_reg_ldo(1800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO4CTRL, val);
-
-       /* LDO5 VHSIC: 1.2V */
-       val = max8997_reg_ldo(1200000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO5CTRL, val);
-
-       /* LDO6 VCC_1.8V_PDA: 1.8V */
-       val = max8997_reg_ldo(1800000) | EN_LDO;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO6CTRL, val);
-
-       /* LDO7 CAM_ISP: 1.8V */
-       val = max8997_reg_ldo(1800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO7CTRL, val);
-
-       /* LDO8 VDAC/VUSB: 3.3V */
-       val = max8997_reg_ldo(3300000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO8CTRL, val);
-
-       /* LDO9 VCC_2.8V_PDA: 2.8V */
-       val = max8997_reg_ldo(2800000) | EN_LDO;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO9CTRL, val);
-
-       /* LDO10 VPLL: 1.1V */
-       val = max8997_reg_ldo(1100000) | EN_LDO;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO10CTRL, val);
-
-       /* LDO11 TOUCH: 2.8V */
-       val = max8997_reg_ldo(2800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO11CTRL, val);
-
-       /* LDO12 VTCAM: 1.8V */
-       val = max8997_reg_ldo(1800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO12CTRL, val);
-
-       /* LDO13 VCC_3.0_LCD: 3.0V */
-       val = max8997_reg_ldo(3000000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO13CTRL, val);
-
-       /* LDO14 MOTOR: 3.0V */
-       val = max8997_reg_ldo(3000000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO14CTRL, val);
-
-       /* LDO15 LED_A: 2.8V */
-       val = max8997_reg_ldo(2800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO15CTRL, val);
-
-       /* LDO16 CAM_SENSOR: 1.8V */
-       val = max8997_reg_ldo(1800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO16CTRL, val);
-
-       /* LDO17 VTF: 2.8V */
-       val = max8997_reg_ldo(2800000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO17CTRL, val);
-
-       /* LDO18 TOUCH_LED 3.3V */
-       val = max8997_reg_ldo(3300000) | DIS_LDO;       /* OFF */
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO18CTRL, val);
-
-       /* LDO21 VDDQ: 1.2V */
-       val = max8997_reg_ldo(1200000) | EN_LDO;
-       ret |= pmic_reg_write(p, MAX8997_REG_LDO21CTRL, val);
-
-       /* SAFEOUT for both 1 and 2: 4.9V, Active discharge, Enable */
-       val = (SAFEOUT_4_90V << 0) | (SAFEOUT_4_90V << 2) |
-               ACTDISSAFEO1 | ACTDISSAFEO2 | ENSAFEOUT1 | ENSAFEOUT2;
-       ret |= pmic_reg_write(p, MAX8997_REG_SAFEOUTCTRL, val);
-
-       if (ret) {
-               puts("MAX8997 PMIC setting error!\n");
-               return -1;
-       }
-
-       return 0;
-}
 #endif
 
 int exynos_power_init(void)
@@ -295,9 +126,7 @@ int exynos_power_init(void)
         * The FUEL_GAUGE is marked as I2C9 on the schematic, but connected
         * to logical I2C adapter 1
         */
-       ret = pmic_init(I2C_5);
-       ret |= pmic_init_max8997();
-       ret |= power_fg_init(I2C_9);
+       ret = power_fg_init(I2C_9);
        ret |= power_muic_init(I2C_5);
        ret |= power_bat_init(0);
        if (ret)
@@ -391,39 +220,59 @@ static void check_hw_revision(void)
 #ifdef CONFIG_USB_GADGET
 static int s5pc210_phy_control(int on)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       int ret = 0;
-       u32 val = 0;
-       struct pmic *p = pmic_get("MAX8997_PMIC");
-       if (!p)
-               return -ENODEV;
+       struct udevice *dev;
+       int reg, ret;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8997-pmic", &dev);
+       if (ret)
+               return ret;
 
        if (on) {
-               ret |= pmic_set_output(p, MAX8997_REG_SAFEOUTCTRL,
-                                     ENSAFEOUT1, LDO_ON);
-               ret |= pmic_reg_read(p, MAX8997_REG_LDO3CTRL, &val);
-               ret |= pmic_reg_write(p, MAX8997_REG_LDO3CTRL, EN_LDO | val);
-
-               ret |= pmic_reg_read(p, MAX8997_REG_LDO8CTRL, &val);
-               ret |= pmic_reg_write(p, MAX8997_REG_LDO8CTRL, EN_LDO | val);
+               reg = pmic_reg_read(dev, MAX8997_REG_SAFEOUTCTRL);
+               reg |= ENSAFEOUT1;
+               ret = pmic_reg_write(dev, MAX8997_REG_SAFEOUTCTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
+               reg = pmic_reg_read(dev, MAX8997_REG_LDO3CTRL);
+               reg |= EN_LDO;
+               ret = pmic_reg_write(dev, MAX8997_REG_LDO3CTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
+               reg = pmic_reg_read(dev, MAX8997_REG_LDO8CTRL);
+               reg |= EN_LDO;
+               ret = pmic_reg_write(dev, MAX8997_REG_LDO8CTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
        } else {
-               ret |= pmic_reg_read(p, MAX8997_REG_LDO8CTRL, &val);
-               ret |= pmic_reg_write(p, MAX8997_REG_LDO8CTRL, DIS_LDO | val);
-
-               ret |= pmic_reg_read(p, MAX8997_REG_LDO3CTRL, &val);
-               ret |= pmic_reg_write(p, MAX8997_REG_LDO3CTRL, DIS_LDO | val);
-               ret |= pmic_set_output(p, MAX8997_REG_SAFEOUTCTRL,
-                                     ENSAFEOUT1, LDO_OFF);
-       }
+               reg = pmic_reg_read(dev, MAX8997_REG_LDO8CTRL);
+               reg &= DIS_LDO;
+               ret = pmic_reg_write(dev, MAX8997_REG_LDO8CTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
+               reg = pmic_reg_read(dev, MAX8997_REG_LDO3CTRL);
+               reg &= DIS_LDO;
+               ret = pmic_reg_write(dev, MAX8997_REG_LDO3CTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
+               reg = pmic_reg_read(dev, MAX8997_REG_SAFEOUTCTRL);
+               reg &= ~ENSAFEOUT1;
+               ret = pmic_reg_write(dev, MAX8997_REG_SAFEOUTCTRL, reg);
+               if (ret) {
+                       puts("MAX8997 setting error!\n");
+                       return ret;
+               }
 
-       if (ret) {
-               puts("MAX8997 LDO setting error!\n");
-               return -1;
        }
-#endif
 
        return 0;
 }
index 150503ec15888321ad842459bc2435498d4cc7aa..f9acbd3571216e31311a749f3b2e01c916888a56 100644 (file)
@@ -100,50 +100,6 @@ static void board_external_gpio_init(void)
        gpio_set_pull(EXYNOS4X12_GPIO_X37, S5P_GPIO_PULL_NONE); /* HDMI_HPD */
 }
 
-#ifdef CONFIG_SYS_I2C_INIT_BOARD
-static void board_init_i2c(void)
-{
-       int err;
-
-       /* I2C_7 */
-       err = exynos_pinmux_config(PERIPH_ID_I2C7, PINMUX_FLAG_NONE);
-       if (err) {
-               debug("I2C%d not configured\n", (I2C_7));
-               return;
-       }
-
-       /* I2C_8 */
-       gpio_request(EXYNOS4X12_GPIO_F14, "i2c8_clk");
-       gpio_request(EXYNOS4X12_GPIO_F15, "i2c8_data");
-       gpio_direction_output(EXYNOS4X12_GPIO_F14, 1);
-       gpio_direction_output(EXYNOS4X12_GPIO_F15, 1);
-
-       /* I2C_9 */
-       gpio_request(EXYNOS4X12_GPIO_M21, "i2c9_clk");
-       gpio_request(EXYNOS4X12_GPIO_M20, "i2c9_data");
-       gpio_direction_output(EXYNOS4X12_GPIO_M21, 1);
-       gpio_direction_output(EXYNOS4X12_GPIO_M20, 1);
-}
-#endif
-
-#ifdef CONFIG_SYS_I2C_SOFT
-int get_soft_i2c_scl_pin(void)
-{
-       if (I2C_ADAP_HWNR)
-               return EXYNOS4X12_GPIO_M21; /* I2C9 */
-       else
-               return EXYNOS4X12_GPIO_F14; /* I2C8 */
-}
-
-int get_soft_i2c_sda_pin(void)
-{
-       if (I2C_ADAP_HWNR)
-               return EXYNOS4X12_GPIO_M20; /* I2C9 */
-       else
-               return EXYNOS4X12_GPIO_F15; /* I2C8 */
-}
-#endif
-
 int exynos_early_init_f(void)
 {
        board_external_gpio_init();
@@ -179,11 +135,6 @@ int exynos_power_init(void)
        struct power_battery *pb;
        struct pmic *p_chrg, *p_muic, *p_fg, *p_bat;
 
-#ifdef CONFIG_SYS_I2C_INIT_BOARD
-       board_init_i2c();
-#endif
-       pmic_init(I2C_7);               /* I2C adapter 7 - bus name s3c24x0_7 */
-       pmic_init_max77686();
        pmic_init_max77693(I2C_10);     /* I2C adapter 10 - bus name soft1 */
        power_muic_init(I2C_10);        /* I2C adapter 10 - bus name soft1 */
        power_fg_init(I2C_9);           /* I2C adapter 9 - bus name soft0 */
@@ -331,61 +282,6 @@ int g_dnl_board_usb_cable_connected(void)
 }
 #endif
 
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-static int pmic_init_max77686(void)
-{
-       struct pmic *p = pmic_get("MAX77686_PMIC");
-
-       if (pmic_probe(p))
-               return -1;
-
-       /* BUCK/LDO Output Voltage */
-       max77686_set_ldo_voltage(p, 21, 2800000);       /* LDO21 VTF_2.8V */
-       max77686_set_ldo_voltage(p, 23, 3300000);       /* LDO23 TSP_AVDD_3.3V*/
-       max77686_set_ldo_voltage(p, 24, 1800000);       /* LDO24 TSP_VDD_1.8V */
-
-       /* BUCK/LDO Output Mode */
-       max77686_set_buck_mode(p, 1, OPMODE_STANDBY);   /* BUCK1 VMIF_1.1V_AP */
-       max77686_set_buck_mode(p, 2, OPMODE_ON);        /* BUCK2 VARM_1.0V_AP */
-       max77686_set_buck_mode(p, 3, OPMODE_ON);        /* BUCK3 VINT_1.0V_AP */
-       max77686_set_buck_mode(p, 4, OPMODE_ON);        /* BUCK4 VG3D_1.0V_AP */
-       max77686_set_buck_mode(p, 5, OPMODE_ON);        /* BUCK5 VMEM_1.2V_AP */
-       max77686_set_buck_mode(p, 6, OPMODE_ON);        /* BUCK6 VCC_SUB_1.35V*/
-       max77686_set_buck_mode(p, 7, OPMODE_ON);        /* BUCK7 VCC_SUB_2.0V */
-       max77686_set_buck_mode(p, 8, OPMODE_OFF);       /* VMEM_VDDF_2.85V */
-       max77686_set_buck_mode(p, 9, OPMODE_OFF);       /* CAM_ISP_CORE_1.2V*/
-
-       max77686_set_ldo_mode(p, 1, OPMODE_LPM);        /* LDO1 VALIVE_1.0V_AP*/
-       max77686_set_ldo_mode(p, 2, OPMODE_STANDBY);    /* LDO2 VM1M2_1.2V_AP */
-       max77686_set_ldo_mode(p, 3, OPMODE_LPM);        /* LDO3 VCC_1.8V_AP */
-       max77686_set_ldo_mode(p, 4, OPMODE_LPM);        /* LDO4 VCC_2.8V_AP */
-       max77686_set_ldo_mode(p, 5, OPMODE_OFF);        /* LDO5_VCC_1.8V_IO */
-       max77686_set_ldo_mode(p, 6, OPMODE_STANDBY);    /* LDO6 VMPLL_1.0V_AP */
-       max77686_set_ldo_mode(p, 7, OPMODE_STANDBY);    /* LDO7 VPLL_1.0V_AP */
-       max77686_set_ldo_mode(p, 8, OPMODE_LPM);        /* LDO8 VMIPI_1.0V_AP */
-       max77686_set_ldo_mode(p, 9, OPMODE_OFF);        /* CAM_ISP_MIPI_1.2*/
-       max77686_set_ldo_mode(p, 10, OPMODE_LPM);       /* LDO10 VMIPI_1.8V_AP*/
-       max77686_set_ldo_mode(p, 11, OPMODE_STANDBY);   /* LDO11 VABB1_1.8V_AP*/
-       max77686_set_ldo_mode(p, 12, OPMODE_LPM);       /* LDO12 VUOTG_3.0V_AP*/
-       max77686_set_ldo_mode(p, 13, OPMODE_OFF);       /* LDO13 VC2C_1.8V_AP */
-       max77686_set_ldo_mode(p, 14, OPMODE_STANDBY);   /* VABB02_1.8V_AP */
-       max77686_set_ldo_mode(p, 15, OPMODE_STANDBY);   /* LDO15 VHSIC_1.0V_AP*/
-       max77686_set_ldo_mode(p, 16, OPMODE_STANDBY);   /* LDO16 VHSIC_1.8V_AP*/
-       max77686_set_ldo_mode(p, 17, OPMODE_OFF);       /* CAM_SENSOR_CORE_1.2*/
-       max77686_set_ldo_mode(p, 18, OPMODE_OFF);       /* CAM_ISP_SEN_IO_1.8V*/
-       max77686_set_ldo_mode(p, 19, OPMODE_OFF);       /* LDO19 VT_CAM_1.8V */
-       max77686_set_ldo_mode(p, 20, OPMODE_ON);        /* LDO20 VDDQ_PRE_1.8V*/
-       max77686_set_ldo_mode(p, 21, OPMODE_OFF);       /* LDO21 VTF_2.8V */
-       max77686_set_ldo_mode(p, 22, OPMODE_OFF);       /* LDO22 VMEM_VDD_2.8V*/
-       max77686_set_ldo_mode(p, 23, OPMODE_OFF);       /* LDO23 TSP_AVDD_3.3V*/
-       max77686_set_ldo_mode(p, 24, OPMODE_OFF);       /* LDO24 TSP_VDD_1.8V */
-       max77686_set_ldo_mode(p, 25, OPMODE_OFF);       /* LDO25 VCC_3.3V_LCD */
-       max77686_set_ldo_mode(p, 26, OPMODE_OFF);       /*LDO26 VCC_3.0V_MOTOR*/
-
-       return 0;
-}
-#endif
-
 /*
  * LCD
  */
index ab76aa30cd05f29982a02c09c68f6811c49487dd..6f9bdb28f43a26af3113d48c4e1eabd28856e4d9 100644 (file)
@@ -34,11 +34,15 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
+CONFIG_DM_I2C_GPIO=y
 CONFIG_DFU_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_S5P=y
+CONFIG_DM_PMIC=y
+CONFIG_DM_PMIC_MAX77686=y
+CONFIG_SYS_I2C_S3C24X0=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
index 7fe6c3d7bb9d03e01ba31180b760b42edb7dddd4..23024fdd6db783e0b5dc68c199e319b3dc460cb1 100644 (file)
@@ -34,10 +34,14 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_OF_CONTROL=y
 CONFIG_DFU_MMC=y
+CONFIG_DM_I2C_GPIO=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_SDMA=y
 CONFIG_MMC_SDHCI_S5P=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_MAX8997=y
+CONFIG_SYS_I2C_S3C24X0=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y