ARM: dts: pxa: clean up USB controller nodes

PATCH Applied Daniel Mack 2 participants 3 messages Dec 1, 2018 – Dec 4, 2018 Device tree bindings

Share & tools

Daniel Mack

author

2018-12-01 13:54 UTC #0 lore raw

PATCH 1/1 ARM: dts: pxa: clean up USB controller nodes

PXA25xx SoCs don't have a USB controller, so drop the node from the common pxa2xx.dtsi base file. Both pxa27x and pxa3xx have a dedicated node already anyway.

While at it, unify the names for the nodes across all pxa platforms.

Signed-off-by Daniel Mack <[email protected]>

Reported-by Sergey Yanovich <[email protected]>

Link https://patchwork.kernel.org/patch/8375421/

---
 arch/arm/boot/dts/pxa27x.dtsi | 2 +-
 arch/arm/boot/dts/pxa2xx.dtsi | 7 -------
 arch/arm/boot/dts/pxa3xx.dtsi | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

arch/arm/boot/dts/pxa27x.dtsi +1 -1

index 3228ad5fb725..ccbecad9c5c7 100644
@@ -35,7 +35,7 @@
 			clocks = <&clks CLK_NONE>;
 		};
 
-		pxa27x_ohci: usb@4c000000 {
+		usb0: usb@4c000000 {
 			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;

arch/arm/boot/dts/pxa2xx.dtsi +0 -7

index 30e77ebbcc4d..e83879d97aea 100644
@@ -134,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>;

arch/arm/boot/dts/pxa3xx.dtsi +1 -1

index d9f7c68479ab..e1e607f53ce6 100644
@@ -202,7 +202,7 @@
 			status = "disabled";
 		};
 
-		pxa3xx_ohci: usb@4c000000 {
+		usb0: usb@4c000000 {
 			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;

Signature · 1 line

2.19.2

Robert Jarzmik

Applied

2018-12-02 10:14 UTC #1 lore raw

Quoted 9 lines · Daniel Mack

PXA25xx SoCs don't have a USB controller, so drop the node from the common pxa2xx.dtsi base file. Both pxa27x and pxa3xx have a dedicated node already anyway.
While at it, unify the names for the nodes across all pxa platforms.
Signed-off-by Daniel Mack <[email protected]>
Reported-by Sergey Yanovich <[email protected]>
Link https://patchwork.kernel.org/patch/8375421/

Applied to pxa/dt, thanks.

Cheers.

--
Robert

Robert Jarzmik

Applied

2018-12-04 08:24 UTC #2 lore raw

In reply to Daniel Mack

Quoted 9 lines · Daniel Mack

PXA25xx SoCs don't have a USB controller, so drop the node from the common pxa2xx.dtsi base file. Both pxa27x and pxa3xx have a dedicated node already anyway.
While at it, unify the names for the nodes across all pxa platforms.
Signed-off-by Daniel Mack <[email protected]>
Reported-by Sergey Yanovich <[email protected]>
Link https://patchwork.kernel.org/patch/8375421/

Queued to pxa/dt.

Cheers.

--
Robert