[PATCH v2 1/6] arm64: dts: rk3399-puma: Move u-boot properties into -u-boot.dtsi

[Kever Yang]

On 2020/4/28 下午6:00, Jagan Teki wrote:
> Move U-Boot specific properties into rk3399-puma u-boot
> specific dtsi file.
>
> This would help to sync the devicetrees from Linux whenever
> required instead of adding specific nodes.
>
> Cc: Peter Robinson <pbrobinson at gmail.com>
> Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>


Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> Changes for v2:
> - none
>
>   arch/arm/dts/rk3399-puma-u-boot.dtsi | 16 ++++++++++++++++
>   arch/arm/dts/rk3399-puma.dtsi        | 11 -----------
>   2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-puma-u-boot.dtsi b/arch/arm/dts/rk3399-puma-u-boot.dtsi
> index 52f62b5d39..e664779227 100644
> --- a/arch/arm/dts/rk3399-puma-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-puma-u-boot.dtsi
> @@ -22,3 +22,19 @@
>          };
>   
>   };
> +
> +&bios_enable {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&gpio1 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&gpio3 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +&spiflash {
> +	u-boot,dm-pre-reloc;
> +};
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index 558b6337df..246a892cb7 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -91,7 +91,6 @@
>   	 */
>   	bios_enable: bios_enable {
>   		compatible = "regulator-fixed";
> -		u-boot,dm-pre-reloc;
>   		regulator-name = "bios_enable";
>   		enable-active-high;
>   		gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
> @@ -520,14 +519,6 @@
>   	status = "okay";
>   };
>   
> -&gpio1 {
> -	u-boot,dm-pre-reloc;
> -};
> -
> -&gpio3 {
> -	u-boot,dm-pre-reloc;
> -};
> -
>   &pinctrl {
>   	/* Pins that are not explicitely used by any devices */
>   	pinctrl-names = "default";
> @@ -633,8 +624,6 @@
>   	#size-cells = <0>;
>   
>   	spiflash: w25q32dw at 0 {
> -		u-boot,dm-pre-reloc;
> -
>   		compatible = "jedec,spi-nor";
>   		reg = <0>;
>   		spi-max-frequency = <49500000>;