Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos5420-smdk5420.dts

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 69104850eb5ec172b6dcc5bd5256b0f759202abf..6052aa9c5659988a72a0aca8a94bc89025f3393d 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -68,6 +68,11 @@
                status = "okay";
        };
 
+       codec@11000000 {
+               samsung,mfc-r = <0x43000000 0x800000>;
+               samsung,mfc-l = <0x51000000 0x800000>;
+       };
+
        mmc@12200000 {
                status = "okay";
                broken-cd;
@@ -140,6 +145,22 @@
                };
        };
 
+       pinctrl@14000000 {
+               usb300_vbus_en: usb300-vbus-en {
+                       samsung,pins = "gpg0-5";
+                       samsung,pin-function = <1>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <0>;
+               };
+
+               usb301_vbus_en: usb301-vbus-en {
+                       samsung,pins = "gpg1-4";
+                       samsung,pin-function = <1>;
+                       samsung,pin-pud = <0>;
+                       samsung,pin-drv = <0>;
+               };
+       };
+
        hdmi@14530000 {
                status = "okay";
                hpd-gpio = <&gpx3 7 0>;
@@ -147,6 +168,36 @@
                pinctrl-0 = <&hdmi_hpd_irq>;
        };
 
+       usb300_vbus_reg: regulator-usb300 {
+               compatible = "regulator-fixed";
+               regulator-name = "VBUS0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpg0 5 0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&usb300_vbus_en>;
+               enable-active-high;
+       };
+
+       usb301_vbus_reg: regulator-usb301 {
+               compatible = "regulator-fixed";
+               regulator-name = "VBUS1";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpg1 4 0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&usb301_vbus_en>;
+               enable-active-high;
+       };
+
+       phy@12100000 {
+               vbus-supply = <&usb300_vbus_reg>;
+       };
+
+       phy@12500000 {
+               vbus-supply = <&usb301_vbus_reg>;
+       };
+
        i2c_2: i2c@12C80000 {
                samsung,i2c-sda-delay = <100>;
                samsung,i2c-max-bus-freq = <66000>;