sunxi-6.12: reextract armbian patches for v6.12.43

patch/kernel/archive/sunxi-6.12/patches.armbian/Sound-for-H616-H618-Allwinner-SOCs.patch

@@ -1,4 +1,4 @@
-From 32c434af8b723ae3fb92e751b6ad2013205531ac Mon Sep 17 00:00:00 2001
+From 8ff257c4afb9993b36a162b2e2981940a0e8bba5 Mon Sep 17 00:00:00 2001
 From: Stephen Graf <stephen.graf@gmail.com>
 Date: Thu, 9 May 2024 20:59:34 -0700
 Subject: Sound for H616, H618 Allwinner SOCs
@@ -294,10 +294,10 @@ index 775bb38c2ed4..eb879a37bcda 100644
  obj-$(CONFIG_SND_SOC)	+= ti/
  obj-$(CONFIG_SND_SOC)	+= uniphier/
 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 20248a29d167..7396493831d3 100644
+index 4ac870c2dafa..c9e646ed9bfd 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
-@@ -2643,6 +2643,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
+@@ -2646,6 +2646,7 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
  {
  	struct device *dev = component->dev;
  	struct snd_soc_dai *dai;
@@ -305,7 +305,7 @@ index 20248a29d167..7396493831d3 100644
  
  	lockdep_assert_held(&client_mutex);
  
-@@ -2671,6 +2672,30 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
+@@ -2674,6 +2675,30 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
  	if (!dai->name)
  		return NULL;
  
@@ -5435,5 +5435,5 @@ index 000000000000..a9cffa0d859b
 +
 +#endif /* __SND_SUNXI_MACH_UTILS_H */
 -- 
-2.35.3
+2.43.0
 

patch/kernel/archive/sunxi-6.12/patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch

@@ -1,4 +1,4 @@
-From b817b4ecc61886825d711c826d00d6198f404fd0 Mon Sep 17 00:00:00 2001
+From a8b0c23520df4762b4ebc8ccd67e4e67f7f9a7a0 Mon Sep 17 00:00:00 2001
 From: The-going <48602507+The-going@users.noreply.github.com>
 Date: Tue, 1 Feb 2022 21:38:26 +0300
 Subject: drv:mfd:axp20x add sysfs interface
@@ -8,7 +8,7 @@ Subject: drv:mfd:axp20x add sysfs interface
  1 file changed, 614 insertions(+)
 
 diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
-index 3bb4a1b1f156..ea2c5fb9a109 100644
+index 9d8ed24b6b60..a867b2637f3e 100644
 --- a/drivers/mfd/axp20x.c
 +++ b/drivers/mfd/axp20x.c
 @@ -84,6 +84,7 @@ static const struct regmap_range axp20x_volatile_ranges[] = {
@@ -19,7 +19,7 @@ index 3bb4a1b1f156..ea2c5fb9a109 100644
  	regmap_reg_range(AXP20X_FG_RES, AXP20X_RDC_L),
  };
  
-@@ -1281,6 +1282,611 @@ static int axp20x_power_off(struct sys_off_data *data)
+@@ -1282,6 +1283,611 @@ static int axp20x_power_off(struct sys_off_data *data)
  	return NOTIFY_DONE;
  }
  
@@ -631,7 +631,7 @@ index 3bb4a1b1f156..ea2c5fb9a109 100644
  int axp20x_match_device(struct axp20x_dev *axp20x)
  {
  	struct device *dev = axp20x->dev;
-@@ -1478,6 +2084,10 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
+@@ -1479,6 +2085,10 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
  					      SYS_OFF_PRIO_DEFAULT,
  					      axp20x_power_off, axp20x);
  
@@ -642,7 +642,7 @@ index 3bb4a1b1f156..ea2c5fb9a109 100644
  	dev_info(axp20x->dev, "AXP20X driver loaded\n");
  
  	return 0;
-@@ -1486,6 +2096,10 @@ EXPORT_SYMBOL(axp20x_device_probe);
+@@ -1487,6 +2097,10 @@ EXPORT_SYMBOL(axp20x_device_probe);
  
  void axp20x_device_remove(struct axp20x_dev *axp20x)
  {

patch/kernel/archive/sunxi-6.12/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch

@@ -1,4 +1,4 @@
-From 7da6a97c082732673a9ef8a723af9a387e7c6bfd Mon Sep 17 00:00:00 2001
+From b985d251e3871440761ca114a727f6746000f854 Mon Sep 17 00:00:00 2001
 From: The-going <48602507+The-going@users.noreply.github.com>
 Date: Wed, 2 Feb 2022 20:08:50 +0300
 Subject: drv:usb:gadget:composite rename gadget serial console manufacturer
@@ -10,10 +10,10 @@ to the Armbian brand.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
-index 301a435b9ee3..82d415025bd3 100644
+index 460a102c1419..f339871b7b6d 100644
 --- a/drivers/usb/gadget/composite.c
 +++ b/drivers/usb/gadget/composite.c
-@@ -2775,7 +2775,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
+@@ -2780,7 +2780,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue);
  
  static char *composite_default_mfr(struct usb_gadget *gadget)
  {
@@ -23,5 +23,5 @@ index 301a435b9ee3..82d415025bd3 100644
  }
  
 -- 
-2.35.3
+2.43.0
 

patch/kernel/archive/sunxi-6.12/patches.megous/leds-axp20x-Support-charger-LED-on-AXP20x-like-PMICs.patch

@@ -1,4 +1,4 @@
-From 35047aefada63441a1df81ad06b769880ddacaf8 Mon Sep 17 00:00:00 2001
+From 8bec6c9f7661cb8bd91f765b1189fa01602c57a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
 Date: Thu, 4 Feb 2021 00:55:20 +0100
 Subject: leds: axp20x: Support charger LED on AXP20x like PMICs
@@ -327,10 +327,10 @@ index 000000000000..e2877af1032a
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:leds-axp20x");
 diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
-index 378092903971..b9c040f5e1b6 100644
+index cbf1029d0333..5e53600532fc 100644
 --- a/drivers/mfd/axp20x.c
 +++ b/drivers/mfd/axp20x.c
-@@ -1196,6 +1196,9 @@ static const struct mfd_cell axp813_cells[] = {
+@@ -1197,6 +1197,9 @@ static const struct mfd_cell axp813_cells[] = {
  		.num_resources	= ARRAY_SIZE(axp803_usb_power_supply_resources),
  		.resources	= axp803_usb_power_supply_resources,
  		.of_compatible	= "x-powers,axp813-usb-power-supply",

patch/kernel/archive/sunxi-6.12/patches.megous/mfd-axp20x-Add-battery-IRQ-resources.patch

@@ -1,4 +1,4 @@
-From 1174f846ec36a9c2119d6e9fc59744d5c967cd66 Mon Sep 17 00:00:00 2001
+From fc6a34de3ebe43e301b03436e0e8d4950ebfcbb4 Mon Sep 17 00:00:00 2001
 From: Samuel Holland <samuel@sholland.org>
 Date: Sat, 29 Feb 2020 01:01:58 -0600
 Subject: mfd: axp20x: Add battery IRQ resources
@@ -9,7 +9,7 @@ Signed-off-by: Samuel Holland <samuel@sholland.org>
  1 file changed, 36 insertions(+)
 
 diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
-index b9c040f5e1b6..b2d8edae84f5 100644
+index 5e53600532fc..e531ae10f5db 100644
 --- a/drivers/mfd/axp20x.c
 +++ b/drivers/mfd/axp20x.c
 @@ -302,6 +302,15 @@ static const struct resource axp20x_ac_power_supply_resources[] = {
@@ -79,7 +79,7 @@ index b9c040f5e1b6..b2d8edae84f5 100644
  	}, {
  		.name		= "axp20x-regulator",
  	}, {
-@@ -1126,6 +1158,8 @@ static const struct mfd_cell axp803_cells[] = {
+@@ -1127,6 +1159,8 @@ static const struct mfd_cell axp803_cells[] = {
  	}, {
  		.name		= "axp20x-battery-power-supply",
  		.of_compatible	= "x-powers,axp813-battery-power-supply",
@@ -88,7 +88,7 @@ index b9c040f5e1b6..b2d8edae84f5 100644
  	}, {
  		.name		= "axp20x-ac-power-supply",
  		.of_compatible	= "x-powers,axp813-ac-power-supply",
-@@ -1186,6 +1220,8 @@ static const struct mfd_cell axp813_cells[] = {
+@@ -1187,6 +1221,8 @@ static const struct mfd_cell axp813_cells[] = {
  	}, {
  		.name		= "axp20x-battery-power-supply",
  		.of_compatible	= "x-powers,axp813-battery-power-supply",

patch/kernel/archive/sunxi-6.12/patches.megous/usb-serial-option-add-reset_resume-callback-for-WWAN-devices.patch

@@ -1,4 +1,4 @@
-From 4aedbc5d3a46fac3e7e175e018e7d611f1ec14ef Mon Sep 17 00:00:00 2001
+From af05b209dd4df2405466afb21d7de0fe36b96dce Mon Sep 17 00:00:00 2001
 From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
 Date: Tue, 20 Sep 2022 20:34:57 -0400
 Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -17,10 +17,10 @@ However the rest of the patch is not needed/already upstreamed.
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 147ca50c94be..6e9b57412a14 100644
+index e5cd33093423..735ff1caea88 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2479,6 +2479,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2481,6 +2481,7 @@ static struct usb_serial_driver option_1port_device = {
  #ifdef CONFIG_PM
  	.suspend           = usb_wwan_suspend,
  	.resume            = usb_wwan_resume,