Re: [PATCH v5 1/2] arm64: dts: marvell: Update sdhci node names to match schema

[Gregory CLEMENT]

Chris Packham <chris.packham@xxxxxxxxxxxxxxxxxxx> writes:

> Update the node names of the sdhci@ interfaces to be mmc@ to match the
> node name enforced by the mmc-controller.yaml schema.
>
> Signed-off-by: Chris Packham <chris.packham@xxxxxxxxxxxxxxxxxxx>
> Acked-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>

Applied on mvebu/dt64

Thanks,

Gregory
> ---
>
> Notes:
>     This has been sent separately [1] but on Krzysztof's advice I've
>     included it in v3 of this series.
>     
>     [1] -  https://lore.kernel.org/linux-arm-kernel/20220321212007.2961581-1-chris.packham@xxxxxxxxxxxxxxxxxxx/
>     Changes in v5:
>     - None
>     Changes in v4:
>     - None
>     Changes in v3:
>     - New
>
>  arch/arm64/boot/dts/marvell/armada-37xx.dtsi  | 4 ++--
>  arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +-
>  arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> index 30233de58bb3..78adb803df26 100644
> --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
> @@ -434,7 +434,7 @@ rwtm: mailbox@b0000 {
>  				#mbox-cells = <1>;
>  			};
>  
> -			sdhci1: sdhci@d0000 {
> +			sdhci1: mmc@d0000 {
>  				compatible = "marvell,armada-3700-sdhci",
>  					     "marvell,sdhci-xenon";
>  				reg = <0xd0000 0x300>,
> @@ -445,7 +445,7 @@ sdhci1: sdhci@d0000 {
>  				status = "disabled";
>  			};
>  
> -			sdhci0: sdhci@d8000 {
> +			sdhci0: mmc@d8000 {
>  				compatible = "marvell,armada-3700-sdhci",
>  					     "marvell,sdhci-xenon";
>  				reg = <0xd8000 0x300>,
> diff --git a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> index 6614472100c2..a06a0a889c43 100644
> --- a/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi
> @@ -250,7 +250,7 @@ watchdog: watchdog@610000 {
>  				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
>  			};
>  
> -			ap_sdhci0: sdhci@6e0000 {
> +			ap_sdhci0: mmc@6e0000 {
>  				compatible = "marvell,armada-ap806-sdhci";
>  				reg = <0x6e0000 0x300>;
>  				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> index 3bd2182817fb..d6c0990a267d 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
> @@ -493,7 +493,7 @@ CP11X_LABEL(trng): trng@760000 {
>  			status = "okay";
>  		};
>  
> -		CP11X_LABEL(sdhci0): sdhci@780000 {
> +		CP11X_LABEL(sdhci0): mmc@780000 {
>  			compatible = "marvell,armada-cp110-sdhci";
>  			reg = <0x780000 0x300>;
>  			interrupts = <27 IRQ_TYPE_LEVEL_HIGH>;
> -- 
> 2.35.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com