rockchip64-6.18: rewrite/rebase patches - no changes

- few archeology manual fixes

Author: rpardini

patch/kernel/archive/rockchip64-6.18/board-nanopi-m4v2-dts-add-sound-card.patch

@@ -169,7 +169,7 @@ diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
 index 111111111111..222222222222 100644
 --- a/sound/soc/rockchip/Kconfig
 +++ b/sound/soc/rockchip/Kconfig
-@@ -75,6 +75,15 @@ config SND_SOC_ROCKCHIP_RT5645
+@@ -66,6 +66,15 @@ config SND_SOC_ROCKCHIP_RT5645
  	  Say Y or M here if you want to add support for SoC audio on Rockchip
  	  boards using the RT5645/RT5650 codec, such as Veyron.
 
@@ -184,7 +184,7 @@ index 111111111111..222222222222 100644
 +
  config SND_SOC_RK3288_HDMI_ANALOG
  	tristate "ASoC support multiple codecs for Rockchip RK3288 boards"
- 	depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
+ 	depends on I2C && GPIOLIB
 -- 
 Armbian
 

patch/kernel/archive/rockchip64-6.18/board-nanopi-r3s-fix-leds.patch

@@ -1,15 +1,15 @@
-From c80bdda0d87a7119152d95f7943212fc8265e104 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: John Doe <john.doe@somewhere.on.planet>
 Date: Sat, 30 Aug 2025 14:20:24 +0800
-Subject: [PATCH 1/3] Patching NanoPi-R3S LEDs
+Subject: Patching NanoPi-R3S LEDs
 
 Signed-off-by: retro98boy <retro98boy@qq.com>
 ---
- .../boot/dts/rockchip/rk3566-nanopi-r3s.dts   | 41 ++++++++++++++-----
+ arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 41 +++++++---
  1 file changed, 31 insertions(+), 10 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
-index fb1f65c86..553a9e599 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
 @@ -52,19 +52,21 @@ power_led: led-0 {
@@ -110,5 +110,5 @@ index fb1f65c86..553a9e599 100644
  	};
 
 -- 
-2.51.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/board-orangepi5-sata-supply.patch

@@ -1,5 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: royka1 <roykaandorp@gmail.com>
+Date: Mon, 6 Oct 2025 23:39:26 +0200
+Subject: Add sata node for Orange-Pi-5's overlay (#8707)
+
+> X-Git-Archeology: > recovered message: > * OPi5: SATA power via vcc3v3_pcie20; set to 3.3V; rename overlay
+> X-Git-Archeology: > recovered message: > * Convert spaces to tabs
+> X-Git-Archeology: > recovered message: > ---------
+> X-Git-Archeology: > recovered message: > Co-authored-by: Igor <igor@armbian.com>
+> X-Git-Archeology: - Revision 784d367e8aaffa1e2aed7bd844456921b9e8f97e: https://github.com/armbian/build/commit/784d367e8aaffa1e2aed7bd844456921b9e8f97e
+> X-Git-Archeology:   Date: Mon, 06 Oct 2025 23:39:26 +0200
+> X-Git-Archeology:   From: royka1 <roykaandorp@gmail.com>
+> X-Git-Archeology:   Subject: Add sata overlay for Orange-Pi-5 (#8707)
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision f0504a92e16dc4c4d0ae346cc5c0beb126a00298: https://github.com/armbian/build/commit/f0504a92e16dc4c4d0ae346cc5c0beb126a00298
+> X-Git-Archeology:   Date: Sat, 18 Oct 2025 11:34:52 +0200
+> X-Git-Archeology:   From: Jianfeng Liu <liujianfeng1994@gmail.com>
+> X-Git-Archeology:   Subject: rockchip64-6.18: update patches
+> X-Git-Archeology:
+---
+ arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 11 ++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
-index ad6d04793b0a..b811ec843936 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
 @@ -14,8 +14,8 @@ vcc3v3_pcie20: regulator-vcc3v3-pcie20 {
@@ -27,3 +50,6 @@ index ad6d04793b0a..b811ec843936 100644
  &sfc {
  	status = "okay";
  };
+-- 
+Armbian
+

patch/kernel/archive/rockchip64-6.18/board-pbp-add-dp-alt-mode.patch

@@ -40,7 +40,7 @@ index 111111111111..222222222222 100644
  &edp {
  	force-hpd;
  	pinctrl-names = "default";
-@@ -692,6 +706,8 @@ fusb0: fusb30x@22 {
+@@ -685,6 +699,8 @@ fusb0: fusb30x@22 {
  		pinctrl-names = "default";
  		pinctrl-0 = <&fusb0_int_pin>;
  		vbus-supply = <&vbus_typec>;
@@ -49,7 +49,7 @@ index 111111111111..222222222222 100644
 
  		connector {
  			compatible = "usb-c-connector";
-@@ -700,10 +716,19 @@ connector {
+@@ -693,10 +709,19 @@ connector {
  			op-sink-microwatt = <1000000>;
  			power-role = "dual";
  			sink-pdos =
@@ -71,15 +71,15 @@ index 111111111111..222222222222 100644
 
  			ports {
  				#address-cells = <1>;
-@@ -970,6 +995,7 @@ spiflash: flash@0 {
+@@ -982,6 +1007,7 @@ spiflash: flash@0 {
  };
 
  &tcphy0 {
 +	extcon = <&typec_extcon_bridge>;
  	status = "okay";
  };
 
-@@ -1003,6 +1029,8 @@ &tsadc {
+@@ -1015,6 +1041,8 @@ &tsadc {
 
  &u2phy0 {
  	status = "okay";
@@ -88,7 +88,7 @@ index 111111111111..222222222222 100644
 
  	u2phy0_otg: otg-port {
  		status = "okay";
-@@ -1079,7 +1107,9 @@ &usbdrd3_0 {
+@@ -1091,7 +1119,9 @@ &usbdrd3_0 {
  };
 
  &usbdrd_dwc3_0 {

patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-cc-dts-enable-dmc.patch

@@ -52,7 +52,7 @@ index 111111111111..222222222222 100644
  	gmac_clkin: external-gmac-clock {
  		compatible = "fixed-clock";
  		clock-frequency = <125000000>;
-@@ -111,6 +138,17 @@ &codec {
+@@ -118,6 +145,17 @@ &codec {
  	status = "okay";
  };
 

patch/kernel/archive/rockchip64-6.18/board-rk3328-roc-pc.patch

@@ -4,8 +4,8 @@ Date: Tue, 12 Oct 2021 19:34:29 +0000
 Subject: enable dmc for rk3328-roc-pc
 
 ---
- arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 524 +++++++++-
- 1 file changed, 466 insertions(+), 58 deletions(-)
+ arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts | 521 +++++++++-
+ 1 file changed, 464 insertions(+), 57 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-pc.dts
 index 111111111111..222222222222 100644
@@ -117,7 +117,7 @@ index 111111111111..222222222222 100644
 +		regulator-always-on;
 +		regulator-boot-on;
 +		vin-supply = <&vcc_sys>;
-+	};
+ 	};
 +
 +	vcc_sd: sdmmc-regulator {
 +		compatible = "regulator-fixed";
@@ -187,11 +187,9 @@ index 111111111111..222222222222 100644
 +			opp-hz = /bits/ 64 <924000000>;
 +			opp-microvolt = <1100000 1100000 1200000>;
 +		};
- 	};
- };
- 
--&codec {
--	mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;
++	};
++};
++
 +&dfi {
 +	status = "okay";
 +};
@@ -216,12 +214,8 @@ index 111111111111..222222222222 100644
 +
 +&cpu0 {
 +	cpu-supply = <&vdd_arm>;
- };
- 
--&pinctrl {
--	ir {
--		ir_int: ir-int {
--			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
++};
++
 +&gmac2phy {
 +	phy-supply = <&vcc_phy>;
 +	clock_in_out = "output";
@@ -303,13 +297,18 @@ index 111111111111..222222222222 100644
 +&i2s1 {
 +	#sound-dai-cells = <0>;
 +	status = "okay";
-+};
-+
-+&codec {
+ };
+ 
+ &codec {
+-	mute-gpios = <&grf_gpio 0 GPIO_ACTIVE_LOW>;
 +	#sound-dai-cells = <0>;
 +	status = "okay";
-+};
-+
+ };
+ 
+-&pinctrl {
+-	ir {
+-		ir_int: ir-int {
+-			rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 +&emmc {
 +	bus-width = <8>;
 +	cap-mmc-highspeed;

patch/kernel/archive/rockchip64-6.18/board-rockpro64-0001-Add-pcie-bus-scan-delay.patch

@@ -13,7 +13,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -677,6 +677,7 @@ &pcie0 {
+@@ -617,6 +617,7 @@ &pcie0 {
  	vpcie1v8-supply = <&vcca_1v8>;
  	vpcie12v-supply = <&vcc12v_dcin>;
  	vpcie3v3-supply = <&vcc3v3_pcie>;

patch/kernel/archive/rockchip64-6.18/board-rockpro64-change-rx_delay-for-gmac.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -317,7 +317,7 @@ &gmac {
+@@ -300,7 +300,7 @@ &gmac {
  	snps,reset-active-low;
  	snps,reset-delays-us = <0 10000 50000>;
  	tx_delay = <0x28>;

patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-emmc.patch

@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
  		stdout-path = "serial2:1500000n8";
  	};
 
-@@ -829,6 +830,7 @@ &sdmmc {
+@@ -765,6 +766,7 @@ &sdmmc {
 
  &sdhci {
  	bus-width = <8>;

patch/kernel/archive/rockchip64-6.18/board-rockpro64-fix-spi1-flash-speed.patch

@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -852,7 +852,7 @@ &spi1 {
+@@ -788,7 +788,7 @@ &spi1 {
  	flash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;