[PATCH 2/8] arm64: dts: amlogic: Fix non-compliant SD/SDIO node names

[Neil Armstrong]

Le 23/01/2023 à 22:24, Heiner Kallweit a écrit :
> mmc-controller.yaml defines "^mmc(@.*)?$" as node name pattern.
> In preparation of adding schema-based validation fix the node name
> in two affected files.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1 at gmail.com>
> ---
>   arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 4 ++--
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> index 1648e67af..ed895fb32 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> @@ -1883,7 +1883,7 @@ apb: bus at ffe00000 {
>   			#size-cells = <2>;
>   			ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x200000>;
>   
> -			sd_emmc_b: sd at 5000 {
> +			sd_emmc_b: mmc at 5000 {
>   				compatible = "amlogic,meson-axg-mmc";
>   				reg = <0x0 0x5000 0x0 0x800>;
>   				interrupts = <GIC_SPI 217 IRQ_TYPE_EDGE_RISING>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 1a931d5c2..80d82f739 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -2321,7 +2321,7 @@ uart_A: serial at 24000 {
>   			};
>   		};
>   
> -		sd_emmc_a: sd at ffe03000 {
> +		sd_emmc_a: mmc at ffe03000 {
>   			compatible = "amlogic,meson-axg-mmc";
>   			reg = <0x0 0xffe03000 0x0 0x800>;
>   			interrupts = <GIC_SPI 189 IRQ_TYPE_EDGE_RISING>;
> @@ -2333,7 +2333,7 @@ sd_emmc_a: sd at ffe03000 {
>   			resets = <&reset RESET_SD_EMMC_A>;
>   		};
>   
> -		sd_emmc_b: sd at ffe05000 {
> +		sd_emmc_b: mmc at ffe05000 {
>   			compatible = "amlogic,meson-axg-mmc";
>   			reg = <0x0 0xffe05000 0x0 0x800>;
>   			interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>