Commit 1a56a6f5 authored Feb 15, 2023 by Sergei Antonov Committed by Jialin Zhang Feb 17, 2023

ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer

stable inclusion
from stable-v5.10.148
commit 29461bbe2d7f79c691476dd69156bc5951ee1aeb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0WL

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=29461bbe2d7f79c691476dd69156bc5951ee1aeb



--------------------------------

[ Upstream commit 02181e68 ]

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>
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 47eed1bc

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

+2 −2

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

arch/arm/boot/dts/moxart-uc7112lx.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@
		clocks = <&ref12>;
		};

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

arch/arm/boot/dts/moxart.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -93,8 +93,8 @@
		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>;