Skip to content

Commit

Permalink
ARM: dts: fix Moxa SDIO 'compatible', remove 'sdhci' misnomer
Browse files Browse the repository at this point in the history
[ Upstream commit 02181e6 ]

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>
  • Loading branch information
saproj authored and gregkh committed Oct 12, 2022
1 parent 7e834ee commit f8895cf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/moxart-uc7112lx.dts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
clocks = <&ref12>;
};

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

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/moxart.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit f8895cf

Please sign in to comment.