rockchip64: rewrite patches

Author: EvilOlaf

patch/kernel/archive/rockchip64-6.16/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
-@@ -65,6 +65,15 @@ config SND_SOC_ROCKCHIP_RT5645
+@@ -75,6 +75,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.
 

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

@@ -123,7 +123,7 @@ index 111111111111..222222222222 100644
  #include <linux/tcp.h>
  #include <linux/interrupt.h>
  #include <linux/dma-mapping.h>
-@@ -2438,6 +2439,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
+@@ -2375,6 +2376,15 @@ void r8169_apply_firmware(struct rtl8169_private *tp)
  	}
  }
 
@@ -139,7 +139,7 @@ index 111111111111..222222222222 100644
  static void rtl8168_config_eee_mac(struct rtl8169_private *tp)
  {
  	/* Adjust EEE LED frequency */
-@@ -3449,6 +3459,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
+@@ -3392,6 +3402,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)
  	rtl_eri_write(tp, 0xb8, ERIAR_MASK_0011, 0x0000);
 
  	rtl8168_config_eee_mac(tp);
@@ -151,8 +151,8 @@ diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/re
 index 111111111111..222222222222 100644
 --- a/drivers/net/phy/realtek/realtek_main.c
 +++ b/drivers/net/phy/realtek/realtek_main.c
-@@ -135,6 +135,15 @@ static int rtl821x_write_page(struct phy_device *phydev, int page)
- 	return __phy_write(phydev, RTL821x_PAGE_SELECT, page);
+@@ -215,6 +215,15 @@ static int rtl821x_modify_ext_page(struct phy_device *phydev, u16 ext_page,
+ 	return phy_restore_page(phydev, oldpage, ret);
  }
 
 +static void rtl821x_led_of_init(struct phy_device *phydev)
@@ -167,15 +167,15 @@ index 111111111111..222222222222 100644
  static int rtl821x_probe(struct phy_device *phydev)
  {
  	struct device *dev = &phydev->mdio.dev;
-@@ -460,6 +469,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
+@@ -589,6 +598,8 @@ static int rtl8211f_config_init(struct phy_device *phydev)
  	if (ret)
  		return ret;
 
 +	rtl821x_led_of_init(phydev);
 +
  	if (priv->has_phycr2) {
- 		ret = phy_modify_paged(phydev, 0xa43, RTL8211F_PHYCR2,
- 				       RTL8211F_CLKOUT_EN, priv->phycr2);
+ 		ret = phy_modify_paged(phydev, RTL8211F_PHYCR_PAGE,
+ 				       RTL8211F_PHYCR2, RTL8211F_CLKOUT_EN,
 -- 
 Armbian
 

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

@@ -157,7 +157,7 @@ index 111111111111..222222222222 100644
  		break;
  	case DP_STATE_EXIT_PRIME:
  		if (typec_cable_altmode_exit(dp->plug_prime, TYPEC_PLUG_SOP_P))
-@@ -733,8 +775,14 @@ int dp_altmode_probe(struct typec_altmode *alt)
+@@ -737,8 +779,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) &
@@ -186,7 +186,7 @@ index 111111111111..222222222222 100644
  #include <linux/hrtimer.h>
  #include <linux/jiffies.h>
  #include <linux/kernel.h>
-@@ -575,6 +576,11 @@ struct tcpm_port {
+@@ -580,6 +581,11 @@ struct tcpm_port {
  	unsigned int message_id_prime;
  	unsigned int rx_msgid_prime;
 
@@ -198,7 +198,7 @@ index 111111111111..222222222222 100644
  	/* Timer deadline values configured at runtime */
  	struct pd_timings timings;
 
-@@ -968,6 +974,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
+@@ -983,6 +989,35 @@ static void tcpm_ams_finish(struct tcpm_port *port)
  	port->ams = NONE_AMS;
  }
 
@@ -234,7 +234,7 @@ index 111111111111..222222222222 100644
  static int tcpm_pd_transmit(struct tcpm_port *port,
  			    enum tcpm_transmit_type tx_sop_type,
  			    const struct pd_message *msg)
-@@ -1207,6 +1242,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached,
+@@ -1222,6 +1257,8 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, int state,
  	typec_set_data_role(port->typec_port, data);
  	typec_set_pwr_role(port->typec_port, role);
 
@@ -243,7 +243,7 @@ index 111111111111..222222222222 100644
  	return 0;
  }
 
-@@ -1780,7 +1817,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
+@@ -1845,7 +1882,7 @@ static void svdm_consume_modes(struct tcpm_port *port, const u32 *p, int cnt,
  		paltmode->mode = i;
  		paltmode->vdo = p[i];
 
@@ -252,7 +252,7 @@ index 111111111111..222222222222 100644
  			 pmdata->altmodes, paltmode->svid,
  			 paltmode->mode, paltmode->vdo);
 
-@@ -1804,6 +1841,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
+@@ -1869,6 +1906,8 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
  			tcpm_log(port, "Failed to register partner SVID 0x%04x",
  				 modep->altmode_desc[i].svid);
  			altmode = NULL;
@@ -261,7 +261,7 @@ index 111111111111..222222222222 100644
  		}
  		port->partner_altmode[i] = altmode;
  	}
-@@ -2180,11 +2219,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
+@@ -2245,11 +2284,13 @@ static int tcpm_pd_svdm(struct tcpm_port *port, struct typec_altmode *adev,
  				modep->svid_index++;
  				if (modep->svid_index < modep->nsvids) {
  					u16 svid = modep->svids[modep->svid_index];
@@ -275,15 +275,15 @@ index 111111111111..222222222222 100644
  					*response_tx_sop_type = TCPC_TX_SOP_PRIME;
  					response[0] = VDO(USB_SID_PD, 1,
  							  typec_get_cable_svdm_version(typec),
-@@ -4413,6 +4454,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
+@@ -4471,6 +4512,7 @@ static void tcpm_typec_disconnect(struct tcpm_port *port)
  	port->cable = NULL;
  	if (port->connected) {
  		if (port->partner) {
 +			tcpm_update_extcon_data(port, false);
  			typec_partner_set_usb_power_delivery(port->partner, NULL);
  			typec_unregister_partner(port->partner);
  			port->partner = NULL;
-@@ -4507,6 +4549,8 @@ static void tcpm_detach(struct tcpm_port *port)
+@@ -4565,6 +4607,8 @@ static void tcpm_detach(struct tcpm_port *port)
  	}
 
  	tcpm_reset_port(port);
@@ -292,7 +292,7 @@ index 111111111111..222222222222 100644
  }
 
  static void tcpm_src_detach(struct tcpm_port *port)
-@@ -7164,6 +7208,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw
+@@ -7274,6 +7318,64 @@ static void tcpm_fw_get_timings(struct tcpm_port *port, struct fwnode_handle *fw
  		port->timings.snk_bc12_cmpletion_time = val;
  }
 
@@ -356,8 +356,8 @@ index 111111111111..222222222222 100644
 +
  static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode)
  {
- 	struct fwnode_handle *capabilities, *child, *caps = NULL;
-@@ -7177,6 +7279,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
+ 	struct fwnode_handle *capabilities, *caps = NULL;
+@@ -7287,6 +7389,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode
  	if (!fwnode)
  		return -EINVAL;
 
@@ -381,7 +381,7 @@ index 111111111111..222222222222 100644
  	/*
  	 * This fwnode has a "compatible" property, but is never populated as a
  	 * struct device. Instead we simply parse it to read the properties.
-@@ -7748,6 +7867,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7856,6 +7975,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  	tcpm_fw_get_pd_revision(port, tcpc->fwnode);
 
  	port->try_role = port->typec_caps.prefer_role;
@@ -399,7 +399,7 @@ index 111111111111..222222222222 100644
 
  	port->typec_caps.revision = 0x0120;	/* Type-C spec release 1.2 */
 
-@@ -7797,6 +7927,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
+@@ -7905,6 +8035,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc)
  				      &tcpm_cable_ops);
  	port->registered = true;
 

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

@@ -9,12 +9,10 @@ See Revision ea20f750bfead37ced7b604a44f8f014e317abad
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-index 14cdf715535e..0b4bdb555f65 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
-@@ -850,11 +850,11 @@ &spi1 {
- 	status = "okay";
- 
+@@ -852,7 +852,7 @@ &spi1 {
  	flash@0 {
  		compatible = "jedec,spi-nor";
  		reg = <0>;
@@ -23,7 +21,6 @@ index 14cdf715535e..0b4bdb555f65 100644
  		vcc-supply = <&vcc_3v0>;
  	};
  };
- 
- &tcphy0 {
 -- 
-Created with Armbian build tools https://github.com/armbian/build
+Armbian
+

patch/kernel/archive/rockchip64-6.16/board-rocks0.patch

@@ -1,17 +1,17 @@
-From b6bb3bd96fa150019d6f6a6adb602359596ce361 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 5 Apr 2025 17:59:02 +0200
-Subject: [PATCH] Add some missing nodes in rk3308-rock-so device tree
+Subject: Add some missing nodes in rk3308-rock-so device tree
 
 This is the consolidation of these two legacy patches:
 * https://github.com/paolosabatino/armbian-build/blob/935149d2822cd2a2c63891ca6614563f5538b706/patch/kernel/archive/rockchip64-6.12/board-rocks0-0001-deviceTree.patch
 * https://github.com/paolosabatino/armbian-build/blob/935149d2822cd2a2c63891ca6614563f5538b706/patch/kernel/archive/rockchip64-6.12/board-rocks0-0002-Revert-arm64-dts-rockchip-Fix-sdmmc-access-on-rk3308.patch
 ---
- .../boot/dts/rockchip/rk3308-rock-s0.dts      | 76 ++++++++++++++++++-
- 1 file changed, 74 insertions(+), 2 deletions(-)
+ arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 79 +++++++---
+ 1 file changed, 61 insertions(+), 18 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
-index 8311af4c8689..ea4b063cb7bd 100644
+index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
 @@ -34,6 +34,34 @@ led-green {
@@ -143,5 +143,5 @@ index 8311af4c8689..ea4b063cb7bd 100644
  };
 
 -- 
-2.43.0
+Armbian
 

patch/kernel/archive/rockchip64-6.16/general-add-panel-simple-dsi.patch

@@ -65,7 +65,7 @@ diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/gpu/drm/panel/Makefile
 +++ b/drivers/gpu/drm/panel/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
+@@ -12,6 +12,7 @@ obj-$(CONFIG_DRM_PANEL_BOE_TV101WUM_NL6) += panel-boe-tv101wum-nl6.o
  obj-$(CONFIG_DRM_PANEL_DSI_CM) += panel-dsi-cm.o
  obj-$(CONFIG_DRM_PANEL_LVDS) += panel-lvds.o
  obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o

patch/kernel/archive/rockchip64-6.16/general-cryptov1-trng.patch

@@ -18,7 +18,7 @@ diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
 index 111111111111..222222222222 100644
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
-@@ -700,6 +700,14 @@ config CRYPTO_DEV_ROCKCHIP
+@@ -694,6 +694,14 @@ config CRYPTO_DEV_ROCKCHIP
  	  This driver interfaces with the hardware crypto accelerator.
  	  Supporting cbc/ecb chainmode, and aes/des/des3_ede cipher mode.
 
@@ -163,15 +163,15 @@ diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rock
 index 111111111111..222222222222 100644
 --- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c
 +++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
-@@ -296,6 +296,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
+@@ -298,6 +298,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
  		goto theend;
  	}
 
 +	mutex_lock(&rkc->lock);
  	rk_ahash_reg_init(areq, rkc);
 
  	while (sg) {
-@@ -330,6 +331,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
+@@ -332,6 +333,7 @@ static int rk_hash_run(struct crypto_engine *engine, void *breq)
  	}
 
  theend:

patch/kernel/archive/rockchip64-6.16/general-disable-mtu-validation.patch

@@ -18,7 +18,7 @@ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/eth
 index 111111111111..222222222222 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5921,27 +5921,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5934,27 +5934,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);

patch/kernel/archive/rockchip64-6.16/general-driver-tm16xx-led-driver.patch

@@ -1,20 +1,18 @@
-From 1f6c39c03f03b131f49d7d4631b1cda6c1f336e0 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Paolo Sabatino <[email protected]>
 Date: Sat, 21 Jun 2025 15:07:40 +0200
-Subject: [PATCH] Add tm16xx led auxiliary display driver
+Subject: Add tm16xx led auxiliary display driver
 
 ---
- .../bindings/auxdisplay/tm16xx.yaml           |  150 +++
- drivers/auxdisplay/Kconfig                    |   10 +
- drivers/auxdisplay/Makefile                   |    1 +
- drivers/auxdisplay/tm16xx.c                   | 1187 +++++++++++++++++
+ Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml |  150 ++
+ drivers/auxdisplay/Kconfig                               |   10 +
+ drivers/auxdisplay/Makefile                              |    1 +
+ drivers/auxdisplay/tm16xx.c                              | 1187 ++++++++++
  4 files changed, 1348 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
- create mode 100644 drivers/auxdisplay/tm16xx.c
 
 diff --git a/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml b/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
 new file mode 100644
-index 000000000000..f3d411f4f4a0
+index 000000000000..111111111111
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/auxdisplay/tm16xx.yaml
 @@ -0,0 +1,150 @@
@@ -169,7 +167,7 @@ index 000000000000..f3d411f4f4a0
 +        };
 +    };
 diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
-index bedc6133f970..4e4bb1a2b131 100644
+index 111111111111..222222222222 100644
 --- a/drivers/auxdisplay/Kconfig
 +++ b/drivers/auxdisplay/Kconfig
 @@ -49,6 +49,16 @@ config HD44780
@@ -190,7 +188,7 @@ index bedc6133f970..4e4bb1a2b131 100644
  	tristate "lcd2s 20x4 character display over I2C console"
  	depends on I2C
 diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile
-index f5c13ed1cd4f..066f452b1e26 100644
+index 111111111111..222222222222 100644
 --- a/drivers/auxdisplay/Makefile
 +++ b/drivers/auxdisplay/Makefile
 @@ -9,6 +9,7 @@ obj-$(CONFIG_CHARLCD)		+= charlcd.o
@@ -203,7 +201,7 @@ index f5c13ed1cd4f..066f452b1e26 100644
  obj-$(CONFIG_LCD2S)		+= lcd2s.o
 diff --git a/drivers/auxdisplay/tm16xx.c b/drivers/auxdisplay/tm16xx.c
 new file mode 100644
-index 000000000000..72c4031f20d1
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/auxdisplay/tm16xx.c
 @@ -0,0 +1,1187 @@
@@ -1395,5 +1393,5 @@ index 000000000000..72c4031f20d1
 +MODULE_ALIAS("spi:tm16xx");
 +MODULE_ALIAS("i2c:tm16xx");
 -- 
-2.43.0
+Armbian
 

patch/kernel/archive/rockchip64-6.16/general-rockchip-overlays.patch

@@ -12,22 +12,19 @@ Signed-off-by: Werner <[email protected]>
  1 file changed, 3 insertions(+)
 
 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index a6461ea411f7..33d4f5e86db0 100644
+index 111111111111..222222222222 100644
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
-@@ -105,10 +105,13 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
-
- # userprogs-always-y is likewise.
+@@ -107,6 +107,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
  userprogs += $(userprogs-always-y) $(userprogs-always-m)
  always-y += $(userprogs-always-y) $(userprogs-always-m)
-
+ 
 +# Overlay targets
 +extra-y                                += $(dtbo-y) $(scr-y) $(dtbotxt-y)
 +
  # Add subdir path
-
+ 
  ifneq ($(obj),.)
- extra-y                := $(addprefix $(obj)/, $(extra-y))
- always-y       := $(addprefix $(obj)/, $(always-y))
 -- 
-Created with Armbian build tools https://github.com/armbian/build
+Armbian
+