diff options
| author | Daniel Mack <daniel@zonque.org> | 2018-12-01 14:54:51 +0100 |
|---|---|---|
| committer | Robert Jarzmik <robert.jarzmik@free.fr> | 2018-12-02 11:19:13 +0100 |
| commit | c40ad24254f1dbd54f2df5f5f524130dc1862122 (patch) | |
| tree | c11f8d285fd6300b9a94d49db1cbc112e3e584dc | |
| parent | e9ae49f7b3cb7d71b156ae76cd540f8c1b84753a (diff) | |
| download | linux-c40ad24254f1dbd54f2df5f5f524130dc1862122.tar.gz linux-c40ad24254f1dbd54f2df5f5f524130dc1862122.tar.bz2 linux-c40ad24254f1dbd54f2df5f5f524130dc1862122.zip | |
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 <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>
| -rw-r--r-- | arch/arm/boot/dts/pxa27x.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/pxa2xx.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index 3228ad5fb725..ccbecad9c5c7 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -35,7 +35,7 @@ clocks = <&clks CLK_NONE>; }; - pxa27x_ohci: usb@4c000000 { + usb0: usb@4c000000 { compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>; diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index 30e77ebbcc4d..e83879d97aea 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index d9f7c68479ab..e1e607f53ce6 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -202,7 +202,7 @@ status = "disabled"; }; - pxa3xx_ohci: usb@4c000000 { + usb0: usb@4c000000 { compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>; |