mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-14 00:47:26 +00:00
97fa784725
So far the puma dts files only just included the main puma dtsi without handling the actual baseboard and rk3399-puma.dtsi was very much detached from the variant in the mainline Linux kernel. Recent changes resulted in a strange situation with nonworking puma boards. Commitab800e5a6f("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi") moved the sdram include from rk3399-puma-ddrX.dts to new files rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though. Commit167efc2c7a("arm64: dts: rk3399: Sync v5.7-rc1 from Linux") replaced the rk3399-puma.dtsi nearly completely, but in the kernel it definitly depends on a baseboard dts to actually enable peripherals like sd-slot, uarts, etc. So to untagle this and bring the whole thing more in line with mainline Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate DDR-option devicetrees and instead replace them with a puma Kconfig option to select and include the needed DDR variant. Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
64 lines
1.4 KiB
Text
64 lines
1.4 KiB
Text
// SPDX-License-Identifier: GPL-2.0+
|
|
|
|
#include "rk3399-u-boot.dtsi"
|
|
|
|
#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1333
|
|
#include "rk3399-sdram-ddr3-1333.dtsi"
|
|
#endif
|
|
#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1600
|
|
#include "rk3399-sdram-ddr3-1600.dtsi"
|
|
#endif
|
|
#ifdef CONFIG_TARGET_PUMA_RK3399_RAM_DDR3_1866
|
|
#include "rk3399-sdram-ddr3-1866.dtsi"
|
|
#endif
|
|
|
|
/ {
|
|
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", &norflash, &sdhci, &sdmmc;
|
|
};
|
|
|
|
aliases {
|
|
spi0 = &spi1;
|
|
spi1 = &spi5;
|
|
};
|
|
|
|
/*
|
|
* The Qseven BIOS_DISABLE signal on the RK3399-Q7 keeps the on-module
|
|
* eMMC and SPI flash powered-down initially (in fact it keeps the
|
|
* reset signal asserted). Even though it is an enable signal, we
|
|
* model this as a regulator.
|
|
*/
|
|
bios_enable: bios_enable {
|
|
compatible = "regulator-fixed";
|
|
u-boot,dm-pre-reloc;
|
|
regulator-name = "bios_enable";
|
|
enable-active-high;
|
|
gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <1800000>;
|
|
};
|
|
};
|
|
|
|
&gpio1 {
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
&gpio3 {
|
|
u-boot,dm-pre-reloc;
|
|
};
|
|
|
|
&norflash {
|
|
u-boot,dm-pre-reloc;
|
|
};
|