On Fri, Jun 28, 2019 at 3:38 PM Kever Yang kever.yang@rock-chips.com wrote:
Move all the tag "u-boot,dm-pre-reloc" from rk3288.dtsi into rk3288-u-boot.dtsi.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Changes in v3:
- include "rk3288-u-boot.dtsi" for board already have board level -u-boot.dtsi
Changes in v2: None
arch/arm/dts/rk3288-u-boot.dtsi | 36 +++++++++++++++++++++++++++ arch/arm/dts/rk3288-veyron-speedy.dts | 1 + arch/arm/dts/rk3288-vyasa.dts | 1 + arch/arm/dts/rk3288.dtsi | 8 ------ 4 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 arch/arm/dts/rk3288-u-boot.dtsi
diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi new file mode 100644 index 0000000000..4cf75c7504 --- /dev/null +++ b/arch/arm/dts/rk3288-u-boot.dtsi @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Rockchip Electronics Co., Ltd
- */
+&dmc {
u-boot,dm-pre-reloc;+};
+&pmu {
u-boot,dm-pre-reloc;+};
+&sgrf {
u-boot,dm-pre-reloc;+};
+&cru {
u-boot,dm-pre-reloc;+};
+&grf {
u-boot,dm-pre-reloc;+};
+&vopb {
u-boot,dm-pre-reloc;+};
+&vopl {
u-boot,dm-pre-reloc;+};
+&noc {
u-boot,dm-pre-reloc;+}; diff --git a/arch/arm/dts/rk3288-veyron-speedy.dts b/arch/arm/dts/rk3288-veyron-speedy.dts index 58c1fe96ee..b2c91b3fe5 100644 --- a/arch/arm/dts/rk3288-veyron-speedy.dts +++ b/arch/arm/dts/rk3288-veyron-speedy.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "rk3288-veyron-chromebook.dtsi" #include "cros-ec-sbs.dtsi" +#include "rk3288-u-boot.dtsi" #include "rk3288-veyron-speedy-u-boot.dtsi"
/ { diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts index 850aa25818..12aabf3203 100644 --- a/arch/arm/dts/rk3288-vyasa.dts +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -42,6 +42,7 @@
/dts-v1/; #include "rk3288.dtsi" +#include "rk3288-u-boot.dtsi"
we have -vyasa-u-boot.dtsi it is better to include that instead of base dts files (even for other dts files). keeping base dts unchanged would help us to sync Linux dts is easy and meaningful.