rewrite patches

Author: EvilOlaf

patch/kernel/archive/sunxi-6.18/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch

@@ -13,12 +13,10 @@ Subject: Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses
  6 files changed, 547 insertions(+)
 
 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index 291019de59f2..658356028d1f 100644
+index 111111111111..222222222222 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
-@@ -673,6 +673,7 @@ source "drivers/misc/uacce/Kconfig"
- source "drivers/misc/pvpanic/Kconfig"
- source "drivers/misc/mchp_pci1xxxx/Kconfig"
+@@ -675,4 +675,5 @@ source "drivers/misc/mchp_pci1xxxx/Kconfig"
  source "drivers/misc/keba/Kconfig"
  source "drivers/misc/amd-sbi/Kconfig"
  source "drivers/misc/rp1/Kconfig"
@@ -28,9 +26,9 @@ diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
 index 111111111111..222222222222 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
-@@ -76,3 +76,4 @@ obj-$(CONFIG_MCHP_LAN966X_PCI)	+= lan966x-pci.o
- obj-y				+= keba/
+@@ -77,3 +77,4 @@ obj-y				+= keba/
  obj-y				+= amd-sbi/
+ obj-$(CONFIG_MISC_RP1)		+= rp1/
  obj-$(CONFIG_MODEM_POWER)	+= modem-power.o
 +obj-$(CONFIG_SUNXI_ADDR_MGT)    += sunxi-addr/
 diff --git a/drivers/misc/sunxi-addr/Kconfig b/drivers/misc/sunxi-addr/Kconfig

patch/kernel/archive/sunxi-6.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch

@@ -100,21 +100,8 @@ Subject: arm:dts:overlay Add Overlays for sunxi
  arch/arm/boot/dts/allwinner/overlay/sun8i-r40-uart4.dtso         |  22 +
  arch/arm/boot/dts/allwinner/overlay/sun8i-r40-uart5.dtso         |  22 +
  arch/arm/boot/dts/allwinner/overlay/sun8i-r40-uart7.dtso         |  22 +
- 96 files changed, 4174 insertions(+) 
+ 96 files changed, 4174 insertions(+)
 
-
-diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index f71392a55df8..0d5dae7246f7 100644
---- a/arch/arm/boot/dts/allwinner/Makefile
-+++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -279,5 +279,7 @@ dtb-$(CONFIG_MACH_SUN9I) += \
- 	sun9i-a80-cubieboard4.dtb
- dtb-$(CONFIG_MACH_SUNIV) += \
- 	suniv-f1c100s-licheepi-nano.dtb \
- 	suniv-f1c200s-lctech-pi.dtb \
- 	suniv-f1c200s-popstick-v1.1.dtb
-+
-+subdir-y	:= overlay
 diff --git a/arch/arm/boot/dts/allwinner/overlay/Makefile b/arch/arm/boot/dts/allwinner/overlay/Makefile
 new file mode 100644
 index 000000000000..111111111111

patch/kernel/archive/sunxi-6.18/patches.armbian/cb1-overlay.patch

@@ -16,7 +16,8 @@ Subject: cb1-overlay
  arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-spidev1_2.dtso  |  28 +++
  arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-tft35_spi.dtso  |  33 +++
  arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-ws2812.dtso     |  13 ++
- 12 files changed, 374 insertions(+), 2 deletions(-)
+ scripts/Makefile.lib                                              |  11 +
+ 13 files changed, 385 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
 index 111111111111..222222222222 100644
@@ -476,12 +477,10 @@ index 000000000000..111111111111
 +	};
 +};
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 1d581ba5df66..453a87ae4fad 100644
+index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -364,10 +364,19 @@ quiet_cmd_lz4 = LZ4     $@
- 
- quiet_cmd_lz4_with_size = LZ4     $@
+@@ -366,6 +366,15 @@ quiet_cmd_lz4_with_size = LZ4     $@
        cmd_lz4_with_size = { cat $(real-prereqs) | $(LZ4) -l -9 - -; \
                    $(size_append); } > $@
 
@@ -497,11 +496,7 @@ index 1d581ba5df66..453a87ae4fad 100644
  # U-Boot mkimage
  # ---------------------------------------------------------------------------
 
- MKIMAGE := $(srctree)/scripts/mkuboot.sh
- 
-@@ -487,5 +496,7 @@ define filechk_offsets
- 	 echo ""; \
- 	 sed -ne $(sed-offsets) < $<; \
+@@ -489,3 +498,5 @@ define filechk_offsets
  	 echo ""; \
  	 echo "#endif"
  endef

patch/kernel/archive/sunxi-6.18/patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch

@@ -1,4 +1,4 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 
 From: The-going <[email protected]>
 Date: Tue, 1 Feb 2022 19:37:03 +0300
 Subject: drv:gpu:drm:sun4i:sun8i_mixer.c add h3 mixer1

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

@@ -1,14 +1,14 @@
-From 2a8a9e3104ce70230ca67a39fd406d84662e77b2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: The-going <[email protected]>
 Date: Tue, 1 Feb 2022 21:38:26 +0300
 Subject: drv:mfd:axp20x add sysfs interface
 
 ---
- drivers/mfd/axp20x.c | 614 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/mfd/axp20x.c | 614 ++++++++++
  1 file changed, 614 insertions(+)
 
 diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
-index 96a675f525cd..79640e22efa7 100644
+index 111111111111..222222222222 100644
 --- a/drivers/mfd/axp20x.c
 +++ b/drivers/mfd/axp20x.c
 @@ -85,6 +85,7 @@ static const struct regmap_range axp20x_volatile_ranges[] = {
@@ -19,7 +19,7 @@ index 96a675f525cd..79640e22efa7 100644
  	regmap_reg_range(AXP20X_FG_RES, AXP20X_RDC_L),
  };
 
-@@ -1302,6 +1303,611 @@ static int axp20x_power_off(struct sys_off_data *data)
+@@ -1301,6 +1302,611 @@ static int axp20x_power_off(struct sys_off_data *data)
  	return NOTIFY_DONE;
  }
 
@@ -631,7 +631,7 @@ index 96a675f525cd..79640e22efa7 100644
  int axp20x_match_device(struct axp20x_dev *axp20x)
  {
  	struct device *dev = axp20x->dev;
-@@ -1502,6 +2108,10 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
+@@ -1501,6 +2107,10 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
  	if (axp20x->variant != AXP288_ID)
  		devm_register_power_off_handler(axp20x->dev, axp20x_power_off, axp20x);
 
@@ -642,7 +642,7 @@ index 96a675f525cd..79640e22efa7 100644
  	dev_info(axp20x->dev, "AXP20X driver loaded\n");
 
  	return 0;
-@@ -1510,6 +2120,10 @@ EXPORT_SYMBOL(axp20x_device_probe);
+@@ -1509,6 +2119,10 @@ EXPORT_SYMBOL(axp20x_device_probe);
 
  void axp20x_device_remove(struct axp20x_dev *axp20x)
  {
@@ -654,5 +654,5 @@ index 96a675f525cd..79640e22efa7 100644
  	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
  }
 -- 
-2.51.0
+Armbian
 

patch/kernel/archive/sunxi-6.18/patches.megous/fixes-6.18/0019-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
-@@ -2520,6 +2520,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2536,6 +2536,7 @@ static struct usb_serial_driver option_1port_device = {
  #ifdef CONFIG_PM
  	.suspend           = usb_wwan_suspend,
  	.resume            = usb_wwan_resume,