rockchip64-6.18: rewrite kernel patches against 6.18.30

Author: EvilOlaf

patch/kernel/archive/rockchip64-6.18/general-add-miniDP-virtual-extcon.patch

@@ -1,7 +1,7 @@
-From f0d2b53fcfd0151999f8f7041c3f4a19ac77b191 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony <tonymckahan@gmail.com>
 Date: Wed, 3 Mar 2021 07:59:25 +0100
-Subject: [PATCH] RK3399 Typec DP (#2676)
+Subject: RK3399 Typec DP (#2676)
 
 > X-Git-Archeology: > recovered message: > * RK3399 NanoPC-T4 Add Type-C alt mode DP
 > X-Git-Archeology: > recovered message: > * rk3399 rockpi 4C add mini-DP (WIP)
@@ -55,12 +55,11 @@ Subject: [PATCH] RK3399 Typec DP (#2676)
 ---
  drivers/extcon/Kconfig                  |  10 +
  drivers/extcon/Makefile                 |   1 +
- drivers/extcon/extcon-usbc-virtual-pd.c | 285 ++++++++++++++++++++++++
+ drivers/extcon/extcon-usbc-virtual-pd.c | 285 ++++++++++
  3 files changed, 296 insertions(+)
- create mode 100644 drivers/extcon/extcon-usbc-virtual-pd.c
 
 diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
-index aec46bf03..dd755b952 100644
+index 111111111111..222222222222 100644
 --- a/drivers/extcon/Kconfig
 +++ b/drivers/extcon/Kconfig
 @@ -227,4 +227,14 @@ config EXTCON_RTK_TYPE_C
@@ -79,7 +78,7 @@ index aec46bf03..dd755b952 100644
 +
  endif
 diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
-index 6482f2bfd..979770183 100644
+index 111111111111..222222222222 100644
 --- a/drivers/extcon/Makefile
 +++ b/drivers/extcon/Makefile
 @@ -28,3 +28,4 @@ obj-$(CONFIG_EXTCON_USB_GPIO)	+= extcon-usb-gpio.o
@@ -89,7 +88,7 @@ index 6482f2bfd..979770183 100644
 +obj-$(CONFIG_EXTCON_USBC_VIRTUAL_PD) += extcon-usbc-virtual-pd.o
 diff --git a/drivers/extcon/extcon-usbc-virtual-pd.c b/drivers/extcon/extcon-usbc-virtual-pd.c
 new file mode 100644
-index 000000000..1040c98db
+index 000000000000..111111111111
 --- /dev/null
 +++ b/drivers/extcon/extcon-usbc-virtual-pd.c
 @@ -0,0 +1,285 @@
@@ -379,5 +378,5 @@ index 000000000..1040c98db
 +MODULE_DESCRIPTION("Type-C Virtual PD extcon driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.54.0
+Armbian
 

patch/kernel/archive/rockchip64-6.18/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
-@@ -5842,27 +5842,15 @@ static void stmmac_set_rx_mode(struct net_device *dev)
+@@ -5851,27 +5851,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.18/general-possibility-of-disabling-rk808-rtc.patch

@@ -25,7 +25,7 @@ diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
 index 111111111111..222222222222 100644
 --- a/drivers/mfd/mfd-core.c
 +++ b/drivers/mfd/mfd-core.c
-@@ -213,7 +213,7 @@ static int mfd_add_device(struct device *parent, int id,
+@@ -223,7 +223,7 @@ static int mfd_add_device(struct device *parent, int id,
 
  match:
  		if (!pdev->dev.of_node)

patch/kernel/archive/rockchip64-6.18/rk3399-usbc-Revert-usb-typec-tcpm-unregister-existing-source-cap.patch

@@ -13,7 +13,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
 index 111111111111..222222222222 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -3114,7 +3114,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3119,7 +3119,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
  {
  	struct usb_power_delivery_desc desc = { port->negotiated_rev };
  	struct usb_power_delivery_capabilities_desc caps = { };
@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
 
  	if (!port->partner_pd)
  		port->partner_pd = usb_power_delivery_register(NULL, &desc);
-@@ -3124,11 +3124,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3129,11 +3129,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
  	memcpy(caps.pdo, port->source_caps, sizeof(u32) * port->nr_source_caps);
  	caps.role = TYPEC_SOURCE;
 

patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Fix-PD-devices-capabilities-registrat.patch

@@ -18,7 +18,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
 index 111111111111..222222222222 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -3115,15 +3115,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3120,15 +3120,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
  	struct usb_power_delivery_desc desc = { port->negotiated_rev };
  	struct usb_power_delivery_capabilities_desc caps = { };
  	struct usb_power_delivery_capabilities *cap;
@@ -45,7 +45,7 @@ index 111111111111..222222222222 100644
  	cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
  	if (IS_ERR(cap))
  		return PTR_ERR(cap);
-@@ -3138,15 +3145,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port)
+@@ -3143,15 +3150,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port)
  	struct usb_power_delivery_desc desc = { port->negotiated_rev };
  	struct usb_power_delivery_capabilities_desc caps = { };
  	struct usb_power_delivery_capabilities *cap;
@@ -72,7 +72,7 @@ index 111111111111..222222222222 100644
  	cap = usb_power_delivery_register_capabilities(port->partner_pd, &caps);
  	if (IS_ERR(cap))
  		return PTR_ERR(cap);
-@@ -7209,10 +7223,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -7216,10 +7230,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
  		port->pds[i] = usb_power_delivery_register(port->dev, &desc);
  		if (IS_ERR(port->pds[i])) {
  			ret = PTR_ERR(port->pds[i]);

patch/kernel/archive/rockchip64-6.18/rk3399-usbc-usb-typec-tcpm-Unregister-altmodes-before-registerin.patch

@@ -37,7 +37,7 @@ diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
 index 111111111111..222222222222 100644
 --- a/drivers/usb/typec/tcpm/tcpm.c
 +++ b/drivers/usb/typec/tcpm/tcpm.c
-@@ -1863,6 +1863,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
+@@ -1868,6 +1868,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
  		return;
 
  	for (i = 0; i < modep->altmodes; i++) {

patch/kernel/archive/rockchip64-6.18/temporary-workaround-dma-reset.patch

@@ -17,7 +17,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
-@@ -3059,8 +3059,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
+@@ -3063,8 +3063,8 @@ static int stmmac_init_dma_engine(struct stmmac_priv *priv)
 
  	ret = stmmac_reset(priv, priv->ioaddr);
  	if (ret) {