ARM: dts: pxa: clean up USB controller nodes (c40ad242) · Commits · 戴 / test

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>

arch/arm/boot/dts/pxa27x.dtsi

+1 −1

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

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

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

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

Admin message