|
|
@@ -0,0 +1,248 @@
|
|
|
+From 8ca5e0e4d6ed084d2321584e8cdc8105c60b9aa1 Mon Sep 17 00:00:00 2001
|
|
|
+From: FUKAUMI Naoki <[email protected]>
|
|
|
+Date: Tue, 25 Jun 2024 05:45:29 +0900
|
|
|
+Subject: [PATCH] rockchip: add support for Radxa ROCK Pi E v3.0
|
|
|
+
|
|
|
+ROCK Pi E v3.0 uses DDR4 SDRAM instead of DDR3 SDRAM used in v1.2x.
|
|
|
+
|
|
|
+prepare new rk3328-rock-pi-e-v3.dts in u-boot which just includes
|
|
|
+upstream rk3328-rock-pi-e.dts.
|
|
|
+
|
|
|
+defconfig still uses
|
|
|
+ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb"
|
|
|
+
|
|
|
+because v3.0 and prior are compatible.
|
|
|
+
|
|
|
+Suggested-by: Jonas Karlman <[email protected]>
|
|
|
+Signed-off-by: FUKAUMI Naoki <[email protected]>
|
|
|
+Reviewed-by: Kever Yang <[email protected]>
|
|
|
+---
|
|
|
+ ...dtsi => rk3328-rock-pi-e-base-u-boot.dtsi} | 1 -
|
|
|
+ arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 47 +--------
|
|
|
+ arch/arm/dts/rk3328-rock-pi-e-v3-u-boot.dtsi | 4 +
|
|
|
+ arch/arm/dts/rk3328-rock-pi-e-v3.dts | 4 +
|
|
|
+ board/rockchip/evb_rk3328/MAINTAINERS | 4 +-
|
|
|
+ configs/rock-pi-e-v3-rk3328_defconfig | 97 +++++++++++++++++++
|
|
|
+ 6 files changed, 111 insertions(+), 46 deletions(-)
|
|
|
+ copy arch/arm/dts/{rk3328-rock-pi-e-u-boot.dtsi => rk3328-rock-pi-e-base-u-boot.dtsi} (94%)
|
|
|
+ rewrite arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi (88%)
|
|
|
+ create mode 100644 arch/arm/dts/rk3328-rock-pi-e-v3-u-boot.dtsi
|
|
|
+ create mode 100644 arch/arm/dts/rk3328-rock-pi-e-v3.dts
|
|
|
+ create mode 100644 configs/rock-pi-e-v3-rk3328_defconfig
|
|
|
+
|
|
|
+--- a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
|
|
|
++++ b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
|
|
|
+@@ -1,43 +1,4 @@
|
|
|
+ // SPDX-License-Identifier: GPL-2.0+
|
|
|
+-/*
|
|
|
+- * (C) Copyright 2020 Radxa
|
|
|
+- */
|
|
|
+
|
|
|
+-#include "rk3328-u-boot.dtsi"
|
|
|
++#include "rk3328-rock-pi-e-base-u-boot.dtsi"
|
|
|
+ #include "rk3328-sdram-ddr3-666.dtsi"
|
|
|
+-
|
|
|
+-/ {
|
|
|
+- smbios {
|
|
|
+- compatible = "u-boot,sysinfo-smbios";
|
|
|
+-
|
|
|
+- smbios {
|
|
|
+- system {
|
|
|
+- manufacturer = "radxa";
|
|
|
+- product = "rock-pi-e_rk3328";
|
|
|
+- };
|
|
|
+-
|
|
|
+- baseboard {
|
|
|
+- manufacturer = "radxa";
|
|
|
+- product = "rock-pi-e_rk3328";
|
|
|
+- };
|
|
|
+-
|
|
|
+- chassis {
|
|
|
+- manufacturer = "radxa";
|
|
|
+- product = "rock-pi-e_rk3328";
|
|
|
+- };
|
|
|
+- };
|
|
|
+- };
|
|
|
+-};
|
|
|
+-
|
|
|
+-&u2phy_host {
|
|
|
+- phy-supply = <&vcc_host_5v>;
|
|
|
+-};
|
|
|
+-
|
|
|
+-&vcc_host_5v {
|
|
|
+- /delete-property/ regulator-always-on;
|
|
|
+- /delete-property/ regulator-boot-on;
|
|
|
+-};
|
|
|
+-
|
|
|
+-&vcc_sd {
|
|
|
+- bootph-pre-ram;
|
|
|
+-};
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/arm/dts/rk3328-rock-pi-e-base-u-boot.dtsi
|
|
|
+@@ -0,0 +1,42 @@
|
|
|
++// SPDX-License-Identifier: GPL-2.0+
|
|
|
++/*
|
|
|
++ * (C) Copyright 2020 Radxa
|
|
|
++ */
|
|
|
++
|
|
|
++#include "rk3328-u-boot.dtsi"
|
|
|
++
|
|
|
++/ {
|
|
|
++ smbios {
|
|
|
++ compatible = "u-boot,sysinfo-smbios";
|
|
|
++
|
|
|
++ smbios {
|
|
|
++ system {
|
|
|
++ manufacturer = "radxa";
|
|
|
++ product = "rock-pi-e_rk3328";
|
|
|
++ };
|
|
|
++
|
|
|
++ baseboard {
|
|
|
++ manufacturer = "radxa";
|
|
|
++ product = "rock-pi-e_rk3328";
|
|
|
++ };
|
|
|
++
|
|
|
++ chassis {
|
|
|
++ manufacturer = "radxa";
|
|
|
++ product = "rock-pi-e_rk3328";
|
|
|
++ };
|
|
|
++ };
|
|
|
++ };
|
|
|
++};
|
|
|
++
|
|
|
++&u2phy_host {
|
|
|
++ phy-supply = <&vcc_host_5v>;
|
|
|
++};
|
|
|
++
|
|
|
++&vcc_host_5v {
|
|
|
++ /delete-property/ regulator-always-on;
|
|
|
++ /delete-property/ regulator-boot-on;
|
|
|
++};
|
|
|
++
|
|
|
++&vcc_sd {
|
|
|
++ bootph-pre-ram;
|
|
|
++};
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/arm/dts/rk3328-rock-pi-e-v3-u-boot.dtsi
|
|
|
+@@ -0,0 +1,4 @@
|
|
|
++// SPDX-License-Identifier: GPL-2.0+
|
|
|
++
|
|
|
++#include "rk3328-rock-pi-e-base-u-boot.dtsi"
|
|
|
++#include "rk3328-sdram-ddr4-666.dtsi"
|
|
|
+--- /dev/null
|
|
|
++++ b/arch/arm/dts/rk3328-rock-pi-e-v3.dts
|
|
|
+@@ -0,0 +1,4 @@
|
|
|
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
|
++
|
|
|
++/dts-v1/;
|
|
|
++#include "rk3328-rock-pi-e.dts"
|
|
|
+--- a/board/rockchip/evb_rk3328/MAINTAINERS
|
|
|
++++ b/board/rockchip/evb_rk3328/MAINTAINERS
|
|
|
+@@ -64,5 +64,5 @@ M: Banglang Huang <banglang.huang@f
|
|
|
+ R: Jonas Karlman <[email protected]>
|
|
|
+ S: Maintained
|
|
|
+ F: configs/rock-pi-e-rk3328_defconfig
|
|
|
+-F: arch/arm/dts/rk3328-rock-pi-e.dts
|
|
|
+-F: arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi
|
|
|
++F: configs/rock-pi-e-v3-rk3328_defconfig
|
|
|
++F: arch/arm/dts/rk3328-rock-pi-e*
|
|
|
+--- /dev/null
|
|
|
++++ b/configs/rock-pi-e-v3-rk3328_defconfig
|
|
|
+@@ -0,0 +1,97 @@
|
|
|
++CONFIG_ARM=y
|
|
|
++CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
|
++CONFIG_COUNTER_FREQUENCY=24000000
|
|
|
++CONFIG_ARCH_ROCKCHIP=y
|
|
|
++CONFIG_SPL_GPIO=y
|
|
|
++CONFIG_NR_DRAM_BANKS=1
|
|
|
++CONFIG_SF_DEFAULT_SPEED=20000000
|
|
|
++CONFIG_ENV_OFFSET=0x3F8000
|
|
|
++CONFIG_DEFAULT_DEVICE_TREE="rk3328-rock-pi-e-v3"
|
|
|
++CONFIG_DM_RESET=y
|
|
|
++CONFIG_ROCKCHIP_RK3328=y
|
|
|
++CONFIG_DEBUG_UART_BASE=0xFF130000
|
|
|
++CONFIG_DEBUG_UART_CLOCK=24000000
|
|
|
++CONFIG_SYS_LOAD_ADDR=0x800800
|
|
|
++CONFIG_DEBUG_UART=y
|
|
|
++CONFIG_FIT=y
|
|
|
++CONFIG_FIT_VERBOSE=y
|
|
|
++CONFIG_SPL_FIT_SIGNATURE=y
|
|
|
++CONFIG_SPL_LOAD_FIT=y
|
|
|
++CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
|
++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb"
|
|
|
++# CONFIG_DISPLAY_CPUINFO is not set
|
|
|
++CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
|
++CONFIG_SPL_MAX_SIZE=0x40000
|
|
|
++CONFIG_SPL_PAD_TO=0x7f8000
|
|
|
++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
|
++CONFIG_SPL_POWER=y
|
|
|
++CONFIG_SPL_ATF=y
|
|
|
++CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
|
|
|
++CONFIG_CMD_BOOTZ=y
|
|
|
++CONFIG_CMD_GPIO=y
|
|
|
++CONFIG_CMD_GPT=y
|
|
|
++CONFIG_CMD_MMC=y
|
|
|
++CONFIG_CMD_USB=y
|
|
|
++CONFIG_CMD_TIME=y
|
|
|
++CONFIG_CMD_REGULATOR=y
|
|
|
++CONFIG_SPL_OF_CONTROL=y
|
|
|
++CONFIG_TPL_OF_CONTROL=y
|
|
|
++# CONFIG_OF_UPSTREAM is not set
|
|
|
++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
|
++CONFIG_TPL_OF_PLATDATA=y
|
|
|
++CONFIG_ENV_IS_IN_MMC=y
|
|
|
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
|
++CONFIG_SYS_MMC_ENV_DEV=1
|
|
|
++CONFIG_TPL_DM=y
|
|
|
++CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
|
++CONFIG_REGMAP=y
|
|
|
++CONFIG_SPL_REGMAP=y
|
|
|
++CONFIG_TPL_REGMAP=y
|
|
|
++CONFIG_SYSCON=y
|
|
|
++CONFIG_SPL_SYSCON=y
|
|
|
++CONFIG_TPL_SYSCON=y
|
|
|
++CONFIG_CLK=y
|
|
|
++CONFIG_SPL_CLK=y
|
|
|
++CONFIG_ROCKCHIP_GPIO=y
|
|
|
++CONFIG_SYS_I2C_ROCKCHIP=y
|
|
|
++CONFIG_MMC_DW=y
|
|
|
++CONFIG_MMC_DW_ROCKCHIP=y
|
|
|
++CONFIG_PHY_REALTEK=y
|
|
|
++CONFIG_DM_MDIO=y
|
|
|
++CONFIG_DM_ETH_PHY=y
|
|
|
++CONFIG_PHY_GIGE=y
|
|
|
++CONFIG_ETH_DESIGNWARE=y
|
|
|
++CONFIG_GMAC_ROCKCHIP=y
|
|
|
++CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
|
++CONFIG_PINCTRL=y
|
|
|
++CONFIG_SPL_PINCTRL=y
|
|
|
++CONFIG_DM_PMIC=y
|
|
|
++CONFIG_PMIC_RK8XX=y
|
|
|
++CONFIG_SPL_DM_REGULATOR=y
|
|
|
++CONFIG_DM_REGULATOR_FIXED=y
|
|
|
++CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
|
++CONFIG_REGULATOR_RK8XX=y
|
|
|
++CONFIG_PWM_ROCKCHIP=y
|
|
|
++CONFIG_RAM=y
|
|
|
++CONFIG_SPL_RAM=y
|
|
|
++CONFIG_TPL_RAM=y
|
|
|
++CONFIG_DM_RNG=y
|
|
|
++CONFIG_RNG_ROCKCHIP=y
|
|
|
++CONFIG_BAUDRATE=1500000
|
|
|
++CONFIG_DEBUG_UART_SHIFT=2
|
|
|
++CONFIG_SYS_NS16550_MEM32=y
|
|
|
++CONFIG_SYSINFO=y
|
|
|
++CONFIG_SYSINFO_SMBIOS=y
|
|
|
++CONFIG_SYSRESET=y
|
|
|
++# CONFIG_TPL_SYSRESET is not set
|
|
|
++CONFIG_USB=y
|
|
|
++CONFIG_USB_XHCI_HCD=y
|
|
|
++CONFIG_USB_EHCI_HCD=y
|
|
|
++CONFIG_USB_EHCI_GENERIC=y
|
|
|
++CONFIG_USB_OHCI_HCD=y
|
|
|
++CONFIG_USB_OHCI_GENERIC=y
|
|
|
++CONFIG_USB_DWC3=y
|
|
|
++CONFIG_USB_DWC3_GENERIC=y
|
|
|
++CONFIG_SPL_TINY_MEMSET=y
|
|
|
++CONFIG_TPL_TINY_MEMSET=y
|
|
|
++CONFIG_ERRNO_STR=y
|