[PATCH v5 1/2] arm: dts: st: align MMC node names with established convention
Charan Pedumuru <[email protected]>
| Newsgroups | org.kernel.vger.linux-mmc,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Rename sdhci@9060000 and sdhci@9080000 nodes to mmc@9060000 and mmc@9080000 in stih407-family.dtsi and update all derived board files atomically to prevent orphaned node overrides. Signed-off-by: Charan Pedumuru <[email protected]> --- arch/arm/boot/dts/st/stih407-family.dtsi | 4 ++-- arch/arm/boot/dts/st/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/st/stih418-b2199.dts | 4 ++-- arch/arm/boot/dts/st/stih418.dtsi | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/st/stih407-family.dtsi b/arch/arm/boot/dts/st/stih407-family.dtsi index 3e6a0542e3ae..08acba209c56 100644 --- a/arch/arm/boot/dts/st/stih407-family.dtsi +++ b/arch/arm/boot/dts/st/stih407-family.dtsi @@ -596,7 +596,7 @@ spi@9542000 { status = "disabled"; }; - mmc0: sdhci@9060000 { + mmc0: mmc@9060000 { compatible = "st,sdhci-stih407", "st,sdhci"; status = "disabled"; reg = <0x09060000 0x7ff>, <0x9061008 0x20>; @@ -611,7 +611,7 @@ mmc0: sdhci@9060000 { bus-width = <8>; }; - mmc1: sdhci@9080000 { + mmc1: mmc@9080000 { compatible = "st,sdhci-stih407", "st,sdhci"; status = "disabled"; reg = <0x09080000 0x7ff>; diff --git a/arch/arm/boot/dts/st/stih410-b2260.dts b/arch/arm/boot/dts/st/stih410-b2260.dts index 736b1e059b0a..44048a98648e 100644 --- a/arch/arm/boot/dts/st/stih410-b2260.dts +++ b/arch/arm/boot/dts/st/stih410-b2260.dts @@ -141,14 +141,14 @@ i2c3: i2c@9843000 { status = "okay"; }; - mmc0: sdhci@9060000 { + mmc0: mmc@9060000 { pinctrl-0 = <&pinctrl_sd0>; bus-width = <4>; status = "okay"; }; /* high speed expansion connector */ - mmc1: sdhci@9080000 { + mmc1: mmc@9080000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stih418-b2199.dts b/arch/arm/boot/dts/st/stih418-b2199.dts index 53ac6c2b7b7d..4ea174597365 100644 --- a/arch/arm/boot/dts/st/stih418-b2199.dts +++ b/arch/arm/boot/dts/st/stih418-b2199.dts @@ -82,11 +82,11 @@ i2c@9541000 { st,i2c-min-sda-pulse-width-us = <5>; }; - mmc1: sdhci@9080000 { + mmc1: mmc@9080000 { status = "okay"; }; - mmc0: sdhci@9060000 { + mmc0: mmc@9060000 { status = "okay"; max-frequency = <200000000>; sd-uhs-sdr50; diff --git a/arch/arm/boot/dts/st/stih418.dtsi b/arch/arm/boot/dts/st/stih418.dtsi index 8fb8b3af5e49..1a5fbbedc8cd 100644 --- a/arch/arm/boot/dts/st/stih418.dtsi +++ b/arch/arm/boot/dts/st/stih418.dtsi @@ -136,7 +136,7 @@ ehci1: usb@9a83e00 { phy-names = "usb"; }; - mmc0: sdhci@9060000 { + mmc0: mmc@9060000 { assigned-clocks = <&clk_s_c0_flexgen CLK_MMC_0>; assigned-clock-parents = <&clk_s_c0_pll1 0>; assigned-clock-rates = <200000000>; -- 2.54.0