Skip to content

Commit 413a42c

Browse files
authored
orangepi5pro: dts: Fix incorrect GRF node name (Update U-Boot to v2025.07 for eMMC support) (#8441)
* feat(board/orangepi5pro): Update U-Boot to v2025.07 for eMMC support Updated the U-Boot patch from v2024.04 to v2025.07, this change finally enables booting from eMMC on the Orange Pi 5 Pro. The device tree source for the board has also been refactored to support the new U-Boot version and clean up peripheral definitions. * orangepi5pro: dts: Fix incorrect GRF node name The GRF node was misspelled as 'sysgrf' instead of the correct 'sys_grf'. This commit corrects the phandle to the proper value.
1 parent 8141ce3 commit 413a42c

File tree

4 files changed

+638
-847
lines changed

4 files changed

+638
-847
lines changed

config/boards/orangepi5pro.csc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ function post_family_config_branch_edge__orangepi5pro_use_mainline_uboot() {
5454
declare -g BOOTCONFIG="orangepi-5-pro-rk3588s_defconfig"
5555
declare -g BOOTDELAY=1
5656
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
57-
declare -g BOOTBRANCH="tag:v2024.04"
58-
declare -g BOOTPATCHDIR="v2024.04"
57+
declare -g BOOTBRANCH="tag:v2025.07"
58+
declare -g BOOTPATCHDIR="v2025.07"
5959
declare -g BOOTDIR="u-boot-${BOARD}"
6060
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
6161
declare -g INSTALL_HEADERS="yes"

patch/kernel/archive/rockchip64-6.16/dt/rk3588s-orangepi-5-pro.dts

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,26 @@
88
model = "Xunlong Orange Pi 5 Pro";
99
compatible = "xunlong,orangepi-5-pro", "rockchip,rk3588s";
1010

11+
/delete-node/ chosen;
12+
chosen {
13+
stdout-path = "serial2:1500000n8";
14+
entropy-source = <&rng>;
15+
};
16+
17+
aliases {
18+
mmc0 = &sdhci;
19+
mmc1 = &sdmmc;
20+
};
21+
22+
/delete-node/ rng;
23+
rng: rng@fe378000 {
24+
compatible = "rockchip,rk3588-rng";
25+
reg = <0x0 0xfe378000 0x0 0x200>;
26+
interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH 0>;
27+
clocks = <&scmi_clk SCMI_HCLK_SECURE_NS>;
28+
resets = <&scmi_reset 48>;
29+
};
30+
1131
vcc3v3_pcie_eth: vcc3v3-pcie-eth {
1232
compatible = "regulator-fixed";
1333
regulator-name = "vcc3v3_pcie_eth";
@@ -34,12 +54,10 @@
3454
regulator-always-on;
3555
};
3656

57+
/delete-node/ vcc_3v3_sd_s0;
58+
3759
sdio_pwrseq: sdio-pwrseq {
3860
compatible = "mmc-pwrseq-simple";
39-
clocks = <&hym8563>;
40-
clock-names = "ext_clock";
41-
pinctrl-names = "default";
42-
pinctrl-0 = <&wifi_enable_h>;
4361
post-power-on-delay-ms = <200>;
4462
reset-gpios = <&gpio0 RK_PD0 GPIO_ACTIVE_LOW>;
4563
};
@@ -95,6 +113,7 @@
95113
};
96114

97115
/delete-node/ regulator-vcc-3v3-sd-s0;
116+
/delete-node/ vbus_typec;
98117
/delete-node/ analog-sound;
99118

100119
headphone_amp: headphones-audio-amplifier {
@@ -206,10 +225,6 @@
206225
status = "okay";
207226
};
208227

209-
&sfc {
210-
status = "okay";
211-
};
212-
213228
&gmac1 {
214229
status = "disabled";
215230
};
@@ -223,6 +238,7 @@
223238
cap-sd-highspeed;
224239
cap-sdio-irq;
225240
keep-power-in-suspend;
241+
vmmc-supply = <&vcc_3v3_s3>;
226242
mmc-pwrseq = <&sdio_pwrseq>;
227243
non-removable;
228244
pinctrl-names = "default";
@@ -243,6 +259,12 @@
243259

244260
&sdhci {
245261
status = "okay";
262+
vmmc-supply = <&vcc_3v3_s3>;
263+
};
264+
265+
&sdmmc {
266+
status = "okay";
267+
vmmc-supply = <&vcc_3v3_s3>;
246268
};
247269

248270
&uart9 {
@@ -261,7 +283,7 @@
261283
shutdown-gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
262284
max-speed = <1500000>;
263285
pinctrl-names = "default";
264-
pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
286+
pinctrl-0 = <&bt_wake_host &host_wake_bt>;
265287
vbat-supply = <&vcc_3v3_s3>;
266288
vddio-supply = <&vcc_1v8_s3>;
267289
};
@@ -272,6 +294,8 @@
272294
};
273295

274296
&pwm2 {
297+
pinctrl-0 = <&pwm2m1_pins>;
298+
pinctrl-names = "default";
275299
status = "okay";
276300
};
277301

@@ -287,11 +311,6 @@
287311
status = "okay";
288312
};
289313

290-
&sdmmc {
291-
/delete-property/ vmmc-supply;
292-
/delete-property/ vqmmc-supply;
293-
};
294-
295314
// Bluetooth i2S
296315
&i2s0_8ch {
297316
status = "okay";
@@ -335,6 +354,7 @@
335354

336355
&i2c6 {
337356
/delete-node/ es8388;
357+
/delete-node/ usbc0;
338358
};
339359

340360
&hdmi0_sound {
@@ -384,19 +404,15 @@
384404
snps,parkmode-disable-ss-quirk;
385405
};
386406

387-
&hym8563 {
388-
status = "okay";
389-
};
390-
391-
&hym8563_int {
392-
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
393-
};
394-
395407
/* The DP0 controller lacks driver support.
396408
&vp1 {
397409
vp1_out_dp0: endpoint@ROCKCHIP_VOP2_EP_DP0 {
398410
reg = <ROCKCHIP_VOP2_EP_DP0>;
399411
remote-endpoint = <&dp0_in_vp1>;
400412
};
401413
};
402-
*/
414+
*/
415+
416+
&tsadc {
417+
rockchip,grf = <&sys_grf>;
418+
};

0 commit comments

Comments
 (0)