Revert "feat(board/orangepi5pro): Update U-Boot to v2025.07 for eMMC support …"

This reverts commit 53189d4.

Author: EvilOlaf

config/boards/orangepi5pro.csc

@@ -54,8 +54,8 @@ function post_family_config_branch_edge__orangepi5pro_use_mainline_uboot() {
 	declare -g BOOTCONFIG="orangepi-5-pro-rk3588s_defconfig"
 	declare -g BOOTDELAY=1
 	declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
-	declare -g BOOTBRANCH="tag:v2025.07"
-	declare -g BOOTPATCHDIR="v2025.07"
+	declare -g BOOTBRANCH="tag:v2024.04"
+	declare -g BOOTPATCHDIR="v2024.04"
 	declare -g BOOTDIR="u-boot-${BOARD}"
 	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"
 	declare -g INSTALL_HEADERS="yes"

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

@@ -8,26 +8,6 @@
 	model = "Xunlong Orange Pi 5 Pro";
 	compatible = "xunlong,orangepi-5-pro", "rockchip,rk3588s";
 
-	/delete-node/ chosen;
-	chosen {
-        stdout-path = "serial2:1500000n8";
-        entropy-source = <&rng>;
-    };
-
-	aliases {
-		mmc0 = &sdhci;
-		mmc1 = &sdmmc;
-	};
-	
-	/delete-node/ rng;
-	rng: rng@fe378000 {
-		compatible = "rockchip,rk3588-rng";
-		reg = <0x0 0xfe378000 0x0 0x200>;
-		interrupts = <GIC_SPI 400 IRQ_TYPE_LEVEL_HIGH 0>;
-		clocks = <&scmi_clk SCMI_HCLK_SECURE_NS>;
-		resets = <&scmi_reset 48>;
-	};
-
 	vcc3v3_pcie_eth: vcc3v3-pcie-eth {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3_pcie_eth";
@@ -54,10 +34,12 @@
 		regulator-always-on;
 	};
 
-	/delete-node/ vcc_3v3_sd_s0;
-
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
+		clocks = <&hym8563>;
+		clock-names = "ext_clock";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wifi_enable_h>;
 		post-power-on-delay-ms = <200>;
 		reset-gpios = <&gpio0 RK_PD0 GPIO_ACTIVE_LOW>;
 	};
@@ -113,7 +95,6 @@
 	};
 
 	/delete-node/ regulator-vcc-3v3-sd-s0;
-	/delete-node/ vbus_typec;
 	/delete-node/ analog-sound;
 
 	headphone_amp: headphones-audio-amplifier {
@@ -225,6 +206,10 @@
 	status = "okay";
 };
 
+&sfc {
+	status = "okay";
+};
+
 &gmac1 {
 	status = "disabled";
 };
@@ -238,7 +223,6 @@
 	cap-sd-highspeed;
 	cap-sdio-irq;
 	keep-power-in-suspend;
-	vmmc-supply = <&vcc_3v3_s3>;
 	mmc-pwrseq = <&sdio_pwrseq>;
 	non-removable;
 	pinctrl-names = "default";
@@ -259,12 +243,6 @@
 
 &sdhci {
 	status = "okay";
-	vmmc-supply = <&vcc_3v3_s3>;
-};
-
-&sdmmc {
-	status = "okay";
-	vmmc-supply = <&vcc_3v3_s3>;
 };
 
 &uart9 {
@@ -283,7 +261,7 @@
 		shutdown-gpios = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
 		max-speed = <1500000>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&bt_wake_host &host_wake_bt>;
+		pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
 		vbat-supply = <&vcc_3v3_s3>;
 		vddio-supply = <&vcc_1v8_s3>;
 	};
@@ -294,8 +272,6 @@
 };
 
 &pwm2 {
-	pinctrl-0 = <&pwm2m1_pins>;
-	pinctrl-names = "default";
 	status = "okay";
 };
 
@@ -311,6 +287,11 @@
 	status = "okay";
 };
 
+&sdmmc {
+	/delete-property/ vmmc-supply;
+	/delete-property/ vqmmc-supply;
+};
+
 // Bluetooth i2S
 &i2s0_8ch {
 	status = "okay";
@@ -354,7 +335,6 @@
 
 &i2c6 {
 	/delete-node/ es8388;
-	/delete-node/ usbc0;
 };
 
 &hdmi0_sound {
@@ -404,15 +384,19 @@
 	snps,parkmode-disable-ss-quirk;
 };
 
+&hym8563 {
+	status = "okay";
+};
+
+&hym8563_int {
+	rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>;
+};
+
 /* The DP0 controller lacks driver support. 
 &vp1 {
 	vp1_out_dp0: endpoint@ROCKCHIP_VOP2_EP_DP0 {
 		reg = <ROCKCHIP_VOP2_EP_DP0>;
 		remote-endpoint = <&dp0_in_vp1>;
 	};
 };
-*/
-
-&tsadc {
-	rockchip,grf = <&sys_grf>;
-};
+*/