diff --git a/patch/kernel/archive/meson64-6.15/board-bananapi-cm4-cm4io.patch b/patch/kernel/archive/meson64-6.15/board-bananapi-cm4-cm4io.patch
index 3990b4e33..6eff7071b 100644
--- a/patch/kernel/archive/meson64-6.15/board-bananapi-cm4-cm4io.patch
+++ b/patch/kernel/archive/meson64-6.15/board-bananapi-cm4-cm4io.patch
@@ -62,7 +62,7 @@ index 111111111111..222222222222 100644
  	chosen {
  		stdout-path = "serial0:115200n8";
  	};
-@@ -369,8 +378,7 @@ &uart_A {
+@@ -365,8 +374,7 @@ &uart_A {
  
  	bluetooth {
  		compatible = "realtek,rtl8822cs-bt";
@@ -89,7 +89,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
-@@ -303,8 +303,10 @@ &sd_emmc_a {
+@@ -299,8 +299,10 @@ &sd_emmc_a {
  	#size-cells = <0>;
  
  	bus-width = <4>;
@@ -101,7 +101,7 @@ index 111111111111..222222222222 100644
  
  	non-removable;
  	disable-wp;
-@@ -312,10 +314,13 @@ &sd_emmc_a {
+@@ -308,10 +310,13 @@ &sd_emmc_a {
  	/* WiFi firmware requires power in suspend */
  	keep-power-in-suspend;
  
diff --git a/patch/kernel/archive/meson64-6.15/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch b/patch/kernel/archive/meson64-6.15/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
index a7fc8f521..7fb54929f 100644
--- a/patch/kernel/archive/meson64-6.15/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
+++ b/patch/kernel/archive/meson64-6.15/board-bananapim5-001-sd-use-270-mmc-clock-phase-via-dt.patch
@@ -22,7 +22,7 @@ index 111111111111..222222222222 100644
  
  / {
  	adc-keys {
-@@ -394,6 +395,8 @@ &sd_emmc_b {
+@@ -392,6 +393,8 @@ &sd_emmc_b {
  	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
  	vmmc-supply = <&tflash_vdd>;
  	vqmmc-supply = <&vddio_c>;
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
  };
  
  /* eMMC */
-@@ -413,6 +416,8 @@ &sd_emmc_c {
+@@ -411,6 +414,8 @@ &sd_emmc_c {
  	mmc-pwrseq = <&emmc_pwrseq>;
  	vmmc-supply = <&vddao_3v3>;
  	vqmmc-supply = <&emmc_1v8>;
diff --git a/patch/kernel/archive/meson64-6.15/board-bananapism1-add-uart_A-and-AO_B.patch b/patch/kernel/archive/meson64-6.15/board-bananapism1-add-uart_A-and-AO_B.patch
index 5f66a931a..92f065489 100644
--- a/patch/kernel/archive/meson64-6.15/board-bananapism1-add-uart_A-and-AO_B.patch
+++ b/patch/kernel/archive/meson64-6.15/board-bananapism1-add-uart_A-and-AO_B.patch
@@ -69,7 +69,7 @@ index 111111111111..222222222222 100644
  		ethernet0 = &ethmac;
  	};
  
-@@ -426,6 +427,12 @@ &uart_AO {
+@@ -424,6 +425,12 @@ &uart_AO {
  	pinctrl-names = "default";
  };
  
diff --git a/patch/kernel/archive/meson64-6.15/board-nanopi-k2-enable-emmc.patch b/patch/kernel/archive/meson64-6.15/board-nanopi-k2-enable-emmc.patch
index 6405bd43c..ed994da9d 100644
--- a/patch/kernel/archive/meson64-6.15/board-nanopi-k2-enable-emmc.patch
+++ b/patch/kernel/archive/meson64-6.15/board-nanopi-k2-enable-emmc.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/b
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
-@@ -362,7 +362,7 @@ &sd_emmc_b {
+@@ -360,7 +360,7 @@ &sd_emmc_b {
  
  /* eMMC */
  &sd_emmc_c {
@@ -21,7 +21,7 @@ index 111111111111..222222222222 100644
  	pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>;
  	pinctrl-1 = <&emmc_clk_gate_pins>;
  	pinctrl-names = "default", "clk-gate";
-@@ -372,8 +372,6 @@ &sd_emmc_c {
+@@ -370,8 +370,6 @@ &sd_emmc_c {
  	non-removable;
  	disable-wp;
  	cap-mmc-highspeed;
diff --git a/patch/kernel/archive/meson64-6.15/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.15/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch
index d249e170c..d1a146d69 100644
--- a/patch/kernel/archive/meson64-6.15/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch
+++ b/patch/kernel/archive/meson64-6.15/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch
@@ -19,7 +19,7 @@ diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
 index 111111111111..222222222222 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5977,7 +5977,7 @@ static const struct usb_device_id hub_id_table[] = {
+@@ -5975,7 +5975,7 @@ static const struct usb_device_id hub_id_table[] = {
  			| USB_DEVICE_ID_MATCH_INT_CLASS,
        .idVendor = USB_VENDOR_GENESYS_LOGIC,
        .bInterfaceClass = USB_CLASS_HUB,
diff --git a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
index 1263cda9a..af9ae2b23 100644
--- a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
+++ b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch
@@ -87,7 +87,7 @@ index 111111111111..222222222222 100644
  &pwm_AO_cd {
  	pinctrl-0 = <&pwm_ao_d_e_pins>;
  	pinctrl-names = "default";
-@@ -417,3 +457,11 @@ &uart_AO {
+@@ -413,3 +453,11 @@ &uart_AO {
  &usb {
  	status = "okay";
  };
diff --git a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch
index 76ee25bd6..3e6be0522 100644
--- a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch
+++ b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-emmc.patch
@@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -413,7 +413,7 @@ &sd_emmc_c {
+@@ -409,7 +409,7 @@ &sd_emmc_c {
  	cap-mmc-highspeed;
  	mmc-ddr-1_8v;
  	mmc-hs200-1_8v;
diff --git a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
index 6ced91999..d7aea9f2b 100644
--- a/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
+++ b/patch/kernel/archive/meson64-6.15/board-radxa-zero-dts-slow-down-sdio-for-working-wifi.patch
@@ -15,7 +15,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
-@@ -365,7 +365,7 @@ &sd_emmc_a {
+@@ -361,7 +361,7 @@ &sd_emmc_a {
  
  	bus-width = <4>;
  	cap-sd-highspeed;
diff --git a/patch/kernel/archive/meson64-6.15/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.15/board-t95z-add-rc-remote-keymap.patch
index 873e7917e..5ffff2291 100644
--- a/patch/kernel/archive/meson64-6.15/board-t95z-add-rc-remote-keymap.patch
+++ b/patch/kernel/archive/meson64-6.15/board-t95z-add-rc-remote-keymap.patch
@@ -34,7 +34,7 @@ diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentat
 index 111111111111..222222222222 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -1461,6 +1461,8 @@ patternProperties:
+@@ -1471,6 +1471,8 @@ patternProperties:
      description: Sundance DSP Inc.
    "^sunplus,.*":
      description: Sunplus Technology Co., Ltd.
@@ -47,8 +47,8 @@ diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefi
 index 111111111111..222222222222 100644
 --- a/drivers/media/rc/keymaps/Makefile
 +++ b/drivers/media/rc/keymaps/Makefile
-@@ -108,6 +108,7 @@ obj-$(CONFIG_RC_MAP) += \
- 			rc-reddo.o \
+@@ -109,6 +109,7 @@ obj-$(CONFIG_RC_MAP) += \
+ 			rc-siemens-gigaset-rc20.o \
  			rc-snapstream-firefly.o \
  			rc-streamzap.o \
 +			rc-sunvell-t95z-plus.o \
@@ -140,8 +140,8 @@ diff --git a/include/media/rc-map.h b/include/media/rc-map.h
 index 111111111111..222222222222 100644
 --- a/include/media/rc-map.h
 +++ b/include/media/rc-map.h
-@@ -315,6 +315,7 @@ struct rc_map *rc_map_get(const char *name);
- #define RC_MAP_REDDO                     "rc-reddo"
+@@ -316,6 +316,7 @@ struct rc_map *rc_map_get(const char *name);
+ #define RC_MAP_SIEMENS_GIGASET_RC20      "rc-siemens-gigaset-rc20"
  #define RC_MAP_SNAPSTREAM_FIREFLY        "rc-snapstream-firefly"
  #define RC_MAP_STREAMZAP                 "rc-streamzap"
 +#define RC_MAP_SUNVELL_T95Z_PLUS         "rc-sunvell-t95z-plus"
diff --git a/patch/kernel/archive/meson64-6.15/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/meson64-6.15/drv-spi-spidev-remove-warnings.patch
index 1863bd8d8..7c50ec764 100644
--- a/patch/kernel/archive/meson64-6.15/drv-spi-spidev-remove-warnings.patch
+++ b/patch/kernel/archive/meson64-6.15/drv-spi-spidev-remove-warnings.patch
@@ -20,7 +20,7 @@ index 111111111111..222222222222 100644
  	{ .name = /* cisco */ "spi-petra" },
  	{ .name = /* dh */ "dhcom-board" },
  	{ .name = /* elgin */ "jg10309-01" },
-@@ -734,6 +735,7 @@ static int spidev_of_check(struct device *dev)
+@@ -735,6 +736,7 @@ static int spidev_of_check(struct device *dev)
  }
  
  static const struct of_device_id spidev_dt_ids[] = {
diff --git a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch
index d24db3cbb..d5443b7aa 100644
--- a/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch
+++ b/patch/kernel/archive/meson64-6.15/general-input-touchscreen-Add-D-WAV-Multitouch.patch
@@ -16,7 +16,7 @@ diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
 index 111111111111..222222222222 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -1483,4 +1483,10 @@
+@@ -1520,4 +1520,10 @@
  #define USB_VENDOR_ID_SIGNOTEC			0x2133
  #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011	0x0018
  
@@ -31,7 +31,7 @@ diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
 index 111111111111..222222222222 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
-@@ -892,6 +892,9 @@ static const struct hid_device_id hid_ignore_list[] = {
+@@ -902,6 +902,9 @@ static const struct hid_device_id hid_ignore_list[] = {
  #endif
  	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_HP_5MP_CAMERA_5473) },
@@ -45,7 +45,7 @@ diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconf
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Kconfig
 +++ b/drivers/input/touchscreen/Kconfig
-@@ -1390,4 +1390,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
+@@ -1403,4 +1403,14 @@ config TOUCHSCREEN_HIMAX_HX83112B
  	  To compile this driver as a module, choose M here: the
  	  module will be called himax_hx83112b.
  
@@ -64,7 +64,7 @@ diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Make
 index 111111111111..222222222222 100644
 --- a/drivers/input/touchscreen/Makefile
 +++ b/drivers/input/touchscreen/Makefile
-@@ -116,4 +116,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
+@@ -117,4 +117,5 @@ obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o
  obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o
  obj-$(CONFIG_TOUCHSCREEN_IQS7211)	+= iqs7211.o
  obj-$(CONFIG_TOUCHSCREEN_ZINITIX)	+= zinitix.o
diff --git a/patch/kernel/archive/meson64-6.15/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch b/patch/kernel/archive/meson64-6.15/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
index da5343474..80a613dbf 100644
--- a/patch/kernel/archive/meson64-6.15/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
+++ b/patch/kernel/archive/meson64-6.15/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch
@@ -23,7 +23,7 @@ index 111111111111..222222222222 100644
  
  / {
  	compatible = "amlogic,meson-axg";
-@@ -1922,6 +1923,7 @@ sd_emmc_b: mmc@5000 {
+@@ -1938,6 +1939,7 @@ sd_emmc_b: mmc@5000 {
  					<&clkc CLKID_SD_EMMC_B_CLK0>,
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";
@@ -31,7 +31,7 @@ index 111111111111..222222222222 100644
  				resets = <&reset RESET_SD_EMMC_B>;
  			};
  
-@@ -1935,6 +1937,7 @@ sd_emmc_c: mmc@7000 {
+@@ -1951,6 +1953,7 @@ sd_emmc_c: mmc@7000 {
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";
  				resets = <&reset RESET_SD_EMMC_C>;
diff --git a/patch/kernel/archive/meson64-6.15/general-meson64-overlays.patch b/patch/kernel/archive/meson64-6.15/general-meson64-overlays.patch
index 43c434b22..9f388172e 100644
--- a/patch/kernel/archive/meson64-6.15/general-meson64-overlays.patch
+++ b/patch/kernel/archive/meson64-6.15/general-meson64-overlays.patch
@@ -12,7 +12,7 @@ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
 index 111111111111..222222222222 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -75,6 +75,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
+@@ -70,6 +70,9 @@ always-y += $(hostprogs-always-y) $(hostprogs-always-m)
  userprogs += $(userprogs-always-y) $(userprogs-always-m)
  always-y += $(userprogs-always-y) $(userprogs-always-m)
  
diff --git a/patch/kernel/archive/meson64-6.15/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.15/general-spi-nor-add-support-for-XT25F128B.patch
index b4c4e24ce..f7f370f3d 100644
--- a/patch/kernel/archive/meson64-6.15/general-spi-nor-add-support-for-XT25F128B.patch
+++ b/patch/kernel/archive/meson64-6.15/general-spi-nor-add-support-for-XT25F128B.patch
@@ -46,7 +46,7 @@ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
 index 111111111111..222222222222 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -1981,6 +1981,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+@@ -1954,6 +1954,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
  	&spi_nor_sst,
  	&spi_nor_winbond,
  	&spi_nor_xmc,
diff --git a/patch/kernel/archive/meson64-6.15/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/patch/kernel/archive/meson64-6.15/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch
index 9d1c1ebdd..31284ff1b 100644
--- a/patch/kernel/archive/meson64-6.15/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch
+++ b/patch/kernel/archive/meson64-6.15/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch
@@ -90,7 +90,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/bo
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-@@ -260,7 +260,11 @@ &sd_emmc_a {
+@@ -258,7 +258,11 @@ &sd_emmc_a {
  
  	bus-width = <4>;
  	cap-sd-highspeed;
@@ -107,7 +107,7 @@ diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi
-@@ -121,7 +121,11 @@ &sd_emmc_a {
+@@ -119,7 +119,11 @@ &sd_emmc_a {
  
  	bus-width = <4>;
  	cap-sd-highspeed;