Merge tag 'fixes-v3.18-not-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index d9cb972..e0278ec 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -44,6 +44,10 @@
                fimc1 = &fimc_1;
                fimc2 = &fimc_2;
                fimc3 = &fimc_3;
+               serial0 = &serial_0;
+               serial1 = &serial_1;
+               serial2 = &serial_2;
+               serial3 = &serial_3;
        };
 
        clock_audss: clock-controller@03810000 {
@@ -123,6 +127,12 @@
                reg = <0x10440000 0x1000>;
        };
 
+       pmu {
+               compatible = "arm,cortex-a9-pmu";
+               interrupt-parent = <&combiner>;
+               interrupts = <2 2>, <3 2>;
+       };
+
        sys_reg: syscon@10010000 {
                compatible = "samsung,exynos4-sysreg", "syscon";
                reg = <0x10010000 0x400>;
@@ -322,6 +332,23 @@
                clocks = <&clock CLK_USB_HOST>;
                clock-names = "usbhost";
                status = "disabled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                   reg = <0>;
+                   phys = <&exynos_usbphy 1>;
+                   status = "disabled";
+               };
+               port@1 {
+                   reg = <1>;
+                   phys = <&exynos_usbphy 2>;
+                   status = "disabled";
+               };
+               port@2 {
+                   reg = <2>;
+                   phys = <&exynos_usbphy 3>;
+                   status = "disabled";
+               };
        };
 
        ohci@12590000 {
@@ -331,6 +358,13 @@
                clocks = <&clock CLK_USB_HOST>;
                clock-names = "usbhost";
                status = "disabled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                   reg = <0>;
+                   phys = <&exynos_usbphy 1>;
+                   status = "disabled";
+               };
        };
 
        i2s1: i2s@13960000 {
@@ -363,7 +397,7 @@
                status = "disabled";
        };
 
-       serial@13800000 {
+       serial_0: serial@13800000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0x13800000 0x100>;
                interrupts = <0 52 0>;
@@ -372,7 +406,7 @@
                status = "disabled";
        };
 
-       serial@13810000 {
+       serial_1: serial@13810000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0x13810000 0x100>;
                interrupts = <0 53 0>;
@@ -381,7 +415,7 @@
                status = "disabled";
        };
 
-       serial@13820000 {
+       serial_2: serial@13820000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0x13820000 0x100>;
                interrupts = <0 54 0>;
@@ -390,7 +424,7 @@
                status = "disabled";
        };
 
-       serial@13830000 {
+       serial_3: serial@13830000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0x13830000 0x100>;
                interrupts = <0 55 0>;