To better support different RAM timings (DDR3-1333 and DDR3-1866 are assembly options for the RK3399-Q7), this refactors the DTS support and renames the default DTS variant from rk3399-puma to rk3399-puma-ddr1600: - changes the rk3399-puma DTS into a board-specific DTSI by removing the inclusion of the DRAM timings - adds a new rk3399-puma-ddr1600.dts, which includes the (new) common board DTSI and the DDR3-1600 timing DTSI - wires this up from arch/arm/dts/Makefile and configs/puma-rk3399_defconfig
Signed-off-by: Philipp Tomsich philipp.tomsich@theobroma-systems.com
---
Changes in v2: - changed implementation from Kconfig and C preprocessor macros in the DTS to using one DTS per DRAM timing that contains only two includes: one for the common board-level definitions and one for the DRAM timings
arch/arm/dts/Makefile | 2 +- arch/arm/dts/rk3399-puma-ddr1600.dts | 11 +++++++++++ arch/arm/dts/{rk3399-puma.dts => rk3399-puma.dtsi} | 2 -- configs/puma-rk3399_defconfig | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/rk3399-puma-ddr1600.dts rename arch/arm/dts/{rk3399-puma.dts => rk3399-puma.dtsi} (98%)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 86066a3..d9bb7f8 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -43,7 +43,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3328-evb.dtb \ rk3399-evb.dtb \ rk3399-firefly.dtb \ - rk3399-puma.dtb \ + rk3399-puma-ddr1600.dtb \ rv1108-evb.dtb dtb-$(CONFIG_ARCH_MESON) += \ meson-gxbb-odroidc2.dtb diff --git a/arch/arm/dts/rk3399-puma-ddr1600.dts b/arch/arm/dts/rk3399-puma-ddr1600.dts new file mode 100644 index 0000000..31aaf70 --- /dev/null +++ b/arch/arm/dts/rk3399-puma-ddr1600.dts @@ -0,0 +1,11 @@ +/* + * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH + * + * SPDX-License-Identifier: GPL-2.0+ X11 + */ + +/dts-v1/; + +#include "rk3399-puma.dtsi" +#include "rk3399-sdram-ddr3-1600.dtsi" + diff --git a/arch/arm/dts/rk3399-puma.dts b/arch/arm/dts/rk3399-puma.dtsi similarity index 98% rename from arch/arm/dts/rk3399-puma.dts rename to arch/arm/dts/rk3399-puma.dtsi index c04a853..5544f14 100644 --- a/arch/arm/dts/rk3399-puma.dts +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -4,10 +4,8 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */
-/dts-v1/; #include <dt-bindings/pwm/pwm.h> #include "rk3399.dtsi" -#include "rk3399-sdram-ddr3-1600.dtsi"
/ { model = "Theobroma Systems RK3399-Q7 SoM"; diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index 577aa02..e07afdc 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -8,7 +8,7 @@ CONFIG_TARGET_PUMA_RK3399=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x80000 -CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma" +CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y # CONFIG_DISPLAY_CPUINFO is not set