[U-Boot] [PATCH v7 0/4] arm64: rockchip: dts: Add rk3399 -u-boot.dtsi files

[U-Boot] [PATCH v7 0/4] arm64: rockchip: dts: Add rk3399 -u-boot.dtsi files

[Jagan Teki]

Unfortunately initial version of creating rk3399-u-boot.dtsi 
has been merged, so this series is rework of previous v6 set[1]
on top of u-boot-rockchip/master

All these changes are updating rk3399-u-boot.dtsi and rk3399
board -u-boot.dtsi files and u-boot specific dts changes like
- sdram dtsi
- sdmmc, u-boot,dm-pre-reloc
- spi1, u-boot,dm-pre-reloc

Changes for v7:
- rebase on u-boot-rockchip/master
- recreate patches based on v1 series merge
- add patch for dtb build based on SoC type 
Changes for v6:
- spilt the existing patch[2] into multiple patches
  and send as a separate series.

[2] https://patchwork.ozlabs.org/patch/1091720/
[1] https://patchwork.ozlabs.org/cover/1091909/

Any inputs?
Jagan.

Jagan Teki (4):
  dts: Makefile: Build rockchip dtbs based on SoC types
  arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files
  rockchip: dts: rk3399-u-boot: Add u-boot,dm-pre-reloc for spi1
  arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi

 arch/arm/dts/Makefile                   | 35 ++++++++++++++++++-------
 arch/arm/dts/rk3399-evb-u-boot.dtsi     |  7 +++++
 arch/arm/dts/rk3399-evb.dts             |  1 -
 arch/arm/dts/rk3399-ficus-u-boot.dtsi   |  6 +++++
 arch/arm/dts/rk3399-ficus.dts           |  1 -
 arch/arm/dts/rk3399-firefly-u-boot.dtsi |  7 +++++
 arch/arm/dts/rk3399-firefly.dts         |  1 -
 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi |  7 +++++
 arch/arm/dts/rk3399-gru-bob.dts         |  1 -
 arch/arm/dts/rk3399-gru-u-boot.dtsi     |  6 +++++
 arch/arm/dts/rk3399-gru.dtsi            |  1 -
 arch/arm/dts/rk3399-puma-ddr1600.dts    |  1 +
 arch/arm/dts/rk3399-puma.dtsi           |  2 --
 arch/arm/dts/rk3399-rock960-u-boot.dtsi |  6 +++++
 arch/arm/dts/rk3399-rock960.dts         |  1 -
 arch/arm/dts/rk3399-u-boot.dtsi         |  4 +++
 16 files changed, 70 insertions(+), 17 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-gru-u-boot.dtsi
 create mode 100644 arch/arm/dts/rk3399-rock960-u-boot.dtsi

-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v7 1/4] dts: Makefile: Build rockchip dtbs based on SoC types

[Jagan Teki]

- Sometimes u-boot specific dtsi files are included
  automatically which would build for entire rockchip SoC,
  even-though the respective dtsi should used it for specific
  family of rockchip SoC.
- Sometimes u-boot specific dts nodes or properties can use
  config macros from respective rockchip family include/configs
  files, example CONFIG_SPL_PAD_TO.

So, it's better to compile the dtbs based on the respective
rockchip family types rather than rockchip itself to avoid
compilation issues.

This patch organize the existing dtb's based on the rockchip
family types.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/Makefile | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8e082f2840..35cbbfabd0 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -65,16 +65,23 @@ dtb-$(CONFIG_KIRKWOOD) += \
 dtb-$(CONFIG_ARCH_OWL) += \
 	bubblegum_96.dtb
 
-dtb-$(CONFIG_ARCH_ROCKCHIP) += \
-	rk3036-sdk.dtb \
-	rk3128-evb.dtb \
-	rk3188-radxarock.dtb \
-	rk3229-evb.dtb \
+dtb-$(CONFIG_ROCKCHIP_RK3036) += \
+	rk3036-sdk.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3128) += \
+	rk3128-evb.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3188) += \
+	rk3188-radxarock.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK322X) += \
+	rk3229-evb.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3288) += \
 	rk3288-evb.dtb \
 	rk3288-fennec.dtb \
 	rk3288-firefly.dtb \
 	rk3288-miqi.dtb \
-	rk3399-orangepi.dtb \
 	rk3288-phycore-rdk.dtb \
 	rk3288-popmetal.dtb \
 	rk3288-rock2-square.dtb \
@@ -83,22 +90,32 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3288-veyron-mickey.dtb \
 	rk3288-veyron-minnie.dtb \
 	rk3288-veyron-speedy.dtb \
-	rk3288-vyasa.dtb \
-	rk3328-evb.dtb \
-	rk3399-ficus.dtb \
+	rk3288-vyasa.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3328) += \
+	rk3328-evb.dtb
+
+dtb-$(CONFIG_ROCKCHIP_RK3368) += \
 	rk3368-lion.dtb \
 	rk3368-sheep.dtb \
 	rk3368-geekbox.dtb \
 	rk3368-px5-evb.dtb \
+
+dtb-$(CONFIG_ROCKCHIP_RK3399) += \
 	rk3399-evb.dtb \
+	rk3399-ficus.dtb \
 	rk3399-firefly.dtb \
 	rk3399-gru-bob.dtb \
+	rk3399-orangepi.dtb \
 	rk3399-puma-ddr1333.dtb \
 	rk3399-puma-ddr1600.dtb \
 	rk3399-puma-ddr1866.dtb \
 	rk3399-rock960.dtb \
+
+dtb-$(CONFIG_ROCKCHIP_RV1108) += \
 	rv1108-elgin-r1.dtb \
 	rv1108-evb.dtb
+
 dtb-$(CONFIG_ARCH_MESON) += \
 	meson-gxbb-nanopi-k2.dtb \
 	meson-gxbb-odroidc2.dtb \
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v7 1/4] dts: Makefile: Build rockchip dtbs based on SoC types

[Kever Yang]

On 05/08/2019 02:21 AM, Jagan Teki wrote:
> - Sometimes u-boot specific dtsi files are included
>   automatically which would build for entire rockchip SoC,
>   even-though the respective dtsi should used it for specific
>   family of rockchip SoC.
> - Sometimes u-boot specific dts nodes or properties can use
>   config macros from respective rockchip family include/configs
>   files, example CONFIG_SPL_PAD_TO.
>
> So, it's better to compile the dtbs based on the respective
> rockchip family types rather than rockchip itself to avoid
> compilation issues.
>
> This patch organize the existing dtb's based on the rockchip
> family types.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

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

Thanks,
- Kever
> ---
>  arch/arm/dts/Makefile | 35 ++++++++++++++++++++++++++---------
>  1 file changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 8e082f2840..35cbbfabd0 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -65,16 +65,23 @@ dtb-$(CONFIG_KIRKWOOD) += \
>  dtb-$(CONFIG_ARCH_OWL) += \
>  	bubblegum_96.dtb
>  
> -dtb-$(CONFIG_ARCH_ROCKCHIP) += \
> -	rk3036-sdk.dtb \
> -	rk3128-evb.dtb \
> -	rk3188-radxarock.dtb \
> -	rk3229-evb.dtb \
> +dtb-$(CONFIG_ROCKCHIP_RK3036) += \
> +	rk3036-sdk.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3128) += \
> +	rk3128-evb.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3188) += \
> +	rk3188-radxarock.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK322X) += \
> +	rk3229-evb.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3288) += \
>  	rk3288-evb.dtb \
>  	rk3288-fennec.dtb \
>  	rk3288-firefly.dtb \
>  	rk3288-miqi.dtb \
> -	rk3399-orangepi.dtb \
>  	rk3288-phycore-rdk.dtb \
>  	rk3288-popmetal.dtb \
>  	rk3288-rock2-square.dtb \
> @@ -83,22 +90,32 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>  	rk3288-veyron-mickey.dtb \
>  	rk3288-veyron-minnie.dtb \
>  	rk3288-veyron-speedy.dtb \
> -	rk3288-vyasa.dtb \
> -	rk3328-evb.dtb \
> -	rk3399-ficus.dtb \
> +	rk3288-vyasa.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3328) += \
> +	rk3328-evb.dtb
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3368) += \
>  	rk3368-lion.dtb \
>  	rk3368-sheep.dtb \
>  	rk3368-geekbox.dtb \
>  	rk3368-px5-evb.dtb \
> +
> +dtb-$(CONFIG_ROCKCHIP_RK3399) += \
>  	rk3399-evb.dtb \
> +	rk3399-ficus.dtb \
>  	rk3399-firefly.dtb \
>  	rk3399-gru-bob.dtb \
> +	rk3399-orangepi.dtb \
>  	rk3399-puma-ddr1333.dtb \
>  	rk3399-puma-ddr1600.dtb \
>  	rk3399-puma-ddr1866.dtb \
>  	rk3399-rock960.dtb \
> +
> +dtb-$(CONFIG_ROCKCHIP_RV1108) += \
>  	rv1108-elgin-r1.dtb \
>  	rv1108-evb.dtb
> +
>  dtb-$(CONFIG_ARCH_MESON) += \
>  	meson-gxbb-nanopi-k2.dtb \
>  	meson-gxbb-odroidc2.dtb \

[U-Boot] [PATCH v7 1/4] dts: Makefile: Build rockchip dtbs based on SoC types【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

[Kever Yang]

On 05/08/2019 11:38 AM, Kever Yang wrote:
>
> On 05/08/2019 02:21 AM, Jagan Teki wrote:
>> - Sometimes u-boot specific dtsi files are included
>>   automatically which would build for entire rockchip SoC,
>>   even-though the respective dtsi should used it for specific
>>   family of rockchip SoC.
>> - Sometimes u-boot specific dts nodes or properties can use
>>   config macros from respective rockchip family include/configs
>>   files, example CONFIG_SPL_PAD_TO.
>>
>> So, it's better to compile the dtbs based on the respective
>> rockchip family types rather than rockchip itself to avoid
>> compilation issues.
>>
>> This patch organize the existing dtb's based on the rockchip
>> family types.
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Applied to u-boot-rockchip, thanks!

>
> Thanks,
> - Kever
>> ---
>>  arch/arm/dts/Makefile | 35 ++++++++++++++++++++++++++---------
>>  1 file changed, 26 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> index 8e082f2840..35cbbfabd0 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -65,16 +65,23 @@ dtb-$(CONFIG_KIRKWOOD) += \
>>  dtb-$(CONFIG_ARCH_OWL) += \
>>  	bubblegum_96.dtb
>>  
>> -dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>> -	rk3036-sdk.dtb \
>> -	rk3128-evb.dtb \
>> -	rk3188-radxarock.dtb \
>> -	rk3229-evb.dtb \
>> +dtb-$(CONFIG_ROCKCHIP_RK3036) += \
>> +	rk3036-sdk.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3128) += \
>> +	rk3128-evb.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3188) += \
>> +	rk3188-radxarock.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK322X) += \
>> +	rk3229-evb.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3288) += \
>>  	rk3288-evb.dtb \
>>  	rk3288-fennec.dtb \
>>  	rk3288-firefly.dtb \
>>  	rk3288-miqi.dtb \
>> -	rk3399-orangepi.dtb \
>>  	rk3288-phycore-rdk.dtb \
>>  	rk3288-popmetal.dtb \
>>  	rk3288-rock2-square.dtb \
>> @@ -83,22 +90,32 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
>>  	rk3288-veyron-mickey.dtb \
>>  	rk3288-veyron-minnie.dtb \
>>  	rk3288-veyron-speedy.dtb \
>> -	rk3288-vyasa.dtb \
>> -	rk3328-evb.dtb \
>> -	rk3399-ficus.dtb \
>> +	rk3288-vyasa.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3328) += \
>> +	rk3328-evb.dtb
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3368) += \
>>  	rk3368-lion.dtb \
>>  	rk3368-sheep.dtb \
>>  	rk3368-geekbox.dtb \
>>  	rk3368-px5-evb.dtb \
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RK3399) += \
>>  	rk3399-evb.dtb \
>> +	rk3399-ficus.dtb \
>>  	rk3399-firefly.dtb \
>>  	rk3399-gru-bob.dtb \
>> +	rk3399-orangepi.dtb \
>>  	rk3399-puma-ddr1333.dtb \
>>  	rk3399-puma-ddr1600.dtb \
>>  	rk3399-puma-ddr1866.dtb \
>>  	rk3399-rock960.dtb \
>> +
>> +dtb-$(CONFIG_ROCKCHIP_RV1108) += \
>>  	rv1108-elgin-r1.dtb \
>>  	rv1108-evb.dtb
>> +
>>  dtb-$(CONFIG_ARCH_MESON) += \
>>  	meson-gxbb-nanopi-k2.dtb \
>>  	meson-gxbb-odroidc2.dtb \
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>

[U-Boot] [PATCH v7 2/4] arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files

[Jagan Teki]

Devicetree files in RK3399 platform is synced from Linux, like other
platforms does. Apart from these u-boot in rk3399 would also require
some u-boot specific node like dmc.

dmc node has big chunk of DDR timing parameters which are specific
to specific board, and maintained with rk3399-sdram*.dtsi.

So, create board specific -u-boot.dtsi files and move these sdram dtsi
files accordingly. This would help of maintain u-boot specific changes
separately without touching Linux dts(i) files which indeed easy for
syncing from Linux between releases.

These board specific -u-boot.dtsi can be extendible to add more u-boot
specific nodes or properties in future.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/rk3399-evb-u-boot.dtsi     | 6 ++++++
 arch/arm/dts/rk3399-evb.dts             | 1 -
 arch/arm/dts/rk3399-ficus-u-boot.dtsi   | 6 ++++++
 arch/arm/dts/rk3399-ficus.dts           | 1 -
 arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++
 arch/arm/dts/rk3399-firefly.dts         | 1 -
 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 6 ++++++
 arch/arm/dts/rk3399-gru-bob.dts         | 1 -
 arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 ++++++
 arch/arm/dts/rk3399-rock960.dts         | 1 -
 10 files changed, 30 insertions(+), 5 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..7e2c57af22
--- /dev/null
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index 9162f3dd50..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";
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..eab86bdb30
--- /dev/null
+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#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..eab86bdb30
--- /dev/null
+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#include "rk3399-sdram-ddr3-1600.dtsi"
diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
index 46f2ffaf8d..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";
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..9edb8cf841
--- /dev/null
+++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#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-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
new file mode 100644
index 0000000000..5256f6d3f2
--- /dev/null
+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#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";
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v7 2/4] arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

[Kever Yang]

On 05/08/2019 02:21 AM, Jagan Teki wrote:
> Devicetree files in RK3399 platform is synced from Linux, like other
> platforms does. Apart from these u-boot in rk3399 would also require
> some u-boot specific node like dmc.
>
> dmc node has big chunk of DDR timing parameters which are specific
> to specific board, and maintained with rk3399-sdram*.dtsi.
>
> So, create board specific -u-boot.dtsi files and move these sdram dtsi
> files accordingly. This would help of maintain u-boot specific changes
> separately without touching Linux dts(i) files which indeed easy for
> syncing from Linux between releases.
>
> These board specific -u-boot.dtsi can be extendible to add more u-boot
> specific nodes or properties in future.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>


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

Thanks,
- Kever
> ---
>  arch/arm/dts/rk3399-evb-u-boot.dtsi     | 6 ++++++
>  arch/arm/dts/rk3399-evb.dts             | 1 -
>  arch/arm/dts/rk3399-ficus-u-boot.dtsi   | 6 ++++++
>  arch/arm/dts/rk3399-ficus.dts           | 1 -
>  arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++
>  arch/arm/dts/rk3399-firefly.dts         | 1 -
>  arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 6 ++++++
>  arch/arm/dts/rk3399-gru-bob.dts         | 1 -
>  arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 ++++++
>  arch/arm/dts/rk3399-rock960.dts         | 1 -
>  10 files changed, 30 insertions(+), 5 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..7e2c57af22
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
> index 9162f3dd50..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";
> 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..eab86bdb30
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#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..eab86bdb30
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-sdram-ddr3-1600.dtsi"
> diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
> index 46f2ffaf8d..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";
> 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..9edb8cf841
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#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-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> new file mode 100644
> index 0000000000..5256f6d3f2
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#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";

[U-Boot] [PATCH v7 2/4] arm64: rockchip: dts: rk3399: Add board -u-boot.dtsi files

[Kever Yang]

On 05/08/2019 11:39 AM, Kever Yang wrote:
>
> On 05/08/2019 02:21 AM, Jagan Teki wrote:
>> Devicetree files in RK3399 platform is synced from Linux, like other
>> platforms does. Apart from these u-boot in rk3399 would also require
>> some u-boot specific node like dmc.
>>
>> dmc node has big chunk of DDR timing parameters which are specific
>> to specific board, and maintained with rk3399-sdram*.dtsi.
>>
>> So, create board specific -u-boot.dtsi files and move these sdram dtsi
>> files accordingly. This would help of maintain u-boot specific changes
>> separately without touching Linux dts(i) files which indeed easy for
>> syncing from Linux between releases.
>>
>> These board specific -u-boot.dtsi can be extendible to add more u-boot
>> specific nodes or properties in future.
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Applied to u-boot-rockchip, thanks!

>
> Thanks,
> - Kever
>> ---
>>  arch/arm/dts/rk3399-evb-u-boot.dtsi     | 6 ++++++
>>  arch/arm/dts/rk3399-evb.dts             | 1 -
>>  arch/arm/dts/rk3399-ficus-u-boot.dtsi   | 6 ++++++
>>  arch/arm/dts/rk3399-ficus.dts           | 1 -
>>  arch/arm/dts/rk3399-firefly-u-boot.dtsi | 6 ++++++
>>  arch/arm/dts/rk3399-firefly.dts         | 1 -
>>  arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 6 ++++++
>>  arch/arm/dts/rk3399-gru-bob.dts         | 1 -
>>  arch/arm/dts/rk3399-rock960-u-boot.dtsi | 6 ++++++
>>  arch/arm/dts/rk3399-rock960.dts         | 1 -
>>  10 files changed, 30 insertions(+), 5 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..7e2c57af22
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
>> diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
>> index 9162f3dd50..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";
>> 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..eab86bdb30
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#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..eab86bdb30
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#include "rk3399-sdram-ddr3-1600.dtsi"
>> diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
>> index 46f2ffaf8d..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";
>> 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..9edb8cf841
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#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-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..5256f6d3f2
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#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";
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>

[U-Boot] [PATCH v7 3/4] rockchip: dts: rk3399-u-boot: Add u-boot, dm-pre-reloc for spi1

[Jagan Teki]

Add u-boot,dm-pre-reloc property for spi1, so-that the
subsequent rk3399 boards which boot from SPI.

This help to separate the u-boot specific properties away
from base dts files so-that the Linux sync become easy and
meaningful.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

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;
+};
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v7 3/4] rockchip: dts: rk3399-u-boot: Add u-boot, dm-pre-reloc for spi1【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

[Kever Yang]

On 05/08/2019 02:21 AM, Jagan Teki wrote:
> Add u-boot,dm-pre-reloc property for spi1, so-that the
> subsequent rk3399 boards which boot from SPI.
>
> This help to separate the u-boot specific properties away
> from base dts files so-that the Linux sync become easy and
> meaningful.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>


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

Thanks,
- Kever
> ---
>  arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> 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;
> +};

[U-Boot] [PATCH v7 3/4] rockchip: dts: rk3399-u-boot: Add u-boot, dm-pre-reloc for spi1

[Kever Yang]

On 05/08/2019 11:39 AM, Kever Yang wrote:
>
> On 05/08/2019 02:21 AM, Jagan Teki wrote:
>> Add u-boot,dm-pre-reloc property for spi1, so-that the
>> subsequent rk3399 boards which boot from SPI.
>>
>> This help to separate the u-boot specific properties away
>> from base dts files so-that the Linux sync become easy and
>> meaningful.
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Applied to u-boot-rockchip, thanks!

>
> Thanks,
> - Kever
>> ---
>>  arch/arm/dts/rk3399-u-boot.dtsi | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> 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 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>

[U-Boot] [PATCH v7 4/4] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi

[Jagan Teki]

Now we have
- board specific -u-boot.dtsi files for board specific u-boot
  dts changes.
- soc specific rk3399-u-boot.dtsi for soc specific u-boot
  dts changes.

So, include the rk3399-u-boot-dtsi on respective board -u-boot.dtsi
and drop the properties which are globally available in rk3399-u-boot.dtsi

Right now rk3399-u-boot.dtsi has sdmmc, spi1 u-boot,dm-pre-reloc
property and more properties and nodes can be move further based
on the requirements.

This would fix, the -u-boot.dtsi inclusion for evb, firefly, puma
boards that was accidentally merged on below commit.
"rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi"
(sha1: e05b4a4fa84b65a0c8873e8f34721741fe2bc09d)

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 arch/arm/dts/rk3399-evb-u-boot.dtsi     | 1 +
 arch/arm/dts/rk3399-firefly-u-boot.dtsi | 1 +
 arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 1 +
 arch/arm/dts/rk3399-gru-u-boot.dtsi     | 6 ++++++
 arch/arm/dts/rk3399-gru.dtsi            | 1 -
 arch/arm/dts/rk3399-puma-ddr1600.dts    | 1 +
 arch/arm/dts/rk3399-puma.dtsi           | 2 --
 7 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi

diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index 7e2c57af22..20910e744b 100644
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -3,4 +3,5 @@
  * 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-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
index eab86bdb30..67b63a8352 100644
--- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
@@ -3,4 +3,5 @@
  * 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-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
index 9edb8cf841..726f396f32 100644
--- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
@@ -3,4 +3,5 @@
  * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
  */
 
+#include "rk3399-gru-u-boot.dtsi"
 #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi
new file mode 100644
index 0000000000..7bddc3acdb
--- /dev/null
+++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+#include "rk3399-u-boot.dtsi"
diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
index 4cdb4320b7..ca0fc391b2 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..42763f82d0 100644
--- a/arch/arm/dts/rk3399-puma-ddr1600.dts
+++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
@@ -6,5 +6,6 @@
 /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 319a610022..897e0bda85 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -647,8 +647,6 @@
 
 
 &spi1 {
-	u-boot,dm-pre-reloc;
-
 	status = "okay";
 
 	#address-cells = <1>;
-- 
2.18.0.321.gffc6fa0e3

[U-Boot] [PATCH v7 4/4] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi【请注意，邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】

[Kever Yang]

On 05/08/2019 02:21 AM, Jagan Teki wrote:
> Now we have
> - board specific -u-boot.dtsi files for board specific u-boot
>   dts changes.
> - soc specific rk3399-u-boot.dtsi for soc specific u-boot
>   dts changes.
>
> So, include the rk3399-u-boot-dtsi on respective board -u-boot.dtsi
> and drop the properties which are globally available in rk3399-u-boot.dtsi
>
> Right now rk3399-u-boot.dtsi has sdmmc, spi1 u-boot,dm-pre-reloc
> property and more properties and nodes can be move further based
> on the requirements.
>
> This would fix, the -u-boot.dtsi inclusion for evb, firefly, puma
> boards that was accidentally merged on below commit.
> "rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi"
> (sha1: e05b4a4fa84b65a0c8873e8f34721741fe2bc09d)
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>


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

Thanks,
- Kever
> ---
>  arch/arm/dts/rk3399-evb-u-boot.dtsi     | 1 +
>  arch/arm/dts/rk3399-firefly-u-boot.dtsi | 1 +
>  arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 1 +
>  arch/arm/dts/rk3399-gru-u-boot.dtsi     | 6 ++++++
>  arch/arm/dts/rk3399-gru.dtsi            | 1 -
>  arch/arm/dts/rk3399-puma-ddr1600.dts    | 1 +
>  arch/arm/dts/rk3399-puma.dtsi           | 2 --
>  7 files changed, 10 insertions(+), 3 deletions(-)
>  create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi
>
> diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> index 7e2c57af22..20910e744b 100644
> --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
> @@ -3,4 +3,5 @@
>   * 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-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> index eab86bdb30..67b63a8352 100644
> --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
> @@ -3,4 +3,5 @@
>   * 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-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> index 9edb8cf841..726f396f32 100644
> --- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
> @@ -3,4 +3,5 @@
>   * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>   */
>  
> +#include "rk3399-gru-u-boot.dtsi"
>  #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
> diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> new file mode 100644
> index 0000000000..7bddc3acdb
> --- /dev/null
> +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
> @@ -0,0 +1,6 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
> + */
> +
> +#include "rk3399-u-boot.dtsi"
> diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
> index 4cdb4320b7..ca0fc391b2 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..42763f82d0 100644
> --- a/arch/arm/dts/rk3399-puma-ddr1600.dts
> +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
> @@ -6,5 +6,6 @@
>  /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 319a610022..897e0bda85 100644
> --- a/arch/arm/dts/rk3399-puma.dtsi
> +++ b/arch/arm/dts/rk3399-puma.dtsi
> @@ -647,8 +647,6 @@
>  
>  
>  &spi1 {
> -	u-boot,dm-pre-reloc;
> -
>  	status = "okay";
>  
>  	#address-cells = <1>;

[U-Boot] [PATCH v7 4/4] arm64: rockchip: dts: rk3399: Use rk3399-u-boot.dtsi

[Kever Yang]

On 05/08/2019 11:39 AM, Kever Yang wrote:
>
> On 05/08/2019 02:21 AM, Jagan Teki wrote:
>> Now we have
>> - board specific -u-boot.dtsi files for board specific u-boot
>>   dts changes.
>> - soc specific rk3399-u-boot.dtsi for soc specific u-boot
>>   dts changes.
>>
>> So, include the rk3399-u-boot-dtsi on respective board -u-boot.dtsi
>> and drop the properties which are globally available in rk3399-u-boot.dtsi
>>
>> Right now rk3399-u-boot.dtsi has sdmmc, spi1 u-boot,dm-pre-reloc
>> property and more properties and nodes can be move further based
>> on the requirements.
>>
>> This would fix, the -u-boot.dtsi inclusion for evb, firefly, puma
>> boards that was accidentally merged on below commit.
>> "rockchip: dts: rk3399: Create initial rk3399-u-boot.dtsi"
>> (sha1: e05b4a4fa84b65a0c8873e8f34721741fe2bc09d)
>>
>> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
>
> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Applied to u-boot-rockchip, thanks!

>
> Thanks,
> - Kever
>> ---
>>  arch/arm/dts/rk3399-evb-u-boot.dtsi     | 1 +
>>  arch/arm/dts/rk3399-firefly-u-boot.dtsi | 1 +
>>  arch/arm/dts/rk3399-gru-bob-u-boot.dtsi | 1 +
>>  arch/arm/dts/rk3399-gru-u-boot.dtsi     | 6 ++++++
>>  arch/arm/dts/rk3399-gru.dtsi            | 1 -
>>  arch/arm/dts/rk3399-puma-ddr1600.dts    | 1 +
>>  arch/arm/dts/rk3399-puma.dtsi           | 2 --
>>  7 files changed, 10 insertions(+), 3 deletions(-)
>>  create mode 100644 arch/arm/dts/rk3399-gru-u-boot.dtsi
>>
>> diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
>> index 7e2c57af22..20910e744b 100644
>> --- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
>> @@ -3,4 +3,5 @@
>>   * 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-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
>> index eab86bdb30..67b63a8352 100644
>> --- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
>> @@ -3,4 +3,5 @@
>>   * 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-gru-bob-u-boot.dtsi b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
>> index 9edb8cf841..726f396f32 100644
>> --- a/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
>> +++ b/arch/arm/dts/rk3399-gru-bob-u-boot.dtsi
>> @@ -3,4 +3,5 @@
>>   * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>>   */
>>  
>> +#include "rk3399-gru-u-boot.dtsi"
>>  #include "rk3399-sdram-lpddr3-samsung-4GB-1866.dtsi"
>> diff --git a/arch/arm/dts/rk3399-gru-u-boot.dtsi b/arch/arm/dts/rk3399-gru-u-boot.dtsi
>> new file mode 100644
>> index 0000000000..7bddc3acdb
>> --- /dev/null
>> +++ b/arch/arm/dts/rk3399-gru-u-boot.dtsi
>> @@ -0,0 +1,6 @@
>> +// SPDX-License-Identifier: GPL-2.0+
>> +/*
>> + * Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
>> + */
>> +
>> +#include "rk3399-u-boot.dtsi"
>> diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi
>> index 4cdb4320b7..ca0fc391b2 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..42763f82d0 100644
>> --- a/arch/arm/dts/rk3399-puma-ddr1600.dts
>> +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts
>> @@ -6,5 +6,6 @@
>>  /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 319a610022..897e0bda85 100644
>> --- a/arch/arm/dts/rk3399-puma.dtsi
>> +++ b/arch/arm/dts/rk3399-puma.dtsi
>> @@ -647,8 +647,6 @@
>>  
>>  
>>  &spi1 {
>> -	u-boot,dm-pre-reloc;
>> -
>>  	status = "okay";
>>  
>>  	#address-cells = <1>;
>
>
>
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
>