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

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

[Marek Vasut]

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

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Ludovic Barre <ludovic.barre@st.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: devicetree@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@200 {
 			};
 		};
 
-		sdio: sdio@40012c00 {
+		sdio: mmc@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@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>;
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@52000000 {
 			dma-requests = <32>;
 		};
 
-		sdmmc1: sdmmc@52007000 {
+		sdmmc1: mmc@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@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>;
-- 
2.29.2

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

[Yann GAUTIER]

On 1/24/21 6:03 PM, Marek Vasut wrote:
> Per mmc-controller.yaml, the node pattern is"^mmc(@.*)?$"  ,
> so adjust the node.
> 
> Signed-off-by: Marek Vasut<marex@denx.de>
> Cc: Alexandre Torgue<alexandre.torgue@st.com>
> Cc: Ludovic Barre<ludovic.barre@st.com>
> Cc: Ulf Hansson<ulf.hansson@linaro.org>
> Cc:linux-stm32@st-md-mailman.stormreply.com
> Cc:devicetree@vger.kernel.org

Hi Marek,

Acked-by: Yann Gautier <yann.gautier@foss.st.com>


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

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

[Marek Vasut]

On 1/25/21 1:58 PM, Yann GAUTIER wrote:
> On 1/24/21 6:03 PM, Marek Vasut wrote:
>> Per mmc-controller.yaml, the node pattern is"^mmc(@.*)?$"  ,
>> so adjust the node.

[...]

Hi,

> Hi Marek,
> 
> Acked-by: Yann Gautier <yann.gautier@foss.st.com>
> 
> 
> 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 ?

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

[Linus Walleij]

On Mon, Jan 25, 2021 at 1:58 PM Yann GAUTIER <yann.gautier@foss.st.com> wrote:

> 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

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

[Alexandre TORGUE]

Hi Marek

On 1/24/21 6:03 PM, Marek Vasut wrote:
> Per mmc-controller.yaml, the node pattern is "^mmc(@.*)?$" ,
> so adjust the node.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexandre Torgue <alexandre.torgue@st.com>
> Cc: Ludovic Barre <ludovic.barre@st.com>
> Cc: Ulf Hansson <ulf.hansson@linaro.org>
> Cc: linux-stm32@st-md-mailman.stormreply.com
> Cc: devicetree@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(-)
> 

Applied on stm32-next.

Thanks.
Alex