Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi
index c21d798a23d0b54a295d6f0a90a8f5c578f925dc..b4ddf53a2ec18ed64336046252f4b6afb818c8e4 100644 (file)
--- a/arch/arm/dts/exynos54xx.dtsi
+++ b/arch/arm/dts/exynos54xx.dtsi
@@ -5,7 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-/include/ "exynos5.dtsi"
+#include "exynos5.dtsi"
+#include "exynos54xx-pinctrl.dtsi"
 
 / {
        config {
@@ -13,17 +14,22 @@
        };
 
        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;
+               pinctrl3 = &pinctrl_3;
+               pinctrl4 = &pinctrl_4;
                spi0 = "/spi@12d20000";
                spi1 = "/spi@12d30000";
                spi2 = "/spi@12d40000";
@@ -36,7 +42,14 @@
                xhci1 = "/xhci@12400000";
        };
 
-       i2c@12ca0000 {
+       adc@12D10000 {
+               compatible = "samsung,exynos-adc-v2";
+               reg = <0x12D10000 0x100>;
+               interrupts = <0 106 0>;
+               status = "disabled";
+       };
+
+       hsi2c_4: i2c@12CA0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -44,7 +57,7 @@
                interrupts = <0 60 0>;
        };
 
-       i2c@12cb0000 {
+       i2c@12CB0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -52,7 +65,7 @@
                interrupts = <0 61 0>;
        };
 
-       i2c@12cc0000 {
+       i2c@12CC0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -60,7 +73,7 @@
                interrupts = <0 62 0>;
        };
 
-       i2c@12cd0000 {
+       i2c@12CD0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -68,7 +81,7 @@
                interrupts = <0 63 0>;
        };
 
-       i2c@12e00000 {
+       i2c@12E00000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -76,7 +89,7 @@
                interrupts = <0 87 0>;
        };
 
-       i2c@12e10000 {
+       i2c@12E10000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -84,7 +97,7 @@
                interrupts = <0 88 0>;
        };
 
-       i2c@12e20000 {
+       i2c@12E20000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,exynos5-hsi2c";
@@ -123,12 +136,49 @@
                reg = <0x14680000 0x100>;
        };
 
+       pinctrl_0: pinctrl@13400000 {
+               compatible = "samsung,exynos5420-pinctrl";
+               reg = <0x13400000 0x1000>;
+               interrupts = <0 45 0>;
+
+               wakeup-interrupt-controller {
+                       compatible = "samsung,exynos4210-wakeup-eint";
+                       interrupt-parent = <&gic>;
+                       interrupts = <0 32 0>;
+               };
+       };
+
+       pinctrl_1: pinctrl@13410000 {
+               compatible = "samsung,exynos5420-pinctrl";
+               reg = <0x13410000 0x1000>;
+               interrupts = <0 78 0>;
+       };
+
+       pinctrl_2: pinctrl@14000000 {
+               compatible = "samsung,exynos5420-pinctrl";
+               reg = <0x14000000 0x1000>;
+               interrupts = <0 46 0>;
+       };
+
+       pinctrl_3: pinctrl@14010000 {
+               compatible = "samsung,exynos5420-pinctrl";
+               reg = <0x14010000 0x1000>;
+               interrupts = <0 50 0>;
+       };
+
+       pinctrl_4: pinctrl@03860000 {
+               compatible = "samsung,exynos5420-pinctrl";
+               reg = <0x03860000 0x1000>;
+               interrupts = <0 47 0>;
+       };
+
        fimd@14400000 {
                /* sysmmu is not used in U-Boot */
                samsung,disable-sysmmu;
+               samsung,pwm-out-gpio = <&gpb2 0 GPIO_ACTIVE_HIGH>;
        };
 
-       dp@145b0000 {
+       dp: dp@145b0000 {
                samsung,lt-status = <0>;
 
                samsung,master-mode = <0>;
@@ -147,6 +197,13 @@
                mem-type = "ddr3";
        };
 
+       pwm: pwm@12dd0000 {
+               compatible = "samsung,exynos4210-pwm";
+               reg = <0x12dd0000 0x100>;
+               samsung,pwm-outputs = <0>, <1>, <2>, <3>;
+               #pwm-cells = <3>;
+       };
+
        xhci1: xhci@12400000 {
                compatible = "samsung,exynos5250-xhci";
                reg = <0x12400000 0x10000>;