[PATCH 4/7] ARM: dts: pxa: merge &pxa3xx_ohci with &usb0

[Daniel Mack <daniel@zonque.org>]

Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge
them, and get rid of the one in pxa3xx.dtsi.

Signed-off-by: Daniel Mack <daniel@zonque.org>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 1 +
 arch/arm/boot/dts/pxa3xx.dtsi | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 30e77ebbcc4d..c00b1115f2a7 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -138,6 +138,7 @@
 			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;
+			clocks = <&clks CLK_USBH>;
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index eb3223e85f9a..eb9443208578 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -202,14 +202,6 @@
 			status = "disabled";
 		};
 
-		pxa3xx_ohci: usb@4c000000 {
-			compatible = "marvell,pxa-ohci";
-			reg = <0x4c000000 0x10000>;
-			interrupts = <3>;
-			clocks = <&clks CLK_USBH>;
-			status = "disabled";
-		};
-
 		pwm0: pwm@40b00000 {
 			compatible = "marvell,pxa270-pwm";
 			reg = <0x40b00000 0x10>;
-- 
2.19.2