lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 026/210] ARM: dts: fix Moxa SDIO compatible, remove sdhci misnomer
    Date
    From: Sergei Antonov <saproj@gmail.com>

    [ Upstream commit 02181e68275d28cab3c3f755852770367f1bc229 ]

    Driver moxart-mmc.c has .compatible = "moxa,moxart-mmc".

    But moxart .dts/.dtsi and the documentation file moxa,moxart-dma.txt
    contain compatible = "moxa,moxart-sdhci".

    Change moxart .dts/.dtsi files and moxa,moxart-dma.txt to match the driver.

    Replace 'sdhci' with 'mmc' in names too, since SDHCI is a different
    controller from FTSDC010.

    Suggested-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sergei Antonov <saproj@gmail.com>
    Cc: Jonas Jensen <jonas.jensen@gmail.com>
    Link: https://lore.kernel.org/r/20220907175341.1477383-1-saproj@gmail.com'
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt | 4 ++--
    arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +-
    arch/arm/boot/dts/moxart.dtsi | 4 ++--
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
    index 8a9f3559335b..7e14e26676ec 100644
    --- a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
    +++ b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
    @@ -34,8 +34,8 @@ Example:
    Use specific request line passing from dma
    For example, MMC request line is 5

    - sdhci: sdhci@98e00000 {
    - compatible = "moxa,moxart-sdhci";
    + mmc: mmc@98e00000 {
    + compatible = "moxa,moxart-mmc";
    reg = <0x98e00000 0x5C>;
    interrupts = <5 0>;
    clocks = <&clk_apb>;
    diff --git a/arch/arm/boot/dts/moxart-uc7112lx.dts b/arch/arm/boot/dts/moxart-uc7112lx.dts
    index 4a962a26482d..59d8775a3a93 100644
    --- a/arch/arm/boot/dts/moxart-uc7112lx.dts
    +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts
    @@ -80,7 +80,7 @@ &clk_pll {
    clocks = <&ref12>;
    };

    -&sdhci {
    +&mmc {
    status = "okay";
    };

    diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi
    index da7b3237bfe9..804a2bc6ec82 100644
    --- a/arch/arm/boot/dts/moxart.dtsi
    +++ b/arch/arm/boot/dts/moxart.dtsi
    @@ -93,8 +93,8 @@ watchdog: watchdog@98500000 {
    clock-names = "PCLK";
    };

    - sdhci: sdhci@98e00000 {
    - compatible = "moxa,moxart-sdhci";
    + mmc: mmc@98e00000 {
    + compatible = "moxa,moxart-mmc";
    reg = <0x98e00000 0x5C>;
    interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
    clocks = <&clk_apb>;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 22:26    [W:2.481 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site