aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi6
-rw-r--r--arch/arm/boot/dts/exynos4210.dtsi6
-rw-r--r--arch/arm/boot/dts/exynos4412.dtsi4
-rw-r--r--arch/arm/boot/dts/exynos4x12.dtsi6
4 files changed, 10 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index c91284441694..ec78bea04620 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -123,6 +123,12 @@
123 reg = <0x10440000 0x1000>; 123 reg = <0x10440000 0x1000>;
124 }; 124 };
125 125
126 pmu {
127 compatible = "arm,cortex-a9-pmu";
128 interrupt-parent = <&combiner>;
129 interrupts = <2 2>, <3 2>;
130 };
131
126 sys_reg: syscon@10010000 { 132 sys_reg: syscon@10010000 {
127 compatible = "samsung,exynos4-sysreg", "syscon"; 133 compatible = "samsung,exynos4-sysreg", "syscon";
128 reg = <0x10010000 0x400>; 134 reg = <0x10010000 0x400>;
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index ee3001f38821..a4f28e8a6f87 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -93,12 +93,6 @@
93 #clock-cells = <1>; 93 #clock-cells = <1>;
94 }; 94 };
95 95
96 pmu {
97 compatible = "arm,cortex-a9-pmu";
98 interrupt-parent = <&combiner>;
99 interrupts = <2 2>, <3 2>;
100 };
101
102 pinctrl_0: pinctrl@11400000 { 96 pinctrl_0: pinctrl@11400000 {
103 compatible = "samsung,exynos4210-pinctrl"; 97 compatible = "samsung,exynos4210-pinctrl";
104 reg = <0x11400000 0x1000>; 98 reg = <0x11400000 0x1000>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index c42a3e196cd5..d8bc059e172f 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -26,6 +26,10 @@
26 samsung,combiner-nr = <20>; 26 samsung,combiner-nr = <20>;
27 }; 27 };
28 28
29 pmu {
30 interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
31 };
32
29 gic: interrupt-controller@10490000 { 33 gic: interrupt-controller@10490000 {
30 cpu-offset = <0x4000>; 34 cpu-offset = <0x4000>;
31 }; 35 };
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index c5a943df1cd7..95cdfb9e7d59 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -31,12 +31,6 @@
31 mshc0 = &mshc_0; 31 mshc0 = &mshc_0;
32 }; 32 };
33 33
34 pmu {
35 compatible = "arm,cortex-a9-pmu";
36 interrupt-parent = <&combiner>;
37 interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
38 };
39
40 sysram@02020000 { 34 sysram@02020000 {
41 compatible = "mmio-sram"; 35 compatible = "mmio-sram";
42 reg = <0x02020000 0x40000>; 36 reg = <0x02020000 0x40000>;