[PATCHv6 5/5] arm: dts: s400: Move common nodes to the -u-boot.dtsi

[Neil Armstrong]

Hi,

Le 09/02/2020 à 12:05, Anand Moon a écrit :
> Move u-boot specific common nodes in the dts files to
> meson-axg-s400-u-boot.dtsi. This allows us to keep the basic
> dts[i] files up-to-date with the ones in kernel,
> but at the same time allowing the u-boot to add its own
> properties to the existing nodes.
> Also add missing mmc alias to dts nodes to avoid
> below debug warning.
> 
> mmc_bind: alias ret=-2, devnum=-1
> mmc_bind: alias ret=-2, devnum=-1


Same as patch 4.

Neil

> 
> Signed-off-by: Anand Moon <linux.amoon at gmail.com>
> ---
> no changes from previous changes
> ---
>  arch/arm/dts/meson-axg-s400-u-boot.dtsi | 16 ++++++++++++++++
>  arch/arm/dts/meson-axg-s400.dts         |  9 ---------
>  2 files changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
> index c46eb3f38d..74241e9fcd 100644
> --- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi
> +++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi
> @@ -2,6 +2,22 @@
>  /*
>   * Copyright (c) 2017 Amlogic, Inc. All rights reserved.
>   */
> +/ {
> +	soc {
> +		u-boot,dm-pre-reloc;
> +	};
> +
> +	aliases {
> +		serial0 = &uart_AO;
> +		serial1 = &uart_A;
> +		mmc1 = &sd_emmc_b;
> +		mmc2 = &sd_emmc_c;
> +	};
> +
> +	chosen {
> +		stdout-path = "serial0:115200n8";
> +	};
> +};
>  
>  /* wifi module */
>  &sd_emmc_b {
> diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
> index 18778ada7b..feb84255ad 100644
> --- a/arch/arm/dts/meson-axg-s400.dts
> +++ b/arch/arm/dts/meson-axg-s400.dts
> @@ -55,11 +55,6 @@
>  		};
>  	};
>  
> -	aliases {
> -		serial0 = &uart_AO;
> -		serial1 = &uart_A;
> -	};
> -
>  	linein: audio-codec at 0 {
>  		#sound-dai-cells = <0>;
>  		compatible = "everest,es7241";
> @@ -100,10 +95,6 @@
>  		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
>  	};
>  
> -	chosen {
> -		stdout-path = "serial0:115200n8";
> -	};
> -
>  	memory at 0 {
>  		device_type = "memory";
>  		reg = <0x0 0x0 0x0 0x40000000>;
>