rockchip64/edge (6.4): rebase patches to 6.4.12, some archeology

2023-08-23 21:10:06 +02:00 · 2023-08-23 21:10:06 +02:00 · 2ef13b4e8b
commit 2ef13b4e8b
parent 41a5dedd08
47 changed files with 160 additions and 143 deletions
--- a/patch/kernel/archive/rockchip64-6.4/add-rockchip-iep-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.4/add-rockchip-iep-driver.patch
@ -152,7 +152,7 @@ index 000000000000..a9efcda13fc1
 +      power-domains = <&power RK3228_PD_VIO>;
 +    };
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 511ca864c1b2..c65f9a6ddafb 100644
+index cb9cdaddffd4..54bf9ae3ab4b 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -984,14 +984,25 @@ crypto: crypto@ff8a0000 {
@ -183,10 +183,10 @@ index 511ca864c1b2..c65f9a6ddafb 100644
 
 	isp_mmu: iommu@ff914000 {
 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 6d7a7bf72ac7..1121c11abaa1 100644
+index e729e7a22b23..4e30c5279ac6 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -721,6 +721,28 @@ vop_mmu: iommu@ff373f00 {
+@@ -722,6 +722,28 @@ vop_mmu: iommu@ff373f00 {
 		status = "disabled";
 	};
 
@ -216,7 +216,7 @@ index 6d7a7bf72ac7..1121c11abaa1 100644
 		compatible = "rockchip,rk3328-dw-hdmi";
 		reg = <0x0 0xff3c0000 0x0 0x20000>;
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index 40e7c4a70055..45c8da0e2168 100644
+index 928948e7c7bb..63fed464a660 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1377,12 +1377,25 @@ vdec_mmu: iommu@ff660480 {
--- a/patch/kernel/archive/rockchip64-6.4/board-nanopi-r2s.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-nanopi-r2s.patch
@ -5,7 +5,7 @@ Subject: rockchip64: consolidate nanopi r2s device trees

 ---
 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 493 ++++++----
- 1 file changed, 325 insertions(+), 168 deletions(-)
+ 1 file changed, 328 insertions(+), 165 deletions(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts
 index 1445b879ac7a..7ebf21d7faac 100644
@ -728,3 +728,6 @@ index 1445b879ac7a..7ebf21d7faac 100644
 -&usb_host0_ohci {
 -	status = "okay";
 -};
+-- 
+Armbian
+
--- a/patch/kernel/archive/rockchip64-6.4/board-nanopi-r4s-pwmfan.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-nanopi-r4s-pwmfan.patch
@ -1,10 +1,17 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bochun Bai <bbc@sinofool.net>
+Date: Sun, 18 Jun 2023 11:56:34 +0200
+Subject: Add pwm-fan support to nanopi r4s
+
+---
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | 35 ++++++++++
+ 1 file changed, 35 insertions(+)
+
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-index fe5b52610..a73767594 100644
+index fe5b52610010..10cc254fd1dc 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
-@@ -60,10 +60,45 @@ vdd_5v: vdd-5v {
- 		compatible = "regulator-fixed";
- 		regulator-name = "vdd_5v";
+@@ -62,6 +62,41 @@ vdd_5v: vdd-5v {
 		regulator-always-on;
 		regulator-boot-on;
 	};
@ -46,5 +53,6 @@ index fe5b52610..a73767594 100644
 };
 
 &emmc_phy {
- 	status = "disabled";
- };
+-- 
+Armbian
+
--- a/patch/kernel/archive/rockchip64-6.4/board-pbp-add-dp-alt-mode.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-pbp-add-dp-alt-mode.patch
@ -12,7 +12,7 @@ Subject: add-dp-alt-mode-to-PBP
 5 files changed, 217 insertions(+), 4 deletions(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-index ddd45de97950..9acb8b2029b8 100644
+index 054c6a4d1a45..48b865d30b14 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -422,6 +422,7 @@ edp_out_panel: endpoint@0 {
@ -42,7 +42,7 @@ index ddd45de97950..9acb8b2029b8 100644
 };
 
 diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
-index 39db8acde61a..4886c6a4321f 100644
+index 8b1667be4915..aae021e192a4 100644
 --- a/drivers/phy/rockchip/phy-rockchip-typec.c
 +++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -40,6 +40,7 @@
@ -77,7 +77,7 @@ index 39db8acde61a..4886c6a4321f 100644
 
 	pm_runtime_enable(dev);
 diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
-index 66de880b28d0..036276bcbec1 100644
+index cdf8261e22db..05172e17b2bf 100644
 --- a/drivers/usb/typec/altmodes/displayport.c
 +++ b/drivers/usb/typec/altmodes/displayport.c
@@ -9,6 +9,8 @@
@ -89,7 +89,7 @@ index 66de880b28d0..036276bcbec1 100644
 #include <linux/mutex.h>
 #include <linux/module.h>
 #include <linux/property.h>
-@@ -68,6 +70,8 @@ struct dp_altmode {
+@@ -69,6 +71,8 @@ struct dp_altmode {
 	struct fwnode_handle *connector_fwnode;
 };
 
@ -98,7 +98,7 @@ index 66de880b28d0..036276bcbec1 100644
 static int dp_altmode_notify(struct dp_altmode *dp)
 {
 	unsigned long conf;
-@@ -76,7 +80,9 @@ static int dp_altmode_notify(struct dp_altmode *dp)
+@@ -77,7 +81,9 @@ static int dp_altmode_notify(struct dp_altmode *dp)
 	if (dp->data.conf) {
 		state = get_count_order(DP_CONF_GET_PIN_ASSIGN(dp->data.conf));
 		conf = TYPEC_MODAL_STATE(state);
@ -108,7 +108,7 @@ index 66de880b28d0..036276bcbec1 100644
 		conf = TYPEC_STATE_USB;
 	}
 
-@@ -157,6 +163,40 @@ static int dp_altmode_status_update(struct dp_altmode *dp)
+@@ -163,6 +169,40 @@ static int dp_altmode_status_update(struct dp_altmode *dp)
 	return ret;
 }
 
@ -149,7 +149,7 @@ index 66de880b28d0..036276bcbec1 100644
 static int dp_altmode_configured(struct dp_altmode *dp)
 {
 	sysfs_notify(&dp->alt->dev.kobj, "displayport", "configuration");
-@@ -226,6 +266,8 @@ static void dp_altmode_work(struct work_struct *work)
+@@ -242,6 +282,8 @@ static void dp_altmode_work(struct work_struct *work)
 	case DP_STATE_EXIT:
 		if (typec_altmode_exit(dp->alt))
 			dev_err(&dp->alt->dev, "Exit Mode Failed!\n");
@ -158,7 +158,7 @@ index 66de880b28d0..036276bcbec1 100644
 		break;
 	default:
 		break;
-@@ -558,8 +600,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
+@@ -574,8 +616,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
 	if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) &
 	      DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) &&
 	    !(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) &
@ -176,7 +176,7 @@ index 66de880b28d0..036276bcbec1 100644
 	ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);
 	if (ret)
 diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c
-index 098f0efaa58d..19d2a2078c29 100644
+index fe5b9a2e61f5..c9fd08fd2be4 100644
 --- a/drivers/usb/typec/bus.c
 +++ b/drivers/usb/typec/bus.c
@@ -185,8 +185,14 @@ EXPORT_SYMBOL_GPL(typec_altmode_exit);
@ -196,7 +196,7 @@ index 098f0efaa58d..19d2a2078c29 100644
 		pdev->ops->attention(pdev, vdo);
 }
 diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
-index be1708e30e91..38bd8e8f5591 100644
+index dc113cbb3bed..efd89badf358 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -8,6 +8,7 @@
@ -312,7 +312,7 @@ index be1708e30e91..38bd8e8f5591 100644
 }
 
 static void tcpm_src_detach(struct tcpm_port *port)
-@@ -6136,6 +6181,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -6143,6 +6188,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
 	return ret;
 }
 
@ -377,7 +377,7 @@ index be1708e30e91..38bd8e8f5591 100644
 static int tcpm_fw_get_caps(struct tcpm_port *port,
 			    struct fwnode_handle *fwnode)
 {
-@@ -6146,6 +6249,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
+@@ -6153,6 +6256,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port,
 	if (!fwnode)
 		return -EINVAL;
 
@ -401,7 +401,7 @@ index be1708e30e91..38bd8e8f5591 100644
 	/*
 	 * This fwnode has a "compatible" property, but is never populated as a
 	 * struct device. Instead we simply parse it to read the properties.
-@@ -6578,6 +6698,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -6585,6 +6705,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 		goto out_destroy_wq;
 
 	port->try_role = port->typec_caps.prefer_role;
@ -419,7 +419,7 @@ index be1708e30e91..38bd8e8f5591 100644
 
 	port->typec_caps.fwnode = tcpc->fwnode;
 	port->typec_caps.revision = 0x0120;	/* Type-C spec release 1.2 */
-@@ -6618,6 +6749,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -6627,6 +6758,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
 				     port->port_altmode, ALTMODE_DISCOVERY_MAX);
 	port->registered = true;
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rock64-mail-supply.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rock64-mail-supply.patch
@ -5,14 +5,14 @@ Subject: board_rock64_mali-usb-supply

 Signed-off-by: tonymac32 <tonymckahan@gmail.com>
 ---
- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 16 +++-------
- 1 file changed, 5 insertions(+), 11 deletions(-)
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 5 +++++
+ 1 file changed, 5 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-index f69a38f42d2d..a64a7713b418 100644
+index 0a27fa5271f5..1596ce3368f7 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-@@ -145,6 +134,11 @@ &emmc {
+@@ -135,6 +135,11 @@ &emmc {
 	status = "okay";
 };
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpi4-0003-arm64-dts-pcie.patch
@ -101,7 +101,7 @@ Subject: [ARCHEOLOGY] Rock Pi 4 enable PCIe in device tree for "dev" target
 1 file changed, 4 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-index 907071d4fe80..3f166847c101 100644
+index 980c4534313a..be5c59be0c9d 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -113,6 +113,8 @@ vcc3v3_pcie: vcc3v3-pcie-regulator {
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0005-arm64-dts-rk3308-Add-gmac-node-at-dtsi-level.patch
@ -8,7 +8,7 @@ Subject: arm64: dts: rk3308: Add mac node at dtsi level
 1 file changed, 1 insertion(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index dd228a256a32..9a8edd1c81a0 100644
+index 2ae4bb7d5e62..2a6f41e2281f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
@@ -24,6 +24,7 @@ aliases {
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0007-arm64-dts-rockchip-add-cpu-s-thermal-config-for-rk33.patch
@ -8,10 +8,10 @@ Subject: arm64: dts: rockchip: add cpu's thermal config for rk3308
 1 file changed, 64 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 9a8edd1c81a0..5b92920426db 100644
+index 2a6f41e2281f..fde32008902a 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -551,6 +551,70 @@ saradc: saradc@ff1e0000 {
+@@ -552,6 +552,70 @@ saradc: saradc@ff1e0000 {
 		status = "disabled";
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0008-thermal-rockchip-add-tsadc-support-for-rk3308.patch
@ -7,11 +7,11 @@ Change-Id: Ibf1782ca471c8ad4b14d6fd64eeb123181903adc
 Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
 ---
 Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml |  1 +
- drivers/thermal/rockchip_thermal.c                              | 28 ++++++++++
- 2 files changed, 29 insertions(+)
+ drivers/thermal/rockchip_thermal.c                              | 26 ++++++++++
+ 2 files changed, 27 insertions(+)

 diff --git a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
-index f6c1be226aaa..f652dd535f1b 100644
+index 55f8ec0bec01..c822baf04aed 100644
 --- a/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
 +++ b/Documentation/devicetree/bindings/thermal/rockchip-thermal.yaml
@@ -15,6 +15,7 @@ properties:
@ -23,11 +23,11 @@ index f6c1be226aaa..f652dd535f1b 100644
       - rockchip,rk3368-tsadc
       - rockchip,rk3399-tsadc
 diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
-index 4b7c43f34d1a..8d08b59bc06f 100644
+index 77231a9d28ff..13182e2a3142 100644
 --- a/drivers/thermal/rockchip_thermal.c
 +++ b/drivers/thermal/rockchip_thermal.c
-@@ -924,6 +924,28 @@ static void rk_tsadcv2_tshut_mode(int chn, void __iomem *regs,
- 	writel_relaxed(val, regs + TSADCV2_INT_EN);
+@@ -1060,6 +1060,28 @@ static void rk_tsadcv3_tshut_mode(int chn, void __iomem *regs,
+ 	writel_relaxed(val_cru, regs + TSADCV3_HSHUT_CRU_INT_EN);
 }
 
 +static const struct rockchip_tsadc_chip rk3308_tsadc_data = {
@ -53,9 +53,9 @@ index 4b7c43f34d1a..8d08b59bc06f 100644
 +};
 +
 static const struct rockchip_tsadc_chip px30_tsadc_data = {
- 	.chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */
- 	.chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */
-@@ -1160,6 +1184,10 @@ static const struct of_device_id of_rockchip_thermal_match[] = {
+ 	/* cpu, gpu */
+ 	.chn_offset = 0,
+@@ -1321,6 +1343,10 @@ static const struct of_device_id of_rockchip_thermal_match[] = {
 		.compatible = "rockchip,rk3288-tsadc",
 		.data = (void *)&rk3288_tsadc_data,
 	},
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0010-arm64-dts-rockchip-add-i2s_8ch-for-rk3308.patch
@ -8,10 +8,10 @@ Subject: arm64: dts: rockchip: add i2s_8ch for rk3308
 1 file changed, 103 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 5b92920426db..1121f2852070 100644
+index fde32008902a..1567758ca90e 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -637,6 +637,109 @@ dmac1: dma-controller@ff2d0000 {
+@@ -638,6 +638,109 @@ dmac1: dma-controller@ff2d0000 {
 		#dma-cells = <1>;
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0012-arm64-dts-rk3308-Add-rk-timer-rtc.patch
@ -8,10 +8,10 @@ Subject: arm64: dts: rk3308: Add rk-timer-rtc
 1 file changed, 10 insertions(+), 1 deletion(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 1121f2852070..e77bf353e3cb 100644
+index 1567758ca90e..291f011800b2 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -539,6 +539,15 @@ rktimer: rktimer@ff1a0000 {
+@@ -540,6 +540,15 @@ rktimer: rktimer@ff1a0000 {
 		clock-names = "pclk", "timer";
 	};
 
@ -27,7 +27,7 @@ index 1121f2852070..e77bf353e3cb 100644
 	saradc: saradc@ff1e0000 {
 		compatible = "rockchip,rk3308-saradc", "rockchip,rk3399-saradc";
 		reg = <0x0 0xff1e0000 0x0 0x100>;
-@@ -739,7 +748,7 @@ i2s_8ch_3: i2s@ff330000 {
+@@ -740,7 +749,7 @@ i2s_8ch_3: i2s@ff330000 {
 		rockchip,mclk-calibrate;
 		status = "disabled";
 	};
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch
@ -15,10 +15,10 @@ Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
 4 files changed, 2571 insertions(+)

 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 07747565c3b5..2be7d5017d12 100644
+index 1b50b2d66beb..f3bbe5a4a165 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
-@@ -168,6 +168,7 @@ config SND_SOC_ALL_CODECS
+@@ -172,6 +172,7 @@ config SND_SOC_ALL_CODECS
 	imply SND_SOC_PCM512x_I2C
 	imply SND_SOC_PCM512x_SPI
 	imply SND_SOC_PEB2466
@ -26,7 +26,7 @@ index 07747565c3b5..2be7d5017d12 100644
 	imply SND_SOC_RK3328
 	imply SND_SOC_RK817
 	imply SND_SOC_RT274
-@@ -1251,6 +1252,10 @@ config SND_SOC_PEB2466
+@@ -1308,6 +1309,10 @@ config SND_SOC_PEB2466
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-soc-peb2466.
 
@ -38,10 +38,10 @@ index 07747565c3b5..2be7d5017d12 100644
 	tristate "Rockchip RK3328 audio CODEC"
 	select REGMAP_MMIO
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index f1ca18f7946c..c2fa502159d8 100644
+index 5cdbae88e6e3..f8c42b9e68a7 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
-@@ -188,6 +188,7 @@ snd-soc-pcm512x-objs := pcm512x.o
+@@ -194,6 +194,7 @@ snd-soc-pcm512x-objs := pcm512x.o
 snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
 snd-soc-pcm512x-spi-objs := pcm512x-spi.o
 snd-soc-peb2466-objs := peb2466.o
@ -49,7 +49,7 @@ index f1ca18f7946c..c2fa502159d8 100644
 snd-soc-rk3328-objs := rk3328_codec.o
 snd-soc-rk817-objs := rk817_codec.o
 snd-soc-rl6231-objs := rl6231.o
-@@ -550,6 +551,7 @@ obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
+@@ -563,6 +564,7 @@ obj-$(CONFIG_SND_SOC_PCM512x)	+= snd-soc-pcm512x.o
 obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o
 obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o
 obj-$(CONFIG_SND_SOC_PEB2466)	+= snd-soc-peb2466.o
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0020-arm64-dts-rockchip-Add-acodec-node-for-rk3308.patch
@ -10,10 +10,10 @@ Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
 1 file changed, 17 insertions(+), 1 deletion(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index e77bf353e3cb..37fe89b14a40 100644
+index 291f011800b2..dd221ee88722 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -547,7 +547,7 @@ rk_timer_rtc: rk-timer-rtc@ff1a0020 {
+@@ -548,7 +548,7 @@ rk_timer_rtc: rk-timer-rtc@ff1a0020 {
 		clock-names = "pclk", "timer";
 		status = "disabled";
 	};
@ -22,7 +22,7 @@ index e77bf353e3cb..37fe89b14a40 100644
 	saradc: saradc@ff1e0000 {
 		compatible = "rockchip,rk3308-saradc", "rockchip,rk3399-saradc";
 		reg = <0x0 0xff1e0000 0x0 0x100>;
-@@ -932,6 +932,22 @@ cru: clock-controller@ff500000 {
+@@ -933,6 +933,22 @@ cru: clock-controller@ff500000 {
 		assigned-clock-rates = <32768>;
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0027-arm64-dts-rk3308-add-otp-cpuinfo.patch
@ -64,10 +64,10 @@ Subject: [ARCHEOLOGY] Bumping EDGE kernel to 5.14.y (#3125)
 1 file changed, 29 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 37fe89b14a40..9e5b0977ade6 100644
+index dd221ee88722..5f48dcee7548 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -137,6 +137,12 @@ arm-pmu {
+@@ -138,6 +138,12 @@ arm-pmu {
 		interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
 	};
 
@ -80,7 +80,7 @@ index 37fe89b14a40..9e5b0977ade6 100644
 	mac_clkin: external-mac-clock {
 		compatible = "fixed-clock";
 		clock-frequency = <50000000>;
-@@ -144,6 +150,29 @@ mac_clkin: external-mac-clock {
+@@ -145,6 +151,29 @@ mac_clkin: external-mac-clock {
 		#clock-cells = <0>;
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
+++ b/patch/kernel/archive/rockchip64-6.4/board-rockpis-0029-arm64-dts-rk3308-add-reserved-memory-ramoops.patch
@ -64,10 +64,10 @@ Subject: [ARCHEOLOGY] Bumping EDGE kernel to 5.14.y (#3125)
 1 file changed, 20 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index 9e5b0977ade6..acb5f7304065 100644
+index 5f48dcee7548..c5fe355c6deb 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -178,6 +178,26 @@ psci {
+@@ -179,6 +179,26 @@ psci {
 		method = "smc";
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/drv-spi-spidev-remove-warnings.patch
+++ b/patch/kernel/archive/rockchip64-6.4/drv-spi-spidev-remove-warnings.patch
@ -8,7 +8,7 @@ Subject: drv:spi:spidev remove warnings
 1 file changed, 2 insertions(+)

 diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 5a038c667401..86e98cdd2b6d 100644
+index 39d94c850839..5ae87eb7190b 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
@@ -703,6 +703,7 @@ static const struct file_operations spidev_fops = {
--- a/patch/kernel/archive/rockchip64-6.4/general-add-overlay-configfs.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-add-overlay-configfs.patch
@ -73,11 +73,11 @@ index 000000000000..5fa43e064307
 +intended to be used by hardware managers in the kernel, while the copy interface
 +make sense for developers (since it avoids problems with namespaces).
 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
-index 644386833a7b..622237fd6145 100644
+index e40f10bf2ba4..d08bdf045b17 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -106,4 +106,11 @@ config OF_DMA_DEFAULT_COHERENT
- 	# arches should select this if DMA is coherent by default for OF devices
+@@ -102,4 +102,11 @@ config OF_OVERLAY
+ config OF_NUMA
 	bool
 
 +config OF_CONFIGFS
@ -89,12 +89,12 @@ index 644386833a7b..622237fd6145 100644
 +
 endif # OF
 diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index e0360a44306e..90c92ced24e6 100644
+index eff624854575..61bd05f08ca1 100644
 --- a/drivers/of/Makefile
 +++ b/drivers/of/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
- obj-y = base.o device.o platform.o property.o
+ obj-y = base.o cpu.o device.o module.o platform.o property.o
 obj-$(CONFIG_OF_KOBJ) += kobj.o
 +obj-$(CONFIG_OF_CONFIGFS) += configfs.o
 obj-$(CONFIG_OF_DYNAMIC) += dynamic.o
--- a/patch/kernel/archive/rockchip64-6.4/general-add-panel-simple-dsi.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-add-panel-simple-dsi.patch
@ -62,7 +62,7 @@ Subject: [ARCHEOLOGY] general add panel simple dsi (#3140)
 2 files changed, 773 insertions(+)

 diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index c05aa9e23907..7bdeb4f8ce3e 100644
+index ff169781e82d..08d4ecab6ba5 100644
 --- a/drivers/gpu/drm/panel/Makefile
 +++ b/drivers/gpu/drm/panel/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
--- a/patch/kernel/archive/rockchip64-6.4/general-add-pll-hdmi-timings.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-add-pll-hdmi-timings.patch
@ -69,7 +69,7 @@ Subject: [ARCHEOLOGY] Adding pll hdmi timing to rockchip64-dev too
 1 file changed, 71 insertions(+)

 diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
-index 80acca4e9e14..2643de0344d3 100644
+index 1e1563f5fffc..d70a3f3c00c4 100644
 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
 +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c
@@ -316,6 +316,77 @@ static const struct pre_pll_config pre_pll_cfg_table[] = {
--- a/patch/kernel/archive/rockchip64-6.4/general-add-xtx-spi-nor-chips.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-add-xtx-spi-nor-chips.patch
@ -27,10 +27,10 @@ index e347b435a038..364413da729b 100644
 
 obj-$(CONFIG_MTD_SPI_NOR)	+= controllers/
 diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
-index bcc181c425de..5d94df551e6d 100644
+index 5f29fac8669a..8e737ce9bee7 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -1632,6 +1632,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+@@ -2014,6 +2014,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
 	&spi_nor_winbond,
 	&spi_nor_xilinx,
 	&spi_nor_xmc,
@ -39,10 +39,10 @@ index bcc181c425de..5d94df551e6d 100644
 
 static const struct flash_info spi_nor_generic_flash = {
 diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
-index 6eece1754ec0..1b99ad7f0de8 100644
+index 4fb5ff09c63a..099a47cceba0 100644
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
-@@ -630,6 +630,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
+@@ -644,6 +644,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;
 extern const struct spi_nor_manufacturer spi_nor_winbond;
 extern const struct spi_nor_manufacturer spi_nor_xilinx;
 extern const struct spi_nor_manufacturer spi_nor_xmc;
--- a/patch/kernel/archive/rockchip64-6.4/general-disable-mtu-validation.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-disable-mtu-validation.patch
@ -15,10 +15,10 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 1 file changed, 12 deletions(-)

 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index f9cd063f1fe3..a3a8b1e479ed 100644
+index b74946bbee3c..0ffbc9fb3f06 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5575,27 +5575,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5601,27 +5601,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
 static int stmmac_change_mtu(struct net_device *dev, int new_mtu)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
--- a/patch/kernel/archive/rockchip64-6.4/general-fix-es8316-kernel-panic.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-fix-es8316-kernel-panic.patch
@ -88,10 +88,10 @@ Subject: [ARCHEOLOGY] Enable es8316 on RockPi4 (#1885)
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
-index f7d7a9c91e04..2d10469bb7d2 100644
+index ccecfdf70064..bc1535cc190e 100644
 --- a/sound/soc/codecs/es8316.c
 +++ b/sound/soc/codecs/es8316.c
-@@ -696,7 +696,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
+@@ -701,7 +701,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
 	snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
 				      ES8316_GPIO_ENABLE_INTERRUPT, 0);
 
--- a/patch/kernel/archive/rockchip64-6.4/general-fix-mmc-signal-voltage-before-reboot.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-fix-mmc-signal-voltage-before-reboot.patch
@ -23,7 +23,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
 1 file changed, 8 insertions(+)

 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
-index 426c7f66b349..5f491c67e2c9 100644
+index 3d3e0ca52614..33cb13b7bf88 100644
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
@@ -1363,6 +1363,14 @@ void mmc_power_off(struct mmc_host *host)
--- a/patch/kernel/archive/rockchip64-6.4/general-increasing_DMA_block_memory_allocation_to_2048.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-increasing_DMA_block_memory_allocation_to_2048.patch
@ -210,7 +210,7 @@ Subject: [ARCHEOLOGY] Increasing DMA block memory allocation to 2048k on all
 1 file changed, 3 insertions(+), 5 deletions(-)

 diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
-index 1acec2e22827..17bfd809546b 100644
+index 1acec2e22827..364dd5537925 100644
 --- a/kernel/dma/pool.c
 +++ b/kernel/dma/pool.c
@@ -189,13 +189,11 @@ static int __init dma_atomic_pool_init(void)
@ -230,3 +230,6 @@ index 1acec2e22827..17bfd809546b 100644
 	}
 	INIT_WORK(&atomic_pool_work, atomic_pool_work_fn);
 
+-- 
+Armbian
+
--- a/patch/kernel/archive/rockchip64-6.4/general-legacy-rockchip-hwrng.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-legacy-rockchip-hwrng.patch
@ -34,10 +34,10 @@ Subject: [ARCHEOLOGY] Restored Hardware Random Number Generator from legacy
 4 files changed, 359 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3308.dtsi b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-index acb5f7304065..4ff96497888a 100644
+index c5fe355c6deb..3eaef6941a8f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3308.dtsi
-@@ -654,6 +654,21 @@ logic_thermal: logic-thermal {
+@@ -655,6 +655,21 @@ logic_thermal: logic-thermal {
 		};
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/general-possibility-of-disabling-rk808-rtc.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-possibility-of-disabling-rk808-rtc.patch
@ -22,10 +22,10 @@ Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
 2 files changed, 2 insertions(+), 1 deletion(-)

 diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
-index 16d1861e9682..289fc5627484 100644
+index 695d50b3bac6..76a34952d8b9 100644
 --- a/drivers/mfd/mfd-core.c
 +++ b/drivers/mfd/mfd-core.c
-@@ -232,7 +232,7 @@ static int mfd_add_device(struct device *parent, int id,
+@@ -206,7 +206,7 @@ static int mfd_add_device(struct device *parent, int id,
 		}
 
 		if (!pdev->dev.of_node)
--- a/patch/kernel/archive/rockchip64-6.4/general-rk3328-dtsi-trb-ent-quirk.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-rk3328-dtsi-trb-ent-quirk.patch
@ -45,10 +45,10 @@ Subject: [ARCHEOLOGY] Enable rockchip64: XHCI HCD USB TRB ENT quirk for RK3328
 1 file changed, 1 insertion(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 1121c11abaa1..7a7bf3aafd31 100644
+index 4e30c5279ac6..303680413ed9 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1029,6 +1029,7 @@ usbdrd3: usb@ff600000 {
+@@ -1030,6 +1030,7 @@ usbdrd3: usb@ff600000 {
 		snps,dis-del-phy-power-chg-quirk;
 		snps,dis_enblslpm_quirk;
 		snps,dis-tx-ipgap-linecheck-quirk;
--- a/patch/kernel/archive/rockchip64-6.4/general-rk808-configurable-switch-voltage-steps.patch
+++ b/patch/kernel/archive/rockchip64-6.4/general-rk808-configurable-switch-voltage-steps.patch
@ -119,7 +119,7 @@ Signed-off-by: Piotr Szczepanik <piter75@gmail.com>
 1 file changed, 13 insertions(+), 4 deletions(-)

 diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c
-index fa9fc1aa1ae3..94f359b88dea 100644
+index 80ba782d8923..c3624b41e998 100644
 --- a/drivers/regulator/rk808-regulator.c
 +++ b/drivers/regulator/rk808-regulator.c
@@ -155,6 +155,7 @@
--- a/patch/kernel/archive/rockchip64-6.4/net-usb-r8152-add-LED-configuration-from-OF.patch
+++ b/patch/kernel/archive/rockchip64-6.4/net-usb-r8152-add-LED-configuration-from-OF.patch
@ -13,7 +13,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 1 file changed, 23 insertions(+)

 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 0999a58ca9d2..2dcf32644cdc 100644
+index 0738baa5b82e..3f09916a7dd1 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
@@ -11,6 +11,7 @@
@ -24,7 +24,7 @@ index 0999a58ca9d2..2dcf32644cdc 100644
 #include <linux/crc32.h>
 #include <linux/if_vlan.h>
 #include <linux/uaccess.h>
-@@ -6893,6 +6894,22 @@ static void rtl_tally_reset(struct r8152 *tp)
+@@ -6894,6 +6895,22 @@ static void rtl_tally_reset(struct r8152 *tp)
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
 }
 
@ -47,7 +47,7 @@ index 0999a58ca9d2..2dcf32644cdc 100644
 static void r8152b_init(struct r8152 *tp)
 {
 	u32 ocp_data;
-@@ -6934,6 +6951,8 @@ static void r8152b_init(struct r8152 *tp)
+@@ -6935,6 +6952,8 @@ static void r8152b_init(struct r8152 *tp)
 	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
 	ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@ -56,7 +56,7 @@ index 0999a58ca9d2..2dcf32644cdc 100644
 }
 
 static void r8153_init(struct r8152 *tp)
-@@ -7074,6 +7093,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -7075,6 +7094,8 @@ static void r8153_init(struct r8152 *tp)
 		tp->coalesce = COALESCE_SLOW;
 		break;
 	}
@ -65,7 +65,7 @@ index 0999a58ca9d2..2dcf32644cdc 100644
 }
 
 static void r8153b_init(struct r8152 *tp)
-@@ -7156,6 +7177,8 @@ static void r8153b_init(struct r8152 *tp)
+@@ -7157,6 +7178,8 @@ static void r8153b_init(struct r8152 *tp)
 	rtl_tally_reset(tp);
 
 	tp->coalesce = 15000;	/* 15 us */
--- a/patch/kernel/archive/rockchip64-6.4/regulator-add-fan53200-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.4/regulator-add-fan53200-driver.patch
@ -17,10 +17,10 @@ Signed-off-by: Rock Shen <rock_shen@asus.com>
 4 files changed, 532 insertions(+)

 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 7790ee42c68a..899aaf767841 100644
+index a24609e14d50..9a13d4e38661 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
-@@ -678,6 +678,7 @@ CONFIG_REGULATOR_BD718XX=y
+@@ -701,6 +701,7 @@ CONFIG_REGULATOR_BD718XX=y
 CONFIG_REGULATOR_BD9571MWV=y
 CONFIG_REGULATOR_CROS_EC=y
 CONFIG_REGULATOR_FAN53555=y
@ -29,7 +29,7 @@ index 7790ee42c68a..899aaf767841 100644
 CONFIG_REGULATOR_HI6421V530=y
 CONFIG_REGULATOR_HI655X=y
 diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
-index aae28d0a489c..9c565061bfd9 100644
+index e5f3613c15fa..94a48cd26bd6 100644
 --- a/drivers/regulator/Kconfig
 +++ b/drivers/regulator/Kconfig
@@ -385,6 +385,17 @@ config REGULATOR_FAN53880
@ -51,7 +51,7 @@ index aae28d0a489c..9c565061bfd9 100644
 	tristate "GPIO regulator support"
 	depends on GPIOLIB || COMPILE_TEST
 diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
-index ee383d8fc835..69bcd7711784 100644
+index 58dfe0147cd4..c08bbf978c6e 100644
 --- a/drivers/regulator/Makefile
 +++ b/drivers/regulator/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-add-dmc-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-add-dmc-driver.patch
@ -336,10 +336,10 @@ index 000000000000..a3f5ff4bdc47
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 7a7bf3aafd31..2425ed0e94c4 100644
+index 303680413ed9..e3c8409c225f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -565,6 +565,67 @@ tsadc: tsadc@ff250000 {
+@@ -566,6 +566,67 @@ tsadc: tsadc@ff250000 {
 		status = "disabled";
 	};
 
@ -597,10 +597,10 @@ index 758ebaf2236b..fe033ebcb62d 100644
 struct clk *rockchip_clk_register_ddrclk(const char *name, int flags,
 					 const char *const *parent_names,
 diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
-index 9754d8b31621..c3380b360c68 100644
+index 3c4862a752b5..ab0e2bd1c8de 100644
 --- a/drivers/devfreq/Kconfig
 +++ b/drivers/devfreq/Kconfig
-@@ -130,6 +130,18 @@ config ARM_MEDIATEK_CCI_DEVFREQ
+@@ -129,6 +129,18 @@ config ARM_MEDIATEK_CCI_DEVFREQ
 	  buck voltages and update a proper CCI frequency. Use the notification
 	  to get the regulator status.
 
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-add-rga-node.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-add-rga-node.patch
@ -8,10 +8,10 @@ Subject: rk3328: add RGA node
 1 file changed, 14 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 2425ed0e94c4..e9f0f1e5ba32 100644
+index e3c8409c225f..3f7770d83748 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -782,6 +782,20 @@ vop_mmu: iommu@ff373f00 {
+@@ -783,6 +783,20 @@ vop_mmu: iommu@ff373f00 {
 		status = "disabled";
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-mali-opp-table.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-mali-opp-table.patch
@ -8,10 +8,10 @@ Subject: gpu operating points
 1 file changed, 25 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index e9f0f1e5ba32..732e123bb93d 100644
+index 3f7770d83748..48c59e5ee235 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -683,6 +683,31 @@ gpu: gpu@ff300000 {
+@@ -684,6 +684,31 @@ gpu: gpu@ff300000 {
 		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
 		clock-names = "bus", "core";
 		resets = <&cru SRST_GPU_A>;
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-mmc-reset-properties.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-mmc-reset-properties.patch
@ -8,10 +8,10 @@ Subject: mmc reset properties
 1 file changed, 6 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 732e123bb93d..c4637f71d325 100644
+index 48c59e5ee235..b2d517bf0082 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -992,6 +992,8 @@ sdmmc: mmc@ff500000 {
+@@ -993,6 +993,8 @@ sdmmc: mmc@ff500000 {
 		clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
 			 <&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@ -20,7 +20,7 @@ index 732e123bb93d..c4637f71d325 100644
 		fifo-depth = <0x100>;
 		max-frequency = <150000000>;
 		status = "disabled";
-@@ -1004,6 +1006,8 @@ sdio: mmc@ff510000 {
+@@ -1005,6 +1007,8 @@ sdio: mmc@ff510000 {
 		clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
 			 <&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
@ -29,7 +29,7 @@ index 732e123bb93d..c4637f71d325 100644
 		fifo-depth = <0x100>;
 		max-frequency = <150000000>;
 		status = "disabled";
-@@ -1016,6 +1020,8 @@ emmc: mmc@ff520000 {
+@@ -1017,6 +1021,8 @@ emmc: mmc@ff520000 {
 		clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
 			 <&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-sdmmc-ext-node.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-sdmmc-ext-node.patch
@ -8,10 +8,10 @@ Subject: sdmmc-ext node
 1 file changed, 14 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index c4637f71d325..2c64c1b6f709 100644
+index b2d517bf0082..eb467c8586ab 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1027,6 +1027,20 @@ emmc: mmc@ff520000 {
+@@ -1028,6 +1028,20 @@ emmc: mmc@ff520000 {
 		status = "disabled";
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-spdif.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-spdif.patch
@ -58,10 +58,10 @@ Subject: [ARCHEOLOGY] rockchip64: tidy up rk3328 patches
 1 file changed, 27 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 2c64c1b6f709..6c60458d3b03 100644
+index eb467c8586ab..cb0c3fd179b4 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -194,6 +194,26 @@ psci {
+@@ -195,6 +195,26 @@ psci {
 		method = "smc";
 	};
 
@ -88,7 +88,7 @@ index 2c64c1b6f709..6c60458d3b03 100644
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-@@ -301,6 +321,10 @@ power: power-controller {
+@@ -302,6 +322,10 @@ power: power-controller {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
@ -99,7 +99,7 @@ index 2c64c1b6f709..6c60458d3b03 100644
 			power-domain@RK3328_PD_HEVC {
 				reg = <RK3328_PD_HEVC>;
 				#power-domain-cells = <0>;
-@@ -682,6 +706,7 @@ gpu: gpu@ff300000 {
+@@ -683,6 +707,7 @@ gpu: gpu@ff300000 {
 				  "ppmmu1";
 		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
 		clock-names = "bus", "core";
@ -107,7 +107,7 @@ index 2c64c1b6f709..6c60458d3b03 100644
 		resets = <&cru SRST_GPU_A>;
 		operating-points-v2 = <&gpu_opp_table>;
 	};
-@@ -924,6 +949,7 @@ cru: clock-controller@ff440000 {
+@@ -925,6 +950,7 @@ cru: clock-controller@ff440000 {
 			<&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>,
 			<&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>,
 			<&cru HCLK_PERI>, <&cru PCLK_PERI>,
@ -115,7 +115,7 @@ index 2c64c1b6f709..6c60458d3b03 100644
 			<&cru SCLK_RTC32K>;
 		assigned-clock-parents =
 			<&cru HDMIPHY>, <&cru PLL_APLL>,
-@@ -945,6 +971,7 @@ cru: clock-controller@ff440000 {
+@@ -946,6 +972,7 @@ cru: clock-controller@ff440000 {
 			<150000000>, <75000000>,
 			<75000000>, <150000000>,
 			<75000000>, <75000000>,
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-usb3-reset-properties.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-dtsi-usb3-reset-properties.patch
@ -8,10 +8,10 @@ Subject: usb3 reset properties
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 6c60458d3b03..f790fd135315 100644
+index cb0c3fd179b4..3ff7408bf31b 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -1171,6 +1171,8 @@ usbdrd3: usb@ff600000 {
+@@ -1172,6 +1172,8 @@ usbdrd3: usb@ff600000 {
 			 <&cru ACLK_USB3OTG>;
 		clock-names = "ref_clk", "suspend_clk",
 			      "bus_clk";
--- a/patch/kernel/archive/rockchip64-6.4/rk3328-gpu-cooling-target.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3328-gpu-cooling-target.patch
@ -9,10 +9,10 @@ Signed-off-by: tonymac32 <tonymckahan@gmail.com>
 1 file changed, 6 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index f790fd135315..01df81f0525b 100644
+index 3ff7408bf31b..94eae571006f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -564,6 +564,11 @@ map0 {
+@@ -565,6 +565,11 @@ map0 {
 							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 					contribution = <4096>;
 				};
@ -24,7 +24,7 @@ index f790fd135315..01df81f0525b 100644
 			};
 		};
 
-@@ -709,6 +714,7 @@ gpu: gpu@ff300000 {
+@@ -710,6 +715,7 @@ gpu: gpu@ff300000 {
 		power-domains = <&power RK3328_PD_GPU>;
 		resets = <&cru SRST_GPU_A>;
 		operating-points-v2 = <&gpu_opp_table>;
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-enable-dwc3-xhci-usb-trb-quirk.patch
@ -95,7 +95,7 @@ Subject: [ARCHEOLOGY] Fix 2.5G Ethernet on Helios64 Mainline kernel (#2567)
 1 file changed, 2 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index 45c8da0e2168..bbdaee4b4872 100644
+index 63fed464a660..01ec8c2967b7 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -461,6 +461,7 @@ usbdrd_dwc3_0: usb@fe800000 {
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch
@ -74,10 +74,10 @@ Subject: [ARCHEOLOGY] rockchip-[current,edge]: add pcie hack and lsi scsi/sas
 4 files changed, 41 insertions(+)

 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 7016cb12dc4e..6fc40ae5ce10 100644
+index 732391193182..5134b12a4bf7 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4388,6 +4388,14 @@
+@@ -4455,6 +4455,14 @@
 		nomsi	Do not use MSI for native PCIe PME signaling (this makes
 			all PCIe root ports use INTx for all services).
 
@ -150,10 +150,10 @@ index c96c0f454570..a161b852a5c8 100644
 	if (err)
 		goto err_remove_irq_domain;
 diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c
-index 990a00e08bc5..c7ec35afd8ca 100644
+index 1aa84035a8bc..c2bf64fcf300 100644
 --- a/drivers/pci/controller/pcie-rockchip.c
 +++ b/drivers/pci/controller/pcie-rockchip.c
-@@ -149,6 +149,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
+@@ -150,6 +150,12 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip)
 		return PTR_ERR(rockchip->clk_pcie_pm);
 	}
 
@ -167,10 +167,10 @@ index 990a00e08bc5..c7ec35afd8ca 100644
 }
 EXPORT_SYMBOL_GPL(rockchip_pcie_parse_dt);
 diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h
-index 32c3a859c26b..87223ba452a4 100644
+index fe0333778fd9..befb64392b14 100644
 --- a/drivers/pci/controller/pcie-rockchip.h
 +++ b/drivers/pci/controller/pcie-rockchip.h
-@@ -299,6 +299,8 @@ struct rockchip_pcie {
+@@ -318,6 +318,8 @@ struct rockchip_pcie {
 	phys_addr_t msg_bus_addr;
 	bool is_rc;
 	struct resource *mem_res;
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-rp64-rng.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-rp64-rng.patch
@ -9,10 +9,10 @@ Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
 1 file changed, 10 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index bbdaee4b4872..a167634e1565 100644
+index 01ec8c2967b7..abc73a9adf1a 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -2078,6 +2078,16 @@ edp_in_vopl: endpoint@1 {
+@@ -2092,6 +2092,16 @@ edp_out: port@1 {
 		};
 	};
 
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-sd-drive-level-8ma.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-sd-drive-level-8ma.patch
@ -109,10 +109,10 @@ Subject: [ARCHEOLOGY] add better strength on SDCard and put back previous
 1 file changed, 8 insertions(+), 8 deletions(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index a167634e1565..065d2644da66 100644
+index abc73a9adf1a..00e7f2656f0f 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -2541,25 +2541,25 @@ sdio0_int: sdio0-int {
+@@ -2555,25 +2555,25 @@ sdio0_int: sdio0-int {
 		sdmmc {
 			sdmmc_bus1: sdmmc-bus1 {
 				rockchip,pins =
@ -145,7 +145,7 @@ index a167634e1565..065d2644da66 100644
 			};
 
 			sdmmc_cd: sdmmc-cd {
-@@ -2569,7 +2569,7 @@ sdmmc_cd: sdmmc-cd {
+@@ -2583,7 +2583,7 @@ sdmmc_cd: sdmmc-cd {
 
 			sdmmc_wp: sdmmc-wp {
 				rockchip,pins =
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-sd-pwr-pinctrl.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-sd-pwr-pinctrl.patch
@ -8,10 +8,10 @@ Subject: rk3399: add sd power pin to pinctrl node
 1 file changed, 5 insertions(+)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index 065d2644da66..af2044162962 100644
+index 00e7f2656f0f..848f3f2150d9 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-@@ -2536,6 +2536,11 @@ sdio0_int: sdio0-int {
+@@ -2550,6 +2550,11 @@ sdio0_int: sdio0-int {
 				rockchip,pins =
 					<0 RK_PA4 1 &pcfg_pull_up>;
 			};
--- a/patch/kernel/archive/rockchip64-6.4/rk3399-unlock-temperature.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk3399-unlock-temperature.patch
@ -98,7 +98,7 @@ Subject: [ARCHEOLOGY] Increase performance with rk3399-dev
 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
-index af2044162962..ddf5f6207bcc 100644
+index 848f3f2150d9..4d1dcc83f5cb 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -831,17 +831,17 @@ cpu_thermal: cpu-thermal {
--- a/patch/kernel/archive/rockchip64-6.4/rk356x-rga.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk356x-rga.patch
@ -51,7 +51,7 @@ index dd645ddccb07..8adb18245187 100644
   reg:
     maxItems: 1
 diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
-index eed0059a68b8..43b49220b77d 100644
+index 61680c7ac489..b908a1ccf8ac 100644
 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -633,6 +633,17 @@ vepu_mmu: iommu@fdee0800 {
@ -73,10 +73,10 @@ index eed0059a68b8..43b49220b77d 100644
 		compatible = "rockchip,rk3568-dw-mshc", "rockchip,rk3288-dw-mshc";
 		reg = <0x0 0xfe000000 0x0 0x4000>;
 diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
-index 61b25fcf826e..b14844105788 100644
+index 67dcf22e5ba3..6a2002574d3b 100644
 --- a/drivers/media/platform/rockchip/rga/rga.c
 +++ b/drivers/media/platform/rockchip/rga/rga.c
-@@ -979,6 +979,9 @@ static const struct of_device_id rockchip_rga_match[] = {
+@@ -977,6 +977,9 @@ static const struct of_device_id rockchip_rga_match[] = {
 	{
 		.compatible = "rockchip,rk3399-rga",
 	},
--- a/patch/kernel/archive/rockchip64-6.4/rk356x-vop2-support.patch
+++ b/patch/kernel/archive/rockchip64-6.4/rk356x-vop2-support.patch
@ -142,8 +142,8 @@ Subject: [ARCHEOLOGY] [RFC] RK3288 : Add HDMI resolutions (#1887)
 > X-Git-Archeology:   Subject: bump rockchip64 edge to v6.3
 > X-Git-Archeology:
 ---
- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 149 +++++-----
- 1 file changed, 73 insertions(+), 76 deletions(-)
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 145 +++++-----
+ 1 file changed, 67 insertions(+), 78 deletions(-)

 diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
 index 112699949db9..4f9fa4fd2629 100644
@ -333,3 +333,6 @@ index 112699949db9..4f9fa4fd2629 100644
 	{ ~0UL,	     0x0000, 0x0000, 0x0000}
 };
 
+-- 
+Armbian
+
--- a/patch/kernel/archive/rockchip64-6.4/wifi-4003-ssv-6051-driver.patch
+++ b/patch/kernel/archive/rockchip64-6.4/wifi-4003-ssv-6051-driver.patch
@ -67,7 +67,7 @@ Subject: add ssv6xxx wifi driver
 60 files changed, 48981 insertions(+)

 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
-index cb1c15012dd0..a67a3e3de611 100644
+index 7555af5195ec..480596d9d36a 100644
 --- a/drivers/net/wireless/Kconfig
 +++ b/drivers/net/wireless/Kconfig
@@ -18,6 +18,7 @@ menuconfig WLAN
@ -79,7 +79,7 @@ index cb1c15012dd0..a67a3e3de611 100644
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
-index a61cf6c90343..17ef8296986f 100644
+index 4d7374d567d1..8e1619384556 100644
 --- a/drivers/net/wireless/Makefile
 +++ b/drivers/net/wireless/Makefile
@@ -3,6 +3,7 @@
@ -45290,7 +45290,7 @@ index 000000000000..9be260dd904e
 +#endif
 diff --git a/drivers/net/wireless/ssv6051/smac/ssv_rc.c b/drivers/net/wireless/ssv6051/smac/ssv_rc.c
 new file mode 100644
-index 000000000000..9c3574285364
+index 000000000000..f90e352bdf0c
 --- /dev/null
 +++ b/drivers/net/wireless/ssv6051/smac/ssv_rc.c
@@ -0,0 +1,1716 @@