arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi
PATCH 1/1 arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi
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 <[email protected]>
--- 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
arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1333.dtsi"
arch/arm/dts/rk3399-puma-ddr1333.dts +0 -2
@@ -6,5 +6,3 @@ /dts-v1/; #include "rk3399-puma.dtsi" -#include "rk3399-sdram-ddr3-1333.dtsi" -
arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1600.dtsi"
arch/arm/dts/rk3399-puma-ddr1600.dts +0 -2
@@ -7,5 +7,3 @@ #include "rk3399-puma.dtsi" #include "rk3399-u-boot.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" -
arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi new file +4 -0
@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1866.dtsi"
arch/arm/dts/rk3399-puma-ddr1866.dts +0 -2
@@ -6,5 +6,3 @@ /dts-v1/; #include "rk3399-puma.dtsi" -#include "rk3399-sdram-ddr3-1866.dtsi" -
arch/arm/dts/rk3399-puma-u-boot.dtsi new file +24 -0
@@ -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; + }; + +};
arch/arm/dts/rk3399-puma.dtsi +0 -19
@@ -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";
Signature · 1 line
2.24.1
PATCH 1/1 arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi
Quoted 4 lines · Peter Robinson
Move the U-Boot specific bits to a
-u-boot.dtsiinclude so all theu-boot.dtsihierarchy is included.Signed-off-by Peter Robinson <[email protected]>
Reviewed-by Kever Yang <[email protected]>
Thanks,
- Kever
Quoted 135 lines
--- 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.dtsicreate mode 100644arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsicreate mode 100644arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsicreate mode 100644arch/arm/dts/rk3399-puma-u-boot.dtsiarch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi new file +4
-0@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1333.dtsi"arch/arm/dts/rk3399-puma-ddr1333.dts +0
-2@@ -6,5 +6,3 @@ /dts-v1/; #include "rk3399-puma.dtsi" -#include "rk3399-sdram-ddr3-1333.dtsi" -arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi new file +4
-0@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1600.dtsi"arch/arm/dts/rk3399-puma-ddr1600.dts +0
-2@@ -7,5 +7,3 @@ #include "rk3399-puma.dtsi" #include "rk3399-u-boot.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi" -arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi new file +4
-0@@ -0,0 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include "rk3399-puma-u-boot.dtsi" +#include "rk3399-sdram-ddr3-1866.dtsi"arch/arm/dts/rk3399-puma-ddr1866.dts +0
-2@@ -6,5 +6,3 @@ /dts-v1/; #include "rk3399-puma.dtsi" -#include "rk3399-sdram-ddr3-1866.dtsi" -arch/arm/dts/rk3399-puma-u-boot.dtsi new file +24
-0@@ -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; + }; + +};arch/arm/dts/rk3399-puma.dtsi +0
-19@@ -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";