sunxi-7.0: rewrite kernel patches against 7.0.7

Author: EvilOlaf

patch/kernel/archive/sunxi-7.0/patches.megous/a711-7.0/0003-mmc-add-delay-after-power-class-selection.patch

@@ -15,7 +15,7 @@ diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
 index 111111111111..222222222222 100644
 --- a/drivers/mmc/core/mmc.c
 +++ b/drivers/mmc/core/mmc.c
-@@ -1851,6 +1851,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
+@@ -1863,6 +1863,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
  	 */
  	mmc_select_powerclass(card);
 
@@ -24,7 +24,7 @@ index 111111111111..222222222222 100644
  	/*
  	 * Enable HPI feature (if supported)
  	 */
-@@ -1869,6 +1871,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
+@@ -1881,6 +1883,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
  		}
  	}
 

patch/kernel/archive/sunxi-7.0/patches.megous/fixes-7.0/0018-usb-serial-option-add-reset_resume-callback-for-WWAN.patch

@@ -20,7 +20,7 @@ diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
 index 111111111111..222222222222 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2549,6 +2549,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2553,6 +2553,7 @@ static struct usb_serial_driver option_1port_device = {
  #ifdef CONFIG_PM
  	.suspend           = usb_wwan_suspend,
  	.resume            = usb_wwan_resume,

patch/kernel/archive/sunxi-7.0/patches.megous/tcpm-7.0/0001-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
-@@ -3127,7 +3127,7 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3132,7 +3132,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);
-@@ -3137,11 +3137,6 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3142,11 +3142,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/sunxi-7.0/patches.megous/tcpm-7.0/0003-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
-@@ -1876,6 +1876,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
+@@ -1881,6 +1881,9 @@ static void tcpm_register_partner_altmodes(struct tcpm_port *port)
  		return;
 
  	for (i = 0; i < modep->altmodes; i++) {

patch/kernel/archive/sunxi-7.0/patches.megous/tcpm-7.0/0004-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
-@@ -3131,15 +3131,22 @@ static int tcpm_register_source_caps(struct tcpm_port *port)
+@@ -3136,15 +3136,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);
-@@ -3154,15 +3161,22 @@ static int tcpm_register_sink_caps(struct tcpm_port *port)
+@@ -3159,15 +3166,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);
-@@ -7225,10 +7239,17 @@ static int tcpm_port_register_pd(struct tcpm_port *port)
+@@ -7232,10 +7246,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/sunxi-7.0/patches.megous/tcpm-7.0/0005-usb-typec-tcpm-Improve-logs.patch

@@ -14,7 +14,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
-@@ -1014,10 +1014,13 @@ static int tcpm_pd_transmit(struct tcpm_port *port,
+@@ -1019,10 +1019,13 @@ static int tcpm_pd_transmit(struct tcpm_port *port,
  		break;
  	}
 
@@ -30,7 +30,7 @@ index 111111111111..222222222222 100644
 
  	reinit_completion(&port->tx_complete);
  	ret = port->tcpc->pd_transmit(port->tcpc, tx_sop_type, msg, negotiated_rev);
-@@ -3814,6 +3817,10 @@ void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg,
+@@ -3819,6 +3822,10 @@ void tcpm_pd_receive(struct tcpm_port *port, const struct pd_message *msg,
  		     enum tcpm_transmit_type rx_sop_type)
  {
  	struct pd_rx_event *event;
@@ -41,7 +41,7 @@ index 111111111111..222222222222 100644
 
  	event = kzalloc_obj(*event, GFP_ATOMIC);
  	if (!event)
-@@ -6170,7 +6177,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
+@@ -6177,7 +6184,7 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1,
 
  static void _tcpm_pd_vbus_on(struct tcpm_port *port)
  {
@@ -50,7 +50,7 @@ index 111111111111..222222222222 100644
  	port->vbus_present = true;
  	/*
  	 * When vbus_present is true i.e. Voltage at VBUS is greater than VSAFE5V implicitly
-@@ -6260,7 +6267,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
+@@ -6267,7 +6274,7 @@ static void _tcpm_pd_vbus_on(struct tcpm_port *port)
 
  static void _tcpm_pd_vbus_off(struct tcpm_port *port)
  {