[RFC PATCH v1 4/6] arm: dts: rockchip: move spi0 u-boot, dm-pre-reloc and alias to rk3328 board files
Johan Jonker
jbx6244 at gmail.com
Wed Jun 30 09:22:49 PDT 2021
The spi0 node has a common u-boot,dm-pre-reloc property and
an alias in rk3328-u-boot.dtsi, so all boards contain this
as well in u-boot-tpl.dtb. Clean it up a bit and move it
to only boards that use it.
Signed-off-by: Johan Jonker <jbx6244 at gmail.com>
---
arch/arm/dts/rk3328-rock64-u-boot.dtsi | 6 ++++++
arch/arm/dts/rk3328-u-boot.dtsi | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 37ecc6a753..dae79d6268 100644
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -6,6 +6,10 @@
#include "rk3328-u-boot.dtsi"
#include "rk3328-sdram-lpddr3-1600.dtsi"
/ {
+ aliases {
+ spi0 = &spi0;
+ };
+
chosen {
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
};
@@ -69,6 +73,8 @@
};
&spi0 {
+ u-boot,dm-pre-reloc;
+
spi_flash: spiflash at 0 {
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index e00e466d8d..03e5f18f1a 100644
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -4,10 +4,6 @@
*/
/ {
- aliases {
- spi0 = &spi0;
- };
-
chosen {
u-boot,spl-boot-order = &emmc, &sdmmc;
};
@@ -54,7 +50,3 @@
&usb20_otg {
hnp-srp-disable;
};
-
-&spi0 {
- u-boot,dm-pre-reloc;
-};
--
2.11.0
More information about the Linux-rockchip
mailing list