Skip to content

Commit 449336a

Browse files
EvilOlafigorpecovnik
authored andcommitted
Revert "feat(board/orangepi5pro): Update U-Boot to v2025.07 for eMMC support …"
This reverts commit 53189d4.
1 parent d512a18 commit 449336a

File tree

4 files changed

+847
-609
lines changed

4 files changed

+847
-609
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:v2025.07"
58-
declare -g BOOTPATCHDIR="v2025.07"
57+
declare -g BOOTBRANCH="tag:v2024.04"
58+
declare -g BOOTPATCHDIR="v2024.04"
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: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,6 @@
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-
3111
vcc3v3_pcie_eth: vcc3v3-pcie-eth {
3212
compatible = "regulator-fixed";
3313
regulator-name = "vcc3v3_pcie_eth";
@@ -54,10 +34,12 @@
5434
regulator-always-on;
5535
};
5636

57-
/delete-node/ vcc_3v3_sd_s0;
58-
5937
sdio_pwrseq: sdio-pwrseq {
6038
compatible = "mmc-pwrseq-simple";
39+
clocks = <&hym8563>;
40+
clock-names = "ext_clock";
41+
pinctrl-names = "default";
42+
pinctrl-0 = <&wifi_enable_h>;
6143
post-power-on-delay-ms = <200>;
6244
reset-gpios = <&gpio0 RK_PD0 GPIO_ACTIVE_LOW>;
6345
};
@@ -113,7 +95,6 @@
11395
};
11496

11597
/delete-node/ regulator-vcc-3v3-sd-s0;
116-
/delete-node/ vbus_typec;
11798
/delete-node/ analog-sound;
11899

119100
headphone_amp: headphones-audio-amplifier {
@@ -225,6 +206,10 @@
225206
status = "okay";
226207
};
227208

209+
&sfc {
210+
status = "okay";
211+
};
212+
228213
&gmac1 {
229214
status = "disabled";
230215
};
@@ -238,7 +223,6 @@
238223
cap-sd-highspeed;
239224
cap-sdio-irq;
240225
keep-power-in-suspend;
241-
vmmc-supply = <&vcc_3v3_s3>;
242226
mmc-pwrseq = <&sdio_pwrseq>;
243227
non-removable;
244228
pinctrl-names = "default";
@@ -259,12 +243,6 @@
259243

260244
&sdhci {
261245
status = "okay";
262-
vmmc-supply = <&vcc_3v3_s3>;
263-
};
264-
265-
&sdmmc {
266-
status = "okay";
267-
vmmc-supply = <&vcc_3v3_s3>;
268246
};
269247

270248
&uart9 {
@@ -283,7 +261,7 @@
283261
shutdown-gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
284262
max-speed = <1500000>;
285263
pinctrl-names = "default";
286-
pinctrl-0 = <&bt_wake_host &host_wake_bt>;
264+
pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
287265
vbat-supply = <&vcc_3v3_s3>;
288266
vddio-supply = <&vcc_1v8_s3>;
289267
};
@@ -294,8 +272,6 @@
294272
};
295273

296274
&pwm2 {
297-
pinctrl-0 = <&pwm2m1_pins>;
298-
pinctrl-names = "default";
299275
status = "okay";
300276
};
301277

@@ -311,6 +287,11 @@
311287
status = "okay";
312288
};
313289

290+
&sdmmc {
291+
/delete-property/ vmmc-supply;
292+
/delete-property/ vqmmc-supply;
293+
};
294+
314295
// Bluetooth i2S
315296
&i2s0_8ch {
316297
status = "okay";
@@ -354,7 +335,6 @@
354335

355336
&i2c6 {
356337
/delete-node/ es8388;
357-
/delete-node/ usbc0;
358338
};
359339

360340
&hdmi0_sound {
@@ -404,15 +384,19 @@
404384
snps,parkmode-disable-ss-quirk;
405385
};
406386

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

0 commit comments

Comments
 (0)