Merge tag 'samsung-dt-2' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene...

[karo-tx-linux.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 97fc1a7d655bfc8a32d7fc97ef89e8497800c653..3a89cfbd6a87e881291b7935597a12947477d467 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -240,16 +240,6 @@
                reg = <0x100440C0 0x20>;
        };
 
-       mau_pd: power-domain@100440E0 {
-               compatible = "samsung,exynos4210-pd";
-               reg = <0x100440E0 0x20>;
-       };
-
-       g2d_pd: power-domain@10044100 {
-               compatible = "samsung,exynos4210-pd";
-               reg = <0x10044100 0x20>;
-       };
-
        msc_pd: power-domain@10044120 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044120 0x20>;
@@ -357,6 +347,13 @@
                        #dma-cells = <1>;
                        #dma-channels = <8>;
                        #dma-requests = <1>;
+                       /*
+                        * MDMA1 can support both secure and non-secure
+                        * AXI transactions. When this is enabled in the kernel
+                        * for boards that run in secure mode, we are getting
+                        * imprecise external aborts causing the kernel to oops.
+                        */
+                       status = "disabled";
                };
        };
 
@@ -663,6 +660,7 @@
                clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                        "sclk_hdmiphy", "mout_hdmi";
                phy = <&hdmiphy>;
+               samsung,syscon-phandle = <&pmu_system_controller>;
                status = "disabled";
        };
 
@@ -759,9 +757,8 @@
                compatible = "samsung,exynos4210-secss";
                reg = <0x10830000 0x10000>;
                interrupts = <0 112 0>;
-               clocks = <&clock 471>;
+               clocks = <&clock CLK_SSS>;
                clock-names = "secss";
-               samsung,power-domain = <&g2d_pd>;
        };
 
        usbdrd3_0: usb@12000000 {
@@ -816,6 +813,36 @@
                #phy-cells = <1>;
        };
 
+       usbhost2: usb@12110000 {
+               compatible = "samsung,exynos4210-ehci";
+               reg = <0x12110000 0x100>;
+               interrupts = <0 71 0>;
+
+               clocks = <&clock CLK_USBH20>;
+               clock-names = "usbhost";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                       reg = <0>;
+                       phys = <&usb2_phy 1>;
+               };
+       };
+
+       usbhost1: usb@12120000 {
+               compatible = "samsung,exynos4210-ohci";
+               reg = <0x12120000 0x100>;
+               interrupts = <0 71 0>;
+
+               clocks = <&clock CLK_USBH20>;
+               clock-names = "usbhost";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                       reg = <0>;
+                       phys = <&usb2_phy 1>;
+               };
+       };
+
        usb2_phy: phy@12130000 {
                compatible = "samsung,exynos5250-usb2-phy";
                reg = <0x12130000 0x100>;