Adjust and add upstream patches

- reenable 8723ds on K5.13 and remove deprecated wifi patches
- adjust rockchip audio and vdec patches in 5.13.y as in 5.10.y

lib/compilation-prepare.sh

@@ -549,7 +549,7 @@ compilation_prepare()
 
 	# Wireless drivers for Realtek 8723DS chipsets
 
-	if linux-version compare "${version}" ge 5.0 && linux-version compare "${version}" lt 5.12 && [ "$EXTRAWIFI" == yes ]; then
+	if linux-version compare "${version}" ge 5.0 && linux-version compare "${version}" lt 5.14 && [ "$EXTRAWIFI" == yes ]; then
 
 		# attach to specifics tag or branch
 		local rtl8723dsver="branch:master"
@@ -581,12 +581,6 @@ compilation_prepare()
 		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8723ds\/Kconfig"' \
 		"$kerneldir/drivers/net/wireless/Kconfig"
 
-                # add support for K5.11+
-                process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds.patch" "applying"
-
-		# add support for K5.12+
-		process_patch_file "${SRC}/patch/misc/wireless-realtek-8723ds.patch" "applying"
-
 	fi
 
 

patch/kernel/archive/rockchip64-5.13/rk3328-audio-and-renegade-supplies.patch

@@ -32,8 +32,8 @@ index f4b6799a8..a1041ec3e 100644
 +	vccio_sd: sdmmcio-regulator {
  		compatible = "regulator-gpio";
  		gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
- 		states = <1800000 0x1
- 			  3300000 0x0>;
+ 		states = <1800000 0x1>,
+ 			 <3300000 0x0>;
 -		regulator-name = "vcc_sdio";
 +		regulator-name = "vccio_sd";
  		regulator-type = "voltage";
@@ -229,11 +229,11 @@ index eedc25132..5c62f0116 100644
  			#address-cells = <1>;
  			#size-cells = <0>;
  
-+			pd_gpu@RK3328_PD_GPU {
++			power-domain@RK3328_PD_GPU {
 +				reg = <RK3328_PD_GPU>;
 +				clocks = <&cru ACLK_GPU>;
 +			};		
- 			pd_hevc@RK3328_PD_HEVC {
+ 			power-domain@RK3328_PD_HEVC {
  				reg = <RK3328_PD_HEVC>;
  			};
 @@ -621,6 +645,7 @@

patch/kernel/archive/rockchip64-5.13/rk3328-dtsi-mmc-vdec-usb3-tweaks.patch

@@ -1,22 +1,22 @@
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 @@ -346,12 +346,16 @@
- 			pd_gpu@RK3328_PD_GPU {
+ 			power-domain@RK3328_PD_HEVC {
  				reg = <RK3328_PD_GPU>;
  				clocks = <&cru ACLK_GPU>;
 -			};		
 +			};
- 			pd_hevc@RK3328_PD_HEVC {
+ 			power-domain@RK3328_PD_HEVC {
  				reg = <RK3328_PD_HEVC>;
  			};
- 			pd_video@RK3328_PD_VIDEO {
+ 			power-domain@RK3328_PD_VIDEO {
  				reg = <RK3328_PD_VIDEO>;
 +				clocks = <&cru ACLK_RKVDEC>,
 +					 <&cru HCLK_RKVDEC>,
 +					 <&cru SCLK_VDEC_CABAC>,
 +					 <&cru SCLK_VDEC_CORE>;
  			};
- 			pd_vpu@RK3328_PD_VPU {
+ 			power-domain@RK3328_PD_VPU {
  				reg = <RK3328_PD_VPU>;
 @@ -705,6 +709,7 @@
  		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;

patch/kernel/archive/sunxi-5.10/0001-Fix-broken-ethernet-on-Orangepi-2.patch

@@ -1,26 +0,0 @@
-From c0d922d25d5efb64dc28817cefda7a6945e74e2c Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igor.pecovnik@gmail.com>
-Date: Tue, 5 Jan 2021 22:53:31 +0100
-Subject: [PATCH] Fix broken ethernet on Orangepi 2
-
-Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
----
- arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
-index 97f497854..d05fa679d 100644
---- a/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
-+++ b/arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts
-@@ -85,7 +85,7 @@ &emac {
- 	pinctrl-0 = <&emac_rgmii_pins>;
- 	phy-supply = <&reg_gmac_3v3>;
- 	phy-handle = <&ext_rgmii_phy>;
--	phy-mode = "rgmii";
-+	phy-mode = "rgmii-id";
- 
- 	status = "okay";
- };
--- 
-Created with Armbian build tools https://github.com/armbian/build
-

patch/kernel/archive/sunxi-5.10/board-pine64so-rgmii-txid.patch

@@ -1,39 +0,0 @@
-From 0745b77825cdc10eb5381f75056d1a37fbb533ba Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Wed, 9 Jun 2021 12:45:25 +0800
-Subject: [PATCH 4/4] arm64: dts: allwinner: a64-sopine-baseboard: change RGMII
- mode to TXID
-
-Although the schematics of Pine A64-LTS and SoPine Baseboard shows both
-the RX and TX internal delay are enabled, they're using the same broken
-RTL8211E chip batch with Pine A64+, so they should use TXID instead, not
-ID.
-
-In addition, by checking the real components soldered on both a SoPine
-Baseboard and a Pine A64-LTS, RX delay is not enabled (GR69 soldered and
-GR70 NC) despite the schematics says it's enabled.
-
-So the RGMII delay mode should be TXID on these boards.
-
-Fixes: c2b111e59a7b ("arm64: dts: allwinner: A64 Sopine: phy-mode rgmii-id")
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
----
- arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
-index d4069749d721..068cbd955bfc 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
-@@ -79,7 +79,7 @@ &ehci1 {
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
--	phy-mode = "rgmii-id";
-+	phy-mode = "rgmii-txid";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
--- 
-2.30.2
-

patch/misc/wireless-realtek-8723ds.patch

@@ -1,30 +0,0 @@
-From f55e97f0269c540e8da7a3614be0b757ca2a4d1b Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igor.pecovnik@gmail.com>
-Date: Sun, 16 May 2021 16:48:49 +0200
-Subject: [PATCH] 8723ds
-
-Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
----
- drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c b/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
-index 2902fab05..b9e4e5b58 100644
---- a/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
-+++ b/drivers/net/wireless/rtl8723ds/os_dep/linux/recv_linux.c
-@@ -359,8 +359,12 @@ static int napi_recv(_adapter *padapter, int budget)
- 
- #ifdef CONFIG_RTW_GRO
- 		if (pregistrypriv->en_gro) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
- 			if (rtw_napi_gro_receive(&padapter->napi, pskb) != GRO_DROP)
- 				rx_ok = _TRUE;
-+#else
-+			rx_ok = _TRUE;
-+#endif
- 			goto next;
- 		}
- #endif /* CONFIG_RTW_GRO */
--- 
-Created with Armbian build tools https://github.com/armbian/build
-

patch/misc/wireless-rtl8723ds.patch

@@ -1,97 +0,0 @@
-From b429e25ce03bc7e2853b593f5d6be92d95d3c39b Mon Sep 17 00:00:00 2001
-From: Igor Pecovnik <igor.pecovnik@gmail.com>
-Date: Mon, 15 Feb 2021 21:37:27 +0100
-Subject: [PATCH] oeww
-
-Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
----
- .../wireless/rtl8723ds/os_dep/osdep_service.c  | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/drivers/net/wireless/rtl8723ds/os_dep/osdep_service.c b/drivers/net/wireless/rtl8723ds/os_dep/osdep_service.c
-index d98de2f79..3d6c53df2 100644
---- a/drivers/net/wireless/rtl8723ds/os_dep/osdep_service.c
-+++ b/drivers/net/wireless/rtl8723ds/os_dep/osdep_service.c
-@@ -1282,15 +1282,19 @@ static int isFileReadable(const char *path, u32 *sz)
- {
- 	struct file *fp;
- 	int ret = 0;
-+#ifdef set_fs
- 	mm_segment_t oldfs;
-+#endif
- 	char buf;
- 
- 	fp = filp_open(path, O_RDONLY, 0);
- 	if (IS_ERR(fp))
- 		ret = PTR_ERR(fp);
- 	else {
-+#ifdef set_fs
- 		oldfs = get_fs();
- 		set_fs(KERNEL_DS);
-+#endif
- 
- 		if (1 != readFile(fp, &buf, 1))
- 			ret = PTR_ERR(fp);
-@@ -1303,7 +1307,9 @@ static int isFileReadable(const char *path, u32 *sz)
- 			#endif
- 		}
- 
-+#ifdef set_fs
- 		set_fs(oldfs);
-+#endif
- 		filp_close(fp, NULL);
- 	}
- 	return ret;
-@@ -1319,7 +1325,9 @@ static int isFileReadable(const char *path, u32 *sz)
- static int retriveFromFile(const char *path, u8 *buf, u32 sz)
- {
- 	int ret = -1;
-+#ifdef set_fs
- 	mm_segment_t oldfs;
-+#endif
- 	struct file *fp;
- 
- 	if (path && buf) {
-@@ -1327,10 +1335,14 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
- 		if (0 == ret) {
- 			RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
- 
-+#ifdef set_fs
- 			oldfs = get_fs();
- 			set_fs(KERNEL_DS);
- 			ret = readFile(fp, buf, sz);
- 			set_fs(oldfs);
-+#else
-+			ret = readFile(fp, buf, sz);
-+#endif
- 			closeFile(fp);
- 
- 			RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
-@@ -1354,7 +1366,9 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
- static int storeToFile(const char *path, u8 *buf, u32 sz)
- {
- 	int ret = 0;
-+#ifdef set_fs
- 	mm_segment_t oldfs;
-+#endif
- 	struct file *fp;
- 
- 	if (path && buf) {
-@@ -1362,10 +1376,14 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
- 		if (0 == ret) {
- 			RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
- 
-+#ifdef set_fs
- 			oldfs = get_fs();
- 			set_fs(KERNEL_DS);
- 			ret = writeFile(fp, buf, sz);
- 			set_fs(oldfs);
-+#else
-+			ret = writeFile(fp, buf, sz);
-+#endif
- 			closeFile(fp);
- 
- 			RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);
--- 
-Created with Armbian build tools https://github.com/armbian/build
-