mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-03-11 14:18:19 +01:00
Added USB boot support and eMMC r/w fixes for RK3528. Refreshed upstreamed patches while at it. Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org> Link: https://github.com/openwrt/openwrt/pull/20375 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
299 lines
7.6 KiB
Diff
299 lines
7.6 KiB
Diff
From 06cc02fe00d5a6d9ef51aa8852b891c0a5e3cf3e Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sun, 19 Oct 2025 15:47:19 +0000
|
|
Subject: [PATCH] board: rockchip: Add Radxa ROCK 4D
|
|
|
|
The Radxa ROCK 4D is a compact single-board computer (SBC) featuring
|
|
numerous top-tier functions, features, and expansion options.
|
|
|
|
Equipped with the Rockchip RK3576 or RK3576J SoC, the ROCK 4D boasts an
|
|
octa-core CPU (4x Cortex-A72 + 4x Cortex-A53), Mali-G52 GPU, and a
|
|
powerful 6 TOPS NPU, making it ideal for AI and multimedia tasks.
|
|
|
|
Features tested on a Radxa ROCK 4D v1.112:
|
|
- SPI Flash boot
|
|
- Ethernet
|
|
- PCIe/NVMe
|
|
- USB host
|
|
|
|
ROCK 4D boards with SPI Flash is configured to boot from FSPI0->UFS->USB,
|
|
or directly from USB when the MASKROM button is pressed, booting
|
|
directly from SD-card is not possible on these boards.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
|
---
|
|
arch/arm/dts/rk3576-rock-4d-u-boot.dtsi | 10 ++++
|
|
arch/arm/mach-rockchip/rk3576/MAINTAINERS | 6 ++
|
|
configs/rock-4d-rk3576_defconfig | 68 +++++++++++++++++++++++
|
|
doc/board/rockchip/rockchip.rst | 1 +
|
|
4 files changed, 85 insertions(+)
|
|
create mode 100644 arch/arm/dts/rk3576-rock-4d-u-boot.dtsi
|
|
create mode 100644 configs/rock-4d-rk3576_defconfig
|
|
|
|
--- a/dts/upstream/src/arm64/rockchip/rk3576-rock-4d.dts
|
|
+++ b/dts/upstream/src/arm64/rockchip/rk3576-rock-4d.dts
|
|
@@ -57,13 +57,13 @@
|
|
};
|
|
};
|
|
|
|
- vcc_12v0_dcin: regulator-vcc-12v0-dcin {
|
|
+ vcc_5v0_dcin: regulator-vcc-5v0-dcin {
|
|
compatible = "regulator-fixed";
|
|
regulator-always-on;
|
|
regulator-boot-on;
|
|
- regulator-min-microvolt = <12000000>;
|
|
- regulator-max-microvolt = <12000000>;
|
|
- regulator-name = "vcc_12v0_dcin";
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
+ regulator-name = "vcc_5v0_dcin";
|
|
};
|
|
|
|
vcc_1v1_nldo_s3: regulator-vcc-1v1-nldo-s3 {
|
|
@@ -166,7 +166,7 @@
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-name = "vcc_5v0_device";
|
|
- vin-supply = <&vcc_12v0_dcin>;
|
|
+ vin-supply = <&vcc_5v0_sys>;
|
|
};
|
|
|
|
vcc_5v0_host: regulator-vcc-5v0-host {
|
|
@@ -180,7 +180,21 @@
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-name = "vcc5v0_host";
|
|
- vin-supply = <&vcc_5v0_device>;
|
|
+ vin-supply = <&vcc_5v0_sys>;
|
|
+ };
|
|
+
|
|
+ vcc_5v0_otg: regulator-vcc-5v0-otg {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpios = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&usb_otg_pwren>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
+ regulator-name = "vcc5v0_otg";
|
|
+ vin-supply = <&vcc_5v0_sys>;
|
|
};
|
|
|
|
vcc_5v0_sys: regulator-vcc-5v0-sys {
|
|
@@ -190,10 +204,14 @@
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
regulator-name = "vcc_5v0_sys";
|
|
- vin-supply = <&vcc_12v0_dcin>;
|
|
+ vin-supply = <&vcc_5v0_dcin>;
|
|
};
|
|
};
|
|
|
|
+&combphy0_ps {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&combphy1_psu {
|
|
status = "okay";
|
|
};
|
|
@@ -641,17 +659,27 @@
|
|
|
|
&mdio0 {
|
|
rgmii_phy0: ethernet-phy@1 {
|
|
- compatible = "ethernet-phy-ieee802.3-c22";
|
|
+ compatible = "ethernet-phy-id001c.c916";
|
|
reg = <0x1>;
|
|
clocks = <&cru REFCLKO25M_GMAC0_OUT>;
|
|
+ assigned-clocks = <&cru REFCLKO25M_GMAC0_OUT>;
|
|
+ assigned-clock-rates = <25000000>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&rtl8211f_rst>;
|
|
reset-assert-us = <20000>;
|
|
reset-deassert-us = <100000>;
|
|
- reset-gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
|
|
+ reset-gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
|
|
};
|
|
};
|
|
|
|
+&pcie0 {
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pcie_reset>;
|
|
+ reset-gpios = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>;
|
|
+ vpcie3v3-supply = <&vcc_3v3_pcie>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&pinctrl {
|
|
hym8563 {
|
|
hym8563_int: hym8563-int {
|
|
@@ -678,11 +706,18 @@
|
|
pcie_pwren: pcie-pwren {
|
|
rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
};
|
|
+ pcie_reset: pcie-reset {
|
|
+ rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
+ };
|
|
};
|
|
|
|
usb {
|
|
usb_host_pwren: usb-host-pwren {
|
|
- rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
+ rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_down>;
|
|
+ };
|
|
+ usb_otg_pwren: usb-otg-pwren {
|
|
+ rockchip,pins = <2 RK_PD2 RK_FUNC_GPIO &pcfg_pull_down>;
|
|
+
|
|
};
|
|
};
|
|
};
|
|
@@ -721,15 +756,38 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&u2phy0_otg {
|
|
+ phy-supply = <&vcc_5v0_otg>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&u2phy1 {
|
|
status = "okay";
|
|
};
|
|
|
|
+&u2phy1_otg {
|
|
+ phy-supply = <&vcc_5v0_host>;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&uart0 {
|
|
pinctrl-0 = <&uart0m0_xfer>;
|
|
status = "okay";
|
|
};
|
|
|
|
+&ufshc {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&usbdp_phy {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&usb_drd0_dwc3 {
|
|
+ dr_mode = "host";
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&usb_drd1_dwc3 {
|
|
dr_mode = "host";
|
|
status = "okay";
|
|
--- /dev/null
|
|
+++ b/arch/arm/dts/rk3576-rock-4d-u-boot.dtsi
|
|
@@ -0,0 +1,10 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+
|
|
+#include "rk3576-u-boot.dtsi"
|
|
+
|
|
+&sfc0 {
|
|
+ flash@0 {
|
|
+ bootph-pre-ram;
|
|
+ bootph-some-ram;
|
|
+ };
|
|
+};
|
|
--- a/arch/arm/mach-rockchip/rk3576/MAINTAINERS
|
|
+++ b/arch/arm/mach-rockchip/rk3576/MAINTAINERS
|
|
@@ -4,6 +4,12 @@ S: Maintained
|
|
F: arch/arm/dts/rk3576-generic*
|
|
F: configs/generic-rk3576_defconfig
|
|
|
|
+ROCK-4D-RK3576
|
|
+M: Jonas Karlman <jonas@kwiboo.se>
|
|
+S: Maintained
|
|
+F: arch/arm/dts/rk3576-rock-4d*
|
|
+F: configs/rock-4d-rk3576_defconfig
|
|
+
|
|
SIGE5-RK3576
|
|
M: Jonas Karlman <jonas@kwiboo.se>
|
|
S: Maintained
|
|
--- /dev/null
|
|
+++ b/configs/rock-4d-rk3576_defconfig
|
|
@@ -0,0 +1,68 @@
|
|
+CONFIG_ARM=y
|
|
+CONFIG_SKIP_LOWLEVEL_INIT=y
|
|
+CONFIG_COUNTER_FREQUENCY=24000000
|
|
+CONFIG_ARCH_ROCKCHIP=y
|
|
+CONFIG_SF_DEFAULT_SPEED=50000000
|
|
+CONFIG_SF_DEFAULT_MODE=0x2000
|
|
+CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3576-rock-4d"
|
|
+CONFIG_ROCKCHIP_RK3576=y
|
|
+CONFIG_ROCKCHIP_SPI_IMAGE=y
|
|
+CONFIG_SYS_LOAD_ADDR=0x40c00800
|
|
+CONFIG_SF_DEFAULT_BUS=5
|
|
+CONFIG_DEBUG_UART_BASE=0x2AD40000
|
|
+CONFIG_DEBUG_UART_CLOCK=24000000
|
|
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
+CONFIG_SPL_SPI=y
|
|
+CONFIG_PCI=y
|
|
+CONFIG_DEBUG_UART=y
|
|
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3576-rock-4d.dtb"
|
|
+# CONFIG_DISPLAY_CPUINFO is not set
|
|
+CONFIG_SPL_MAX_SIZE=0x40000
|
|
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
+CONFIG_SPL_SPI_LOAD=y
|
|
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
|
|
+CONFIG_CMD_MEMINFO=y
|
|
+CONFIG_CMD_MEMINFO_MAP=y
|
|
+CONFIG_CMD_ADC=y
|
|
+CONFIG_CMD_GPIO=y
|
|
+CONFIG_CMD_GPT=y
|
|
+CONFIG_CMD_I2C=y
|
|
+CONFIG_CMD_MISC=y
|
|
+CONFIG_CMD_MMC=y
|
|
+CONFIG_CMD_PCI=y
|
|
+CONFIG_CMD_USB=y
|
|
+# CONFIG_CMD_SETEXPR is not set
|
|
+CONFIG_CMD_RNG=y
|
|
+CONFIG_CMD_REGULATOR=y
|
|
+# CONFIG_SPL_DOS_PARTITION is not set
|
|
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
|
|
+CONFIG_ROCKCHIP_GPIO=y
|
|
+CONFIG_SYS_I2C_ROCKCHIP=y
|
|
+CONFIG_LED=y
|
|
+CONFIG_LED_GPIO=y
|
|
+CONFIG_SUPPORT_EMMC_RPMB=y
|
|
+CONFIG_MMC_DW=y
|
|
+CONFIG_MMC_DW_ROCKCHIP=y
|
|
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
|
|
+CONFIG_SPI_FLASH_MACRONIX=y
|
|
+CONFIG_PHY_REALTEK=y
|
|
+CONFIG_DWC_ETH_QOS=y
|
|
+CONFIG_DWC_ETH_QOS_ROCKCHIP=y
|
|
+CONFIG_NVME_PCI=y
|
|
+CONFIG_PCIE_DW_ROCKCHIP=y
|
|
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y
|
|
+CONFIG_PHY_ROCKCHIP_USBDP=y
|
|
+CONFIG_DM_PMIC=y
|
|
+CONFIG_PMIC_RK8XX=y
|
|
+CONFIG_REGULATOR_RK8XX=y
|
|
+CONFIG_BAUDRATE=1500000
|
|
+CONFIG_DEBUG_UART_SHIFT=2
|
|
+CONFIG_SYS_NS16550_MEM32=y
|
|
+CONFIG_ROCKCHIP_SFC=y
|
|
+CONFIG_SYSRESET_PSCI=y
|
|
+CONFIG_USB=y
|
|
+CONFIG_USB_XHCI_HCD=y
|
|
+CONFIG_USB_DWC3=y
|
|
+CONFIG_USB_DWC3_GENERIC=y
|
|
+CONFIG_ERRNO_STR=y
|
|
--- a/doc/board/rockchip/rockchip.rst
|
|
+++ b/doc/board/rockchip/rockchip.rst
|
|
@@ -137,6 +137,7 @@ List of mainline supported Rockchip boar
|
|
- ArmSoM Sige5 (sige5-rk3576)
|
|
- Firefly ROC-RK3576-PC (roc-pc-rk3576)
|
|
- Generic RK3576 (generic-rk3576)
|
|
+ - Radxa ROCK 4D (rock-4d-rk3576)
|
|
|
|
* rk3588
|
|
- ArmSoM Sige7 (sige7-rk3588)
|