summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/exynos4.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4412.dtsi7
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 6d4775a0b402..da284f383279 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -162,7 +162,7 @@
reg = <0x10440000 0x1000>;
};
- pmu {
+ pmu: pmu {
compatible = "arm,cortex-a9-pmu";
interrupt-parent = <&combiner>;
interrupts = <2 2>, <3 2>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index a6f3f59fce35..e012cdad6595 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -546,10 +546,6 @@
opp-hz = /bits/ 64 <100000000>;
};
};
-
- pmu {
- interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
- };
};
&combiner {
@@ -724,6 +720,9 @@
<&clock CLK_SCLK_HDMI>, <&clock CLK_VP>;
};
+&pmu {
+ interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
+};
&pmu_system_controller {
compatible = "samsung,exynos4412-pmu", "syscon";