[PATCH v2] ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer

[PATCH v2] ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer

[Sergei Antonov]

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.

Signed-off-by: Sergei Antonov <saproj@gmail.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
---
v1 -> v2:
Per Arnd Bergmann's suggestion, replaced sdhci with mmc in names too.

 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 eb5291b0ee3a..e07b807b4cec 100644
--- a/arch/arm/boot/dts/moxart-uc7112lx.dts
+++ b/arch/arm/boot/dts/moxart-uc7112lx.dts
@@ -79,7 +79,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 f5f070a87482..764832ddfa78 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.34.1

Re: [PATCH v2] ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer

[Arnd Bergmann]

On Mon, Sep 5, 2022, at 2:53 PM, Sergei Antonov wrote:
> 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.
>
> Signed-off-by: Sergei Antonov <saproj@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Jensen <jonas.jensen@gmail.com>

Reviewed-by: Arnd Bergmann <arnd@arndb.de>

> v1 -> v2:
> Per Arnd Bergmann's suggestion, replaced sdhci with mmc in names too.

Looks good to me now. Let's wait for more comments, or possibly
for Jonas to pick it up into his tree. If everyone is fine with this
version, can you send it to soc@kernel.org so I can pick it
up into the soc tree?

     Arnd

Re: [PATCH v2] ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer

[Rob Herring]

On Mon, 05 Sep 2022 15:53:43 +0300, Sergei Antonov wrote:
> 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.
> 
> Signed-off-by: Sergei Antonov <saproj@gmail.com>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Jonas Jensen <jonas.jensen@gmail.com>
> ---
> v1 -> v2:
> Per Arnd Bergmann's suggestion, replaced sdhci with mmc in names too.
> 
>  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(-)
> 

Acked-by: Rob Herring <robh@kernel.org>