Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / arch / arm / dts / exynos54xx.dtsi

diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi
index 916cf3a5b6681dd72d061eb7e48ab88d2ab8c270..daa6a33c5b5501566d399be0bb29700f5b301dad 100644 (file)
--- a/arch/arm/dts/exynos54xx.dtsi
+++ b/arch/arm/dts/exynos54xx.dtsi
@@ -14,17 +14,17 @@
        };
 
        aliases {
-               i2c0 = "/i2c@12c60000";
-               i2c1 = "/i2c@12c70000";
-               i2c2 = "/i2c@12c80000";
-               i2c3 = "/i2c@12c90000";
-               i2c4 = "/i2c@12ca0000";
-               i2c5 = "/i2c@12cb0000";
-               i2c6 = "/i2c@12cc0000";
-               i2c7 = "/i2c@12cd0000";
-               i2c8 = "/i2c@12e00000";
-               i2c9 = "/i2c@12e10000";
-               i2c10 = "/i2c@12e20000";
+               i2c0 = "/i2c@12C60000";
+               i2c1 = "/i2c@12C70000";
+               i2c2 = "/i2c@12C80000";
+               i2c3 = "/i2c@12C90000";
+               i2c4 = "/i2c@12CA0000";
+               i2c5 = "/i2c@12CB0000";
+               i2c6 = "/i2c@12CC0000";
+               i2c7 = "/i2c@12CD0000";
+               i2c8 = "/i2c@12E00000";
+               i2c9 = "/i2c@12E10000";
+               i2c10 = "/i2c@12E20000";
                pinctrl0 = &pinctrl_0;
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
@@ -42,7 +42,14 @@
                xhci1 = "/xhci@12400000";
        };
 
-       i2c@12ca0000 {
+       adc@12D10000 {
+               compatible = "samsung,exynos-adc-v2";
+               reg = <0x12D10000 0x100>;
+               interrupts = <0 106 0>;
+               status = "disabled";
+       };
+
+       i2c@12CA0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -50,7 +57,7 @@
                interrupts = <0 60 0>;
        };
 
-       i2c@12cb0000 {
+       i2c@12CB0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -58,7 +65,7 @@
                interrupts = <0 61 0>;
        };
 
-       i2c@12cc0000 {
+       i2c@12CC0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -66,7 +73,7 @@
                interrupts = <0 62 0>;
        };
 
-       i2c@12cd0000 {
+       i2c@12CD0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -74,7 +81,7 @@
                interrupts = <0 63 0>;
        };
 
-       i2c@12e00000 {
+       i2c@12E00000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -82,7 +89,7 @@
                interrupts = <0 87 0>;
        };
 
-       i2c@12e10000 {
+       i2c@12E10000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -90,7 +97,7 @@
                interrupts = <0 88 0>;
        };
 
-       i2c@12e20000 {
+       i2c@12E20000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -168,6 +175,7 @@
        fimd@14400000 {
                /* sysmmu is not used in U-Boot */
                samsung,disable-sysmmu;
+               samsung,pwm-out-gpio = <&gpb2 0 GPIO_ACTIVE_HIGH>;
        };
 
        dp@145b0000 {