Merge tag 'dt-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / boot / dts / exynos5250.dtsi

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 53c37f0b763f84cb3eef13ef490f65f893193c6e..98dfc3ea5c0bee94a80a08da8c5d994d84125977 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -131,6 +131,12 @@
                };
        };
 
+       pmu {
+               compatible = "arm,cortex-a15-pmu";
+               interrupt-parent = <&combiner>;
+               interrupts = <1 2>, <22 4>;
+       };
+
        pinctrl_0: pinctrl@11400000 {
                compatible = "samsung,exynos5250-pinctrl";
                reg = <0x11400000 0x1000>;
@@ -182,6 +188,7 @@
                interrupts = <0 43 0>, <0 44 0>;
                clocks = <&clock 337>;
                clock-names = "rtc";
+               status = "disabled";
        };
 
        tmu@10060000 {