Skip to contentSkip to conversation

ARM: dts: stm32: Rename mmc controller nodes to mmc@

PATCH In review Marek Vasut 4 participants 5 messages Jan 24, 2021 – Jan 25, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: dts: stm32: Rename mmc controller nodes to mmc@

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

---
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(-)
arch/arm/boot/dts/stm32f429.dtsi +1 -1
index ad715a0e1c9a..f6530d724d00 100644
@@ -566,7 +566,7 @@ adc3: adc@200 {
 			};
 		};
 
-		sdio: sdio@40012c00 {
+		sdio: mmc@40012c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40012c00 0x400>;
arch/arm/boot/dts/stm32f746.dtsi +2 -2
index 640ff54ed00c..e1df603fc981 100644
@@ -473,7 +473,7 @@ usart6: serial@40011400 {
 			status = "disabled";
 		};
 
-		sdio2: sdio2@40011c00 {
+		sdio2: mmc@40011c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40011c00 0x400>;
@@ -484,7 +484,7 @@ sdio2: sdio2@40011c00 {
 			status = "disabled";
 		};
 
-		sdio1: sdio1@40012c00 {
+		sdio1: mmc@40012c00 {
 			compatible = "arm,pl180", "arm,primecell";
 			arm,primecell-periphid = <0x00880180>;
 			reg = <0x40012c00 0x400>;
arch/arm/boot/dts/stm32h743.dtsi +1 -1
index b083afd0ebd6..4ebffb0a45a3 100644
@@ -354,7 +354,7 @@ mdma1: dma-controller@52000000 {
 			dma-requests = <32>;
 		};
 
-		sdmmc1: sdmmc@52007000 {
+		sdmmc1: mmc@52007000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x10153180>;
 			reg = <0x52007000 0x1000>;
arch/arm/boot/dts/stm32mp151.dtsi +3 -3
index 8c2a5d0875d8..33777a80799a 100644
@@ -1055,7 +1055,7 @@ adc2: adc@100 {
 			};
 		};
 
-		sdmmc3: sdmmc@48004000 {
+		sdmmc3: mmc@48004000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x48004000 0x400>;
@@ -1375,7 +1375,7 @@ qspi: spi@58003000 {
 			status = "disabled";
 		};
 
-		sdmmc1: sdmmc@58005000 {
+		sdmmc1: mmc@58005000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x58005000 0x1000>;
@@ -1390,7 +1390,7 @@ sdmmc1: sdmmc@58005000 {
 			status = "disabled";
 		};
 
-		sdmmc2: sdmmc@58007000 {
+		sdmmc2: mmc@58007000 {
 			compatible = "arm,pl18x", "arm,primecell";
 			arm,primecell-periphid = <0x00253180>;
 			reg = <0x58007000 0x1000>;
Signature · 1 line
2.29.2
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Marek Vasut

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

Hi Marek,

Do you know if similar patches are planned for other platform using this IP (Qualcom, ST-Ericsson, Arm vexpress...)? I found issues with them when running this command:
make -k dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/mmc/arm,pl18x.yaml

Maybe Linus already sent the info?
Adding those other platforms maintainers.

Regards,
Yann

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
Quoted 3 lines · Yann GAUTIER
Quoted 2 lines · Marek Vasut

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

[...]

Hi,

Quoted 11 lines

Hi Marek,

Do you know if similar patches are planned for other platform using this IP (Qualcom, ST-Ericsson, Arm vexpress...)? I found issues with them when running this command:
make -k dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/mmc/arm,pl18x.yaml

Maybe Linus already sent the info?
Adding those other platforms maintainers.

Maybe just fix them and send patch, since you're at it already ?

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw
In reply to Yann GAUTIER
Quoted 7 lines · Yann GAUTIER

Do you know if similar patches are planned for other platform using this IP (Qualcom, ST-Ericsson, Arm vexpress...)?
I found issues with them when running this command:
make -k dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/mmc/arm,pl18x.yaml

Maybe Linus already sent the info?

I sent patches fixing the Ux500 and Nomadik platforms.

The ARM platforms use mmc@ when I looked at it briefly but else point it out to me and I'll fix it up.

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer
#4 lore raw
In reply to Marek Vasut

Hi Marek

Quoted 9 lines · Marek Vasut

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

Quoted 9 lines

---
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(-)

Applied on stm32-next.

Thanks.
Alex

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel