Re: [PATCH 1/5] arm64: rockchip: dts: rk3399: Create -u-boot.dtsi files

Paul Kocialkowski
2019-04-26T18:00:27Z

Hi,

Please split off this two commits to another dedicated series, with the
patch introducing rk3399-u-boot.dtsi. You can then decide to introduce
rk3399 boards support (in a third series) before or after.

Cheers,

Paul

Le vendredi 26 avril 2019 à 19:04 +0530, Jagan Teki a écrit :
> We have a base rk3399-u-boot.dtsi which enabled sdmmc for SPL,
> extend the same with spi1 so-that the SPL spi boot boards can
> make use of the same.
>
> So, to make use of this common rk3399-u-boot.dtsi we have to
> include this in respective dts files.
>
> So, this patch will create all preliminary infrastructure, like
> - create -u-boot.dtsi
> - include rk3399-u-boot.dtsi
> - move sdram dtsi into -u-boot.dtsi
> - drop sdmmc, u-boot,dm-pre-reloc
> - drop spi1, u-boot,dm-pre-reloc
>
> This would help to
> - sync the dts(i) files from Linux whenever required instead of
> adding specific nodes.
> - easy to add u-boot specific changes like binman node into common
> -u-boot.dtsi file
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> ---
> arch/arm/dts/rk3399-evb-u-boot.dtsi | 7 +++++++
> arch/arm/dts/rk3399-evb.dts | 2 --
> arch/arm/dts/rk3399-ficus-u-boot.dtsi | 7 +++++++
> arch/arm/dts/rk3399-ficus.dts | 1 -
> arch/arm/dts/rk3399-firefly-u-boot.dtsi | 7 +++++++
> arch/arm/dts/rk3399-firefly.dts | 2 --
> arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 7 +++++++
> arch/arm/dts/rk3399-gru-bob.dts | 1 -
> arch/arm/dts/rk3399-gru.dtsi | 1 -
> arch/arm/dts/rk3399-puma-ddr1600.dts | 2 +-
> arch/arm/dts/rk3399-puma.dtsi | 3 ---
> arch/arm/dts/rk3399-rock960-u-boot.dtsi | 7 +++++++
> arch/arm/dts/rk3399-rock960.dts | 1 -
> arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
> 14 files changed, 40 insertions(+), 12 deletions(-)
> create mode 100644 arch/arm/dts/rk3399-evb-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-ficus-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-firefly-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> create mode 100644 arch/arm/dts/rk3399-rock960-u-boot.dtsi
>
> diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> new file mode 100644
> index 0000000000..20910e744b
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
> index ce004d0d18..a506e8da37 100644
> --- a/arch/arm/dts/rk3399-evb.dts
> +++ b/arch/arm/dts/rk3399-evb.dts
> @@ -7,7 +7,6 @@
> #include <dt-bindings/pwm/pwm.h>
> #include <dt-bindings/pinctrl/rockchip.h>
> #include "rk3399.dtsi"
> -#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
>
> / {
> model = "Rockchip RK3399 Evaluation Board";
> @@ -155,7 +154,6 @@
> };
>
> &sdmmc {
> - u-boot,dm-pre-reloc;
> bus-width = <4>;
> status = "okay";
> };
> diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> new file mode 100644
> index 0000000000..67b63a8352
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts
> index 4af0e4e383..4b2dd82b67 100644
> --- a/arch/arm/dts/rk3399-ficus.dts
> +++ b/arch/arm/dts/rk3399-ficus.dts
> @@ -8,7 +8,6 @@
>
> /dts-v1/;
> #include "rk3399-rock960.dtsi"
> -#include "rk3399-sdram-ddr3-1600.dtsi"
>
> / {
> model = "96boards RK3399 Ficus";
> diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> new file mode 100644
> index 0000000000..67b63a8352
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> +#include "rk3399-sdram-ddr3-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
> index f90e7e88db..a4cb64f8bd 100644
> --- a/arch/arm/dts/rk3399-firefly.dts
> +++ b/arch/arm/dts/rk3399-firefly.dts
> @@ -7,7 +7,6 @@
> #include <dt-bindings/pwm/pwm.h>
> #include <dt-bindings/pinctrl/rockchip.h>
> #include "rk3399.dtsi"
> -#include "rk3399-sdram-ddr3-1600.dtsi"
>
> / {
> model = "Firefly-RK3399 Board";
> @@ -592,7 +591,6 @@
> };
>
> &sdmmc {
> - u-boot,dm-pre-reloc;
> bus-width = <4>;
> status = "okay";
> };
> diff --git a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> new file mode 100644
> index 0000000000..f0d31edefd
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> +#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
> diff --git a/arch/arm/dts/rk3399-gru-bob.dts b/arch/arm/dts/rk3399-gru-bob.dts
> index 0e3d91fc28..1ee0dc0d9f 100644
> --- a/arch/arm/dts/rk3399-gru-bob.dts
> +++ b/arch/arm/dts/rk3399-gru-bob.dts
> @@ -7,7 +7,6 @@
>
> /dts-v1/;
> #include "rk3399-gru-chromebook.dtsi"
> -#include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
>
> / {
> model = "Google Bob";
> diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
> index df19263acc..8b3d90fdc6 100644
> --- a/arch/arm/dts/rk3399-gru.dtsi
> +++ b/arch/arm/dts/rk3399-gru.dtsi
> @@ -545,7 +545,6 @@ ap_i2c_audio: &i2c8 {
>
> &spi1 {
> status = "okay";
> - u-boot,dm-pre-reloc;
>
> pinctrl-names = "default", "sleep";
> pinctrl-1 = <&spi1_sleep>;
> diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts
> index 337e0eabb4..b4fc2457f0 100644
> --- a/arch/arm/dts/rk3399-puma-ddr1600.dts
> +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
> @@ -6,5 +6,5 @@
> /dts-v1/;
>
> #include "rk3399-puma.dtsi"
> +#include "rk3399-u-boot.dtsi"
> #include "rk3399-sdram-ddr3-1600.dtsi"
> -
> diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
> index 8304f67192..2712ab6826 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -492,7 +492,6 @@
> };
>
> &sdmmc {
> - u-boot,dm-pre-reloc;
> clock-frequency = <150000000>;
> max-frequency = <40000000>;
> supports-sd;
> @@ -648,8 +647,6 @@
>
>
> &spi1 {
> - u-boot,dm-pre-reloc;
> -
> status = "okay";
>
> #address-cells = <1>;
> diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> new file mode 100644
> index 0000000000..7fb5072a9b
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> +#include "rk3399-sdram-lpddr3-2GB-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts
> index 25c58b4261..7e06bc97e5 100644
> --- a/arch/arm/dts/rk3399-rock960.dts
> +++ b/arch/arm/dts/rk3399-rock960.dts
> @@ -5,7 +5,6 @@
>
> /dts-v1/;
> #include "rk3399-rock960.dtsi"
> -#include "rk3399-sdram-lpddr3-2GB-1600.dtsi"
>
> / {
> model = "96boards Rock960";
> diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi
> index f533ed95eb..0786c1193a 100644
> --- a/arch/arm/dts/rk3399-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-u-boot.dtsi
> @@ -6,3 +6,7 @@
> &sdmmc {
> u-boot,dm-pre-reloc;
> };
> +
> +&spi1 {
> + u-boot,dm-pre-reloc;
> +};

_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org