[PATCH V2] ARM: dts: stm32: Rename mmc controller nodes to mmc@

Marek Vasut marex at denx.de
Sun Jan 24 12:03:37 EST 2021


Per mmc-controller.yaml, the node pattern is "^mmc(@.*)?$" ,
so adjust the node.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Alexandre Torgue <alexandre.torgue at st.com>
Cc: Ludovic Barre <ludovic.barre at st.com>
Cc: Ulf Hansson <ulf.hansson at linaro.org>
Cc: linux-stm32 at st-md-mailman.stormreply.com
Cc: devicetree at vger.kernel.org
---
V2: Fix stm32h743.dtsi
---
 arch/arm/boot/dts/stm32f429.dtsi  | 2 +-
 arch/arm/boot/dts/stm32f746.dtsi  | 4 ++--
 arch/arm/boot/dts/stm32h743.dtsi  | 2 +-
 arch/arm/boot/dts/stm32mp151.dtsi | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index ad715a0e1c9a..f6530d724d00 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -566,7 +566,7 @@ adc3: adc at 200 {
 			};
 		};
 
-		sdio: sdio at 40012c00 {
+		sdio: mmc at 40012c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40012c00 0x400>;
diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
index 640ff54ed00c..e1df603fc981 100644
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -473,7 +473,7 @@ usart6: serial at 40011400 {
 			status = "disabled";
 		};
 
-		sdio2: sdio2 at 40011c00 {
+		sdio2: mmc at 40011c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40011c00 0x400>;
@@ -484,7 +484,7 @@ sdio2: sdio2 at 40011c00 {
 			status = "disabled";
 		};
 
-		sdio1: sdio1 at 40012c00 {
+		sdio1: mmc at 40012c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40012c00 0x400>;
diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi
index b083afd0ebd6..4ebffb0a45a3 100644
--- a/arch/arm/boot/dts/stm32h743.dtsi
+++ b/arch/arm/boot/dts/stm32h743.dtsi
@@ -354,7 +354,7 @@ mdma1: dma-controller at 52000000 {
 			dma-requests = <32>;
 		};
 
-		sdmmc1: sdmmc at 52007000 {
+		sdmmc1: mmc at 52007000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x10153180>;
 			reg = <0x52007000 0x1000>;
diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi
index 8c2a5d0875d8..33777a80799a 100644
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -1055,7 +1055,7 @@ adc2: adc at 100 {
 			};
 		};
 
-		sdmmc3: sdmmc at 48004000 {
+		sdmmc3: mmc at 48004000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x48004000 0x400>;
@@ -1375,7 +1375,7 @@ qspi: spi at 58003000 {
 			status = "disabled";
 		};
 
-		sdmmc1: sdmmc at 58005000 {
+		sdmmc1: mmc at 58005000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x58005000 0x1000>;
@@ -1390,7 +1390,7 @@ sdmmc1: sdmmc at 58005000 {
 			status = "disabled";
 		};
 
-		sdmmc2: sdmmc at 58007000 {
+		sdmmc2: mmc at 58007000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x58007000 0x1000>;
-- 
2.29.2




More information about the linux-arm-kernel mailing list