Merge branch 'omap-for-v4.21/dt' into omap-for-v5.1/dt

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

diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 080d5c5169b5aed17eceef5406442025d3843256..e83879d97aeae2e29419dc48a504a5a32e153b4d 100644 (file)
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -43,8 +43,6 @@
        };
 
        cpus {
-               #address-cells = <0>;
-               #size-cells = <0>;
                cpu {
                        compatible = "marvell,xscale";
                        device_type = "cpu";
@@ -119,9 +117,9 @@
                        status = "disabled";
                };
 
-               hwuart: serial@41100000 {
+               hwuart: serial@41600000 {
                        compatible = "mrvl,pxa-uart";
-                       reg = <0x41100000 0x30>;
+                       reg = <0x41600000 0x30>;
                        interrupts = <7>;
                        status = "disabled";
                };
@@ -136,13 +134,6 @@
                        status = "disabled";
                };
 
-               usb0: ohci@4c000000 {
-                       compatible = "marvell,pxa-ohci";
-                       reg = <0x4c000000 0x10000>;
-                       interrupts = <3>;
-                       status = "disabled";
-               };
-
                mmc0: mmc@41100000 {
                        compatible = "marvell,pxa-mmc";
                        reg = <0x41100000 0x1000>;