[PATCH] arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi

[Kever Yang]

On 2020/1/20 下午5:18, Peter Robinson wrote:
> Move the U-Boot specific bits to a -u-boot.dtsi include so all the
> u-boot.dtsi hierarchy is included.
>
> Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi |  4 ++++
>   arch/arm/dts/rk3399-puma-ddr1333.dts         |  2 --
>   arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi |  4 ++++
>   arch/arm/dts/rk3399-puma-ddr1600.dts         |  2 --
>   arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi |  4 ++++
>   arch/arm/dts/rk3399-puma-ddr1866.dts         |  2 --
>   arch/arm/dts/rk3399-puma-u-boot.dtsi         | 24 ++++++++++++++++++++
>   arch/arm/dts/rk3399-puma.dtsi                | 19 ----------------
>   8 files changed, 36 insertions(+), 25 deletions(-)
>   create mode 100644 arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
>   create mode 100644 arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
>   create mode 100644 arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
>   create mode 100644 arch/arm/dts/rk3399-puma-u-boot.dtsi
>
> diff --git a/arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi b/arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
> new file mode 100644
> index 0000000000..39d3927f49
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +#include "rk3399-puma-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1333.dtsi"
> diff --git a/arch/arm/dts/rk3399-puma-ddr1333.dts b/arch/arm/dts/rk3399-puma-ddr1333.dts
> index 8f1193cbe6..80f27699f4 100644
> --- a/arch/arm/dts/rk3399-puma-ddr1333.dts
> +++ b/arch/arm/dts/rk3399-puma-ddr1333.dts
> @@ -6,5 +6,3 @@
>   /dts-v1/;
>   
>   #include "rk3399-puma.dtsi"
> -#include "rk3399-sdram-ddr3-1333.dtsi"
> -
> diff --git a/arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi b/arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
> new file mode 100644
> index 0000000000..be58311dc4
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +#include "rk3399-puma-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts
> index 42763f82d0..cb76b0165c 100644
> --- a/arch/arm/dts/rk3399-puma-ddr1600.dts
> +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
> @@ -7,5 +7,3 @@
>   
>   #include "rk3399-puma.dtsi"
>   #include "rk3399-u-boot.dtsi"
> -#include "rk3399-sdram-ddr3-1600.dtsi"
> -
> diff --git a/arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi b/arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
> new file mode 100644
> index 0000000000..48da076329
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi
> @@ -0,0 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +#include "rk3399-puma-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1866.dtsi"
> diff --git a/arch/arm/dts/rk3399-puma-ddr1866.dts b/arch/arm/dts/rk3399-puma-ddr1866.dts
> index bb86a448fa..80f27699f4 100644
> --- a/arch/arm/dts/rk3399-puma-ddr1866.dts
> +++ b/arch/arm/dts/rk3399-puma-ddr1866.dts
> @@ -6,5 +6,3 @@
>   /dts-v1/;
>   
>   #include "rk3399-puma.dtsi"
> -#include "rk3399-sdram-ddr3-1866.dtsi"
> -
> diff --git a/arch/arm/dts/rk3399-puma-u-boot.dtsi b/arch/arm/dts/rk3399-puma-u-boot.dtsi
> new file mode 100644
> index 0000000000..52f62b5d39
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-puma-u-boot.dtsi
> @@ -0,0 +1,24 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +#include "rk3399-u-boot.dtsi"
> +/ {
> +       config {
> +               u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
> +               u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
> +               u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
> +               u-boot,boot-led = "module_led";
> +               sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
> +       };
> +
> +       chosen {
> +               stdout-path = "serial0:115200n8";
> +               u-boot,spl-boot-order = \
> +                       "same-as-spl", &spiflash, &sdhci, &sdmmc;
> +       };
> +
> +       aliases {
> +               spi0 = &spi1;
> +               spi1 = &spi5;
> +       };
> +
> +};
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index aae9998871..558b6337df 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -10,25 +10,6 @@
>   	model = "Theobroma Systems RK3399-Q7 SoM";
>   	compatible = "tsd,rk3399-q7", "tsd,puma", "rockchip,rk3399";
>   
> -	config {
> -		u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
> -		u-boot,mmc-env-offset = <0x4000>;      /* @  16KB */
> -		u-boot,efi-partition-entries-offset = <0x200000>; /* 2MB */
> -		u-boot,boot-led = "module_led";
> -		sysreset-gpio = <&gpio1 RK_PA6 GPIO_ACTIVE_HIGH>;
> -	};
> -
> -	chosen {
> -		stdout-path = "serial0:115200n8";
> -		u-boot,spl-boot-order = \
> -			"same-as-spl", &spiflash, &sdhci, &sdmmc;
> -	};
> -
> -	aliases {
> -		spi0 = &spi1;
> -		spi1 = &spi5;
> -	};
> -
>   	leds {
>   		compatible = "gpio-leds";
>   		pinctrl-names = "default";