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

[deliverable/linux.git] / arch / arm / boot / dts / exynos5410.dtsi

diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index fad0779b1b6e86d887a926a4afdee929ca33a1d7..fa558674ac7639a7aaae36860862e7002abb659c 100644 (file)
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -14,6 +14,7 @@
  */
 
 #include "skeleton.dtsi"
+#include "exynos-syscon-restart.dtsi"
 #include <dt-bindings/clock/exynos5410.h>
 
 / {
@@ -21,6 +22,10 @@
        interrupt-parent = <&gic>;
 
        aliases {
+               pinctrl0 = &pinctrl_0;
+               pinctrl1 = &pinctrl_1;
+               pinctrl2 = &pinctrl_2;
+               pinctrl3 = &pinctrl_3;
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;
@@ -97,25 +102,22 @@
                        reg = <0x10000000 0x100>;
                };
 
+               sromc: sromc@12250000 {
+                       compatible = "samsung,exynos-srom";
+                       reg = <0x12250000 0x14>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+                       ranges = <0 0 0x04000000 0x20000
+                                 1 0 0x05000000 0x20000
+                                 2 0 0x06000000 0x20000
+                                 3 0 0x07000000 0x20000>;
+               };
+
                pmu_system_controller: system-controller@10040000 {
                        compatible = "samsung,exynos5410-pmu", "syscon";
                        reg = <0x10040000 0x5000>;
                };
 
-               poweroff: syscon-poweroff {
-                       compatible = "syscon-poweroff";
-                       regmap = <&pmu_system_controller>;
-                       offset = <0x330C>; /* PS_HOLD_CONTROL */
-                       mask = <0x5200>; /* reset value */
-               };
-
-               reboot: syscon-reboot {
-                       compatible = "syscon-reboot";
-                       regmap = <&pmu_system_controller>;
-                       offset = <0x0400>; /* SWRESET */
-                       mask = <0x1>;
-               };
-
                mct: mct@101C0000 {
                        compatible = "samsung,exynos4210-mct";
                        reg = <0x101C0000 0xB00>;
@@ -205,6 +207,36 @@
                        status = "disabled";
                };
 
+               pinctrl_0: pinctrl@13400000 {
+                       compatible = "samsung,exynos5410-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@14000000 {
+                       compatible = "samsung,exynos5410-pinctrl";
+                       reg = <0x14000000 0x1000>;
+                       interrupts = <0 46 0>;
+               };
+
+               pinctrl_2: pinctrl@10d10000 {
+                       compatible = "samsung,exynos5410-pinctrl";
+                       reg = <0x10d10000 0x1000>;
+                       interrupts = <0 50 0>;
+               };
+
+               pinctrl_3: pinctrl@03860000 {
+                       compatible = "samsung,exynos5410-pinctrl";
+                       reg = <0x03860000 0x1000>;
+                       interrupts = <0 47 0>;
+               };
+
                uart0: serial@12C00000 {
                        compatible = "samsung,exynos4210-uart";
                        reg = <0x12C00000 0x100>;
@@ -233,3 +265,5 @@
                };
        };
 };
+
+#include "exynos5410-pinctrl.dtsi"