Re: [PATCH] arm: dts: socfpga: align mmc node names with dtschema

[Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>]

On 21/10/2022 11:32, Dinh Nguyen wrote:
> dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'
> 
> Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxx>
> ---
>  arch/arm/boot/dts/socfpga.dtsi                      | 2 +-
>  arch/arm/boot/dts/socfpga_arria10.dtsi              | 2 +-
>  arch/arm/boot/dts/socfpga_arria5.dtsi               | 2 +-
>  arch/arm/boot/dts/socfpga_arria5_socdk.dts          | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5.dtsi             | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts  | 4 ++--
>  arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi         | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5_socdk.dts        | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5_sockit.dts       | 2 +-
>  arch/arm/boot/dts/socfpga_cyclone5_sodia.dts        | 2 +-
>  arch/arm/boot/dts/socfpga_vt.dts                    | 2 +-
>  12 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
> index a2419a5c6c26..6eda6fdc101b 100644
> --- a/arch/arm/boot/dts/socfpga.dtsi
> +++ b/arch/arm/boot/dts/socfpga.dtsi
> @@ -754,7 +754,7 @@ l3regs@0xff800000 {
>  			reg = <0xff800000 0x1000>;
>  		};
>  
> -		mmc: dwmmc0@ff704000 {
> +		mmc: mmc@ff704000 {
>  			compatible = "altr,socfpga-dw-mshc";
>  			reg = <0xff704000 0x1000>;
>  			interrupts = <0 139 4>;
> diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
> index eb528c103d70..3b2a2c9c6547 100644
> --- a/arch/arm/boot/dts/socfpga_arria10.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
> @@ -655,7 +655,7 @@ L2: cache-controller@fffff000 {
>  			arm,shared-override;
>  		};
>  
> -		mmc: dwmmc0@ff808000 {
> +		mmc: mmc@ff808000 {
>  			#address-cells = <1>;
>  			#size-cells = <0>;
>  			compatible = "altr,socfpga-dw-mshc";
> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
> index b531639ce7dc..c20a1f04f29a 100644
> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
> @@ -18,7 +18,7 @@ osc1 {
>  			};
>  		};
>  
> -		mmc0: dwmmc0@ff704000 {
> +		mmc: mmc@ff704000 {
>  			broken-cd;
>  			bus-width = <4>;
>  			cap-mmc-highspeed;
> diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> index 7f5458d8fccc..40f12232c150 100644
> --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
> @@ -107,7 +107,7 @@ rtc@68 {
>  	};
>  };
>  
> -&mmc0 {
> +&mmc {
>  	vmmc-supply = <&regulator_3_3v>;
>  	vqmmc-supply = <&regulator_3_3v>;
>  	status = "okay";
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dtsi b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> index a9d1ba66f1ff..1d08d48559e5 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> +++ b/arch/arm/boot/dts/socfpga_cyclone5.dtsi
> @@ -18,7 +18,7 @@ osc1 {
>  			};
>  		};
>  
> -		mmc0: dwmmc0@ff704000 {
> +		mmc: mmc@ff704000 {
>  			broken-cd;
>  			bus-width = <4>;
>  			cap-mmc-highspeed;
> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> index 76262f1e5e03..f3e7169bc93a 100644
> --- a/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> +++ b/arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts
> @@ -43,7 +43,7 @@ user_led1 {
>  		user_led2 {
>  			label = "green:user2";
>  			gpios = <&porta 22 GPIO_ACTIVE_LOW>;
> -			linux,default-trigger = "mmc0";
> +			linux,default-trigger = "mmc";

I think this is not correct... or at least not really related to this
commit.


Best regards,
Krzysztof