Merge tag 'devprop-4.21-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / pxa3xx.dtsi

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 3a8f0edc3af99dea946c13417946e5a9c0456245..e1e607f53ce637551e30c7c8922c4402e487c686 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -151,8 +151,6 @@
                pinctrl: pinctrl@40e10000 {
                        compatible = "pinconf-single";
                        reg = <0x40e10000 0xffff>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
                        #pinctrl-cells = <1>;
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0x7>;
@@ -204,7 +202,7 @@
                        status = "disabled";
                };
 
-               pxa3xx_ohci: usb@4c000000 {
+               usb0: usb@4c000000 {
                        compatible = "marvell,pxa-ohci";
                        reg = <0x4c000000 0x10000>;
                        interrupts = <3>;
@@ -275,6 +273,22 @@
                        clocks = <&clks CLK_SSP4>;
                        status = "disabled";
                };
+
+               timer@40a00000 {
+                       compatible = "marvell,pxa-timer";
+                       reg = <0x40a00000 0x20>;
+                       interrupts = <26>;
+                       clocks = <&clks CLK_OSTIMER>;
+                       status = "okay";
+               };
+
+               gcu: display-controller@54000000 {
+                       compatible = "marvell,pxa300-gcu";
+                       reg = <0x54000000 0x1000>;
+                       interrupts = <39>;
+                       clocks = <&clks CLK_PXA300_GCU>;
+                       status = "disabled";
+               };
        };
 
        clocks {
@@ -286,18 +300,10 @@
                #size-cells = <1>;
                ranges;
 
-               clks: pxa3xx_clks@41300004 {
+               clks: clocks {
                        compatible = "marvell,pxa300-clocks";
                        #clock-cells = <1>;
                        status = "okay";
                };
        };
-
-       timer@40a00000 {
-               compatible = "marvell,pxa-timer";
-               reg = <0x40a00000 0x20>;
-               interrupts = <26>;
-               clocks = <&clks CLK_OSTIMER>;
-               status = "okay";
-       };
 };