Merge git://git.denx.de/u-boot-samsung
authorTom Rini <trini@konsulko.com>
Wed, 18 Jan 2017 12:21:12 +0000 (07:21 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 18 Jan 2017 12:21:12 +0000 (07:21 -0500)
16 files changed:
arch/arm/dts/exynos4.dtsi
arch/arm/dts/exynos4210-universal_c210.dts
arch/arm/dts/s5pc1xx-goni.dts
board/samsung/common/exynos5-dt.c
board/samsung/goni/goni.c
board/samsung/universal_c210/universal.c
configs/arndale_defconfig
configs/peach-pi_defconfig
configs/peach-pit_defconfig
configs/s5pc210_universal_defconfig
configs/smdk5250_defconfig
configs/snow_defconfig
configs/spring_defconfig
drivers/i2c/Kconfig
drivers/i2c/s3c24x0_i2c.c
include/configs/exynos5250-common.h

index 7de227c..a5a00c8 100644 (file)
 #include "skeleton.dtsi"
 
 / {
+       aliases {
+               i2c0 = &i2c_0;
+               i2c1 = &i2c_1;
+               i2c2 = &i2c_2;
+               i2c3 = &i2c_3;
+               i2c4 = &i2c_4;
+               i2c5 = &i2c_5;
+               i2c6 = &i2c_6;
+               i2c7 = &i2c_7;
+       };
+
        combiner: interrupt-controller@10440000 {
                compatible = "samsung,exynos4210-combiner";
                #interrupt-cells = <2>;
@@ -47,7 +58,7 @@
                id = <4>;
        };
 
-       i2c@13860000 {
+       i2c_0: i2c@13860000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -55,7 +66,7 @@
                interrupts = <0 56 0>;
        };
 
-       i2c@13870000 {
+       i2c_1: i2c@13870000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -63,7 +74,7 @@
                interrupts = <1 57 0>;
        };
 
-       i2c@13880000 {
+       i2c_2: i2c@13880000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -71,7 +82,7 @@
                interrupts = <2 58 0>;
        };
 
-       i2c@13890000 {
+       i2c_3: i2c@13890000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -79,7 +90,7 @@
                interrupts = <3 59 0>;
        };
 
-       i2c@138a0000 {
+       i2c_4: i2c@138a0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -87,7 +98,7 @@
                interrupts = <4 60 0>;
        };
 
-       i2c@138b0000 {
+       i2c_5: i2c@138b0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
                interrupts = <5 61 0>;
        };
 
-       i2c@138c0000 {
+       i2c_6: i2c@138c0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
                interrupts = <6 62 0>;
        };
 
-       i2c@138d0000 {
+       i2c_7: i2c@138d0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
index 8cac7dd..5763627 100644 (file)
                samsung,rgb-mode = <0>;
        };
 };
+
+&i2c_5 {
+       clock-frequency = <100000>;
+       status = "okay";
+
+       max8998-pmic@66 {
+               compatible = "maxim,max8998";
+               reg = <0x66 0 0>;
+               voltage-regulators {
+                       ldo2_reg: LDO2 {
+                               regulator-name = "VALIVE_1.2V";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                               regulator-always-on;
+                       };
+
+                       ldo3_reg: LDO3 {
+                               regulator-name = "VUSB+MIPI_1.1V";
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1100000>;
+                               regulator-always-on;
+                       };
+
+                       ldo4_reg: LDO4 {
+                               regulator-name = "VADC_3.3V";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       ldo5_reg: LDO5 {
+                               regulator-name = "VTF_2.8V";
+                               regulator-min-microvolt = <2800000>;
+                               regulator-max-microvolt = <2800000>;
+                       };
+
+                       ldo6_reg: LDO6 {
+                               regulator-name = "LDO6";
+                               regulator-min-microvolt = <2000000>;
+                               regulator-max-microvolt = <2000000>;
+                       };
+
+                       ldo7_reg: LDO7 {
+                               regulator-name = "VLCD+VMIPI_1.8V";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                       };
+
+                       ldo8_reg: LDO8 {
+                               regulator-name = "VUSB+VDAC_3.3V";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       ldo9_reg: LDO9 {
+                               regulator-name = "VCC_2.8V";
+                               regulator-min-microvolt = <2800000>;
+                               regulator-max-microvolt = <2800000>;
+                               regulator-always-on;
+                       };
+
+                       ldo10_reg: LDO10 {
+                               regulator-name = "VPLL_1.1V";
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1100000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo11_reg: LDO11 {
+                               regulator-name = "CAM_AF_3.3V";
+                               regulator-min-microvolt = <3300000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       ldo12_reg: LDO12 {
+                               regulator-name = "PS_2.8V";
+                               regulator-min-microvolt = <2800000>;
+                               regulator-max-microvolt = <2800000>;
+                       };
+
+                       ldo13_reg: LDO13 {
+                               regulator-name = "VHIC_1.2V";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                       };
+
+                       ldo14_reg: LDO14 {
+                               regulator-name = "CAM_I_HOST_1.8V";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                       };
+
+                       ldo15_reg: LDO15 {
+                               regulator-name = "CAM_S_DIG+FM33_CORE_1.2V";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                       };
+
+                       ldo16_reg: LDO16 {
+                               regulator-name = "CAM_S_ANA_2.8V";
+                               regulator-min-microvolt = <2800000>;
+                               regulator-max-microvolt = <2800000>;
+                       };
+
+                       ldo17_reg: LDO17 {
+                               regulator-name = "VCC_3.0V_LCD";
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+
+                       buck1_reg: BUCK1 {
+                               regulator-name = "VINT_1.1V";
+                               regulator-min-microvolt = <750000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       buck2_reg: BUCK2 {
+                               regulator-name = "VG3D_1.1V";
+                               regulator-min-microvolt = <750000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                       };
+
+                       buck3_reg: BUCK3 {
+                               regulator-name = "VCC_1.8V";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-always-on;
+                       };
+
+                       buck4_reg: BUCK4 {
+                               regulator-name = "VMEM_1.2V";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                               regulator-always-on;
+                       };
+
+                       ap32khz_reg: EN32KHz-AP {
+                               regulator-name = "32KHz AP";
+                               regulator-always-on;
+                       };
+
+                       cp32khz_reg: EN32KHz-CP {
+                               regulator-name = "32KHz CP";
+                       };
+
+                       vichg_reg: ENVICHG {
+                               regulator-name = "VICHG";
+                       };
+
+                       safeout1_reg: ESAFEOUT1 {
+                               regulator-name = "SAFEOUT1";
+                       };
+
+                       safeout2_reg: ESAFEOUT2 {
+                               regulator-name = "SAFEOUT2";
+                               regulator-boot-on;
+                       };
+               };
+       };
+};
index e80132d..182325a 100644 (file)
@@ -42,7 +42,7 @@
                #size-cells = <0>;
                status = "okay";
 
-               pmic@66 {
+               max8998-pmic@66 {
                        compatible = "maxim,max8998";
                        reg = <0x66 0 0>;
 
index 2e3b16d..aec1f39 100644 (file)
@@ -123,13 +123,7 @@ int exynos_power_init(void)
        if (ret)
                return ret;
 
-       /*
-        * This would normally be 1.3V, but since we are running slowly 1.1V
-        * is enough. For spring it helps reduce CPU temperature and avoid
-        * hangs with the case open. 1.1V is minimum voltage borderline for
-        * chained bootloaders.
-        */
-       ret = exynos_set_regulator("vdd_arm", 1100000);
+       ret = exynos_set_regulator("vdd_arm", 1300000);
        if (ret)
                return ret;
        ret = exynos_set_regulator("vdd_int", 1012500);
index b066832..9c48d71 100644 (file)
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
+#include <dm.h>
 #include <power/pmic.h>
 #include <usb/dwc2_udc.h>
 #include <asm/arch/cpu.h>
@@ -43,19 +44,6 @@ void i2c_init_board(void)
 }
 #endif
 
-int power_init_board(void)
-{
-#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
-        */
-       return pmic_init(I2C_0);
-#else
-       return 0;
-#endif
-}
-
 int dram_init(void)
 {
        gd->ram_size = PHYS_SDRAM_1_SIZE + PHYS_SDRAM_2_SIZE +
@@ -146,39 +134,50 @@ 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;
+       struct udevice *dev;
        static int status;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       int reg, ret;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret)
+               return ret;
 
        if (on && !status) {
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_ON);
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_ON);
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg |= MAX8998_LDO3;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
                if (ret) {
                        puts("MAX8998 LDO setting error!\n");
-                       return -1;
+                       return -EINVAL;
+               }
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg |= MAX8998_LDO8;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+               if (ret) {
+                       puts("MAX8998 LDO setting error!\n");
+                       return -EINVAL;
                }
                status = 1;
        } else if (!on && status) {
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_OFF);
-               ret = pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_OFF);
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg &= ~MAX8998_LDO3;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+               if (ret) {
+                       puts("MAX8998 LDO setting error!\n");
+                       return -EINVAL;
+               }
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg &= ~MAX8998_LDO8;
+               ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
                if (ret) {
                        puts("MAX8998 LDO setting error!\n");
-                       return -1;
+                       return -EINVAL;
                }
                status = 0;
        }
        udelay(10000);
-#endif
        return 0;
 }
 
index c3946ee..feb8a34 100644 (file)
 DECLARE_GLOBAL_DATA_PTR;
 
 unsigned int board_rev;
+static int init_pmic_lcd(void);
 
 u32 get_board_rev(void)
 {
        return board_rev;
 }
 
-static int get_hwrev(void)
+int exynos_power_init(void)
 {
-       return board_rev & 0xFF;
+       return init_pmic_lcd();
 }
 
-int exynos_power_init(void)
+static int get_hwrev(void)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       int ret;
-
-       /*
-        * 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;
-
-       init_pmic_lcd();
-#endif
-       return 0;
+       return board_rev & 0xFF;
 }
 
 static unsigned short get_adc_value(int channel)
@@ -83,23 +71,29 @@ static unsigned short get_adc_value(int channel)
 
 static int adc_power_control(int on)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
+       struct udevice *dev;
        int ret;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       u8 reg;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
+               return ret;
+       }
 
-       ret = pmic_set_output(p,
-                             MAX8998_REG_ONOFF1,
-                             MAX8998_LDO4, !!on);
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+       if (on)
+               reg |= MAX8998_LDO4;
+       else
+               reg &= ~MAX8998_LDO4;
+
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
+               return -EINVAL;
+       }
 
-       return ret;
-#else
        return 0;
-#endif
 }
 
 static unsigned int get_hw_revision(void)
@@ -147,39 +141,50 @@ 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;
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-       if (!p)
-               return -ENODEV;
+       struct udevice *dev;
+       int ret;
+       u8 reg;
 
-       if (pmic_probe(p))
-               return -1;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
+               return ret;
+       }
 
        if (on) {
-               ret |= pmic_set_output(p,
-                                      MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
-                                      MAX8998_SAFEOUT1, LDO_ON);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_ON);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_ON);
+               reg = pmic_reg_read(dev, MAX8998_REG_BUCK_ACTIVE_DISCHARGE3);
+               reg |= MAX8998_SAFEOUT1;
+               ret |= pmic_reg_write(dev,
+                       MAX8998_REG_BUCK_ACTIVE_DISCHARGE3, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg |= MAX8998_LDO3;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg |= MAX8998_LDO8;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
 
        } else {
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF2,
-                                     MAX8998_LDO8, LDO_OFF);
-               ret |= pmic_set_output(p, MAX8998_REG_ONOFF1,
-                                     MAX8998_LDO3, LDO_OFF);
-               ret |= pmic_set_output(p,
-                                      MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
-                                      MAX8998_SAFEOUT1, LDO_OFF);
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+               reg &= ~MAX8998_LDO8;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_ONOFF1);
+               reg &= ~MAX8998_LDO3;
+               ret |= pmic_reg_write(dev, MAX8998_REG_ONOFF1, reg);
+
+               reg = pmic_reg_read(dev, MAX8998_REG_BUCK_ACTIVE_DISCHARGE3);
+               reg &= ~MAX8998_SAFEOUT1;
+               ret |= pmic_reg_write(dev,
+                       MAX8998_REG_BUCK_ACTIVE_DISCHARGE3, reg);
        }
 
        if (ret) {
                puts("MAX8998 LDO setting error!\n");
-               return -1;
+               return -EINVAL;
        }
-#endif
+
        return 0;
 }
 
@@ -205,27 +210,25 @@ int exynos_early_init_f(void)
        return 0;
 }
 
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-static void init_pmic_lcd(void)
+static int init_pmic_lcd(void)
 {
+       struct udevice *dev;
        unsigned char val;
        int ret = 0;
 
-       struct pmic *p = pmic_get("MAX8998_PMIC");
-
-       if (!p)
-               return;
-
-       if (pmic_probe(p))
-               return;
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998 for init_pmic_lcd()!\n");
+               return ret;
+       }
 
        /* LDO7 1.8V */
        val = 0x02; /* (1800 - 1600) / 100; */
-       ret |= pmic_reg_write(p,  MAX8998_REG_LDO7, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_LDO7, val);
 
        /* LDO17 3.0V */
        val = 0xe; /* (3000 - 1600) / 100; */
-       ret |= pmic_reg_write(p,  MAX8998_REG_LDO17, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_LDO17, val);
 
        /* Disable unneeded regulators */
        /*
@@ -234,26 +237,29 @@ static void init_pmic_lcd(void)
         * LDO2 ON, LDO3 OFF, LDO4 OFF, LDO5 ON
         */
        val = 0xB9;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF1, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF1, val);
 
        /* ONOFF2
         * LDO6 OFF, LDO7 ON, LDO8 OFF, LDO9 ON,
         * LDO10 OFF, LDO11 OFF, LDO12 OFF, LDO13 OFF
         */
        val = 0x50;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF2, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF2, val);
 
        /* ONOFF3
         * LDO14 OFF, LDO15 OFF, LGO16 OFF, LDO17 OFF
         * EPWRHOLD OFF, EBATTMON OFF, ELBCNFG2 OFF, ELBCNFG1 OFF
         */
        val = 0x00;
-       ret |= pmic_reg_write(p,  MAX8998_REG_ONOFF3, val);
+       ret |= pmic_reg_write(dev,  MAX8998_REG_ONOFF3, val);
 
-       if (ret)
+       if (ret) {
                puts("LCD pmic initialisation error!\n");
+               return -EINVAL;
+       }
+
+       return 0;
 }
-#endif
 
 void exynos_cfg_lcd_gpio(void)
 {
@@ -310,18 +316,31 @@ void exynos_reset_lcd(void)
 
 void exynos_lcd_power_on(void)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       struct pmic *p = pmic_get("MAX8998_PMIC");
+       struct udevice *dev;
+       int ret;
+       u8 reg;
 
-       if (!p)
+       ret = pmic_get("max8998-pmic", &dev);
+       if (ret) {
+               puts("Failed to get MAX8998!\n");
                return;
+       }
 
-       if (pmic_probe(p))
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF3);
+       reg |= MAX8998_LDO17;
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF3, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
                return;
+       }
 
-       pmic_set_output(p, MAX8998_REG_ONOFF3, MAX8998_LDO17, LDO_ON);
-       pmic_set_output(p, MAX8998_REG_ONOFF2, MAX8998_LDO7, LDO_ON);
-#endif
+       reg = pmic_reg_read(dev, MAX8998_REG_ONOFF2);
+       reg |= MAX8998_LDO7;
+       ret = pmic_reg_write(dev, MAX8998_REG_ONOFF2, reg);
+       if (ret) {
+               puts("MAX8998 LDO setting error\n");
+               return;
+       }
 }
 
 void exynos_cfg_ldo(void)
@@ -336,9 +355,6 @@ void exynos_enable_ldo(unsigned int onoff)
 
 int exynos_init(void)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       char buf[16];
-#endif
        gd->bd->bi_arch_number = MACH_TYPE_UNIVERSAL_C210;
 
        switch (get_hwrev()) {
@@ -363,14 +379,6 @@ int exynos_init(void)
                break;
        }
 
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-       /* Request soft I2C gpios */
-       strcpy(buf, "soft_i2c_scl");
-       gpio_request(CONFIG_SOFT_I2C_GPIO_SCL, buf);
-
-       strcpy(buf, "soft_i2c_sda");
-       gpio_request(CONFIG_SOFT_I2C_GPIO_SDA, buf);
-#endif
        check_hw_revision();
        printf("HW Revision:\t0x%x\n", board_rev);
 
index 2298def..a2cde44 100644 (file)
@@ -32,4 +32,6 @@ CONFIG_SOUND_MAX98095=y
 CONFIG_SOUND_WM8994=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
index 42b9f25..440cbcc 100644 (file)
@@ -61,5 +61,6 @@ CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y
+CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
index 7b4ebfe..d12e1a9 100644 (file)
@@ -61,5 +61,6 @@ CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y
+CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
index fad2b43..d9dfcba 100644 (file)
@@ -33,6 +33,9 @@ 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_MAX8998=y
+CONFIG_SYS_I2C_S3C24X0=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
index 4ef4143..a34f915 100644 (file)
@@ -44,6 +44,8 @@ CONFIG_SOUND_WM8994=y
 CONFIG_EXYNOS_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_ERRNO_STR=y
index ef3cfa1..2ef3774 100644 (file)
@@ -62,6 +62,8 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
@@ -69,5 +71,6 @@ CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y
 CONFIG_LCD=y
+CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
index 3bd8644..243a9ec 100644 (file)
@@ -62,11 +62,14 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_STORAGE=y
 CONFIG_DM_VIDEO=y
 CONFIG_DISPLAY=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y
+CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_TPM=y
 CONFIG_ERRNO_STR=y
index 051f911..71cc173 100644 (file)
@@ -155,6 +155,11 @@ config SYS_I2C_SANDBOX
                };
        };
 
+config SYS_I2C_S3C24X0
+       bool "Samsung I2C driver"
+       depends on ARCH_EXYNOS4 && DM_I2C
+       help
+         Support for Samsung I2C controller as Samsung SoCs.
 
 config SYS_I2C_UNIPHIER
        bool "UniPhier I2C driver"
index 2ece9f4..363cd04 100644 (file)
 #include <i2c.h>
 #include "s3c24x0_i2c.h"
 
+#ifndef CONFIG_SYS_I2C_S3C24X0_SLAVE
+#define SYS_I2C_S3C24X0_SLAVE_ADDR     0
+#else
+#define SYS_I2C_S3C24X0_SLAVE_ADDR     CONFIG_SYS_I2C_S3C24X0_SLAVE
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
@@ -87,7 +93,7 @@ static int s3c24x0_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
        i2c_bus->clock_frequency = speed;
 
        i2c_ch_init(i2c_bus->regs, i2c_bus->clock_frequency,
-                   CONFIG_SYS_I2C_S3C24X0_SLAVE);
+                   SYS_I2C_S3C24X0_SLAVE_ADDR);
 
        return 0;
 }
index 7d8921f..846739a 100644 (file)
@@ -31,6 +31,8 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_EXYNOS
 
+#define CONFIG_USB_XHCI_EXYNOS
+
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_ASIX88179