Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio

[cascardo/linux.git] / arch / arm / boot / dts / exynos5260.dtsi

diff --git a/arch/arm/boot/dts/exynos5260.dtsi b/arch/arm/boot/dts/exynos5260.dtsi
index 5398a60..36da38e 100644 (file)
--- a/arch/arm/boot/dts/exynos5260.dtsi
+++ b/arch/arm/boot/dts/exynos5260.dtsi
@@ -21,6 +21,10 @@
                pinctrl0 = &pinctrl_0;
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
+               serial3 = &uart3;
        };
 
        cpus {
@@ -227,6 +231,11 @@
                        interrupts = <0 243 0>;
                };
 
+               pmu_system_controller: system-controller@10D50000 {
+                       compatible = "samsung,exynos5260-pmu", "syscon";
+                       reg = <0x10D50000 0x10000>;
+               };
+
                uart0: serial@12C00000 {
                        compatible = "samsung,exynos4210-uart";
                        reg = <0x12C00000 0x100>;