Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 28f32153 authored Dec 01, 2018 by Daniel Mack Committed by Greg Kroah-Hartman Dec 21, 2019

ARM: dts: pxa: clean up USB controller nodes



[ Upstream commit c40ad24254f1dbd54f2df5f5f524130dc1862122 ]

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 <daniel@zonque.org>
Reported-by: Sergey Yanovich <ynvich@gmail.com>
Link: https://patchwork.kernel.org/patch/8375421/


Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 78d19b43

arch/arm/boot/dts/pxa27x.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,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

Original line number	Diff line number	Diff line
		@@ -117,13 +117,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

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@
		status = "disabled";
		};

		pxa3xx_ohci: usb@4c000000 {
		usb0: usb@4c000000 {
		compatible = "marvell,pxa-ohci";
		reg = <0x4c000000 0x10000>;
		interrupts = <3>;