lkml.org 
[lkml]   [2019]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 059/199] ARM: dts: pxa: clean up USB controller nodes
    Date
    From: Daniel Mack <daniel@zonque.org>

    [ 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>
    ---
    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(-)

    diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
    index 0e1320afa1562..d629948000db1 100644
    --- a/arch/arm/boot/dts/pxa27x.dtsi
    +++ b/arch/arm/boot/dts/pxa27x.dtsi
    @@ -34,7 +34,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 3ff077ca44002..5a6f4ed92dac3 100644
    --- a/arch/arm/boot/dts/pxa2xx.dtsi
    +++ b/arch/arm/boot/dts/pxa2xx.dtsi
    @@ -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>;
    diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
    index 9d6f3aacedb70..4aee150626902 100644
    --- a/arch/arm/boot/dts/pxa3xx.dtsi
    +++ b/arch/arm/boot/dts/pxa3xx.dtsi
    @@ -187,7 +187,7 @@
    status = "disabled";
    };

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


    \
     
     \ /
      Last update: 2019-12-19 19:44    [W:4.980 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site