Bump meson64 edge from 6.7 to 6.8 (#6454)

* Bump meson64 edge from 6.7 to 6.8

 Changes to be committed:
	modified:   config/sources/families/include/meson64_common.inc
	renamed:    patch/kernel/archive/meson64-6.7 -> patch/kernel/archive/meson64-6.8
	modified:   patch/kernel/archive/meson64-6.8/board-bananapi-cm4-cm4io-fixes.patch
	modified:   patch/kernel/archive/meson64-6.8/general-input-touchscreen-Add-D-WAV-Multitouch.patch
	new file:   patch/kernel/archive/meson64-6.8/kernel-6.8-tools-cgroup-makefile.patch

* updates from rewrite-kernel-patches

* updates from rewrite-kernel-config

config/sources/families/include/meson64_common.inc

@@ -45,7 +45,7 @@ case $BRANCH in
 		declare -g KERNEL_MAJOR_MINOR="6.6"
 		;;
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.7"
+		declare -g KERNEL_MAJOR_MINOR="6.8"
 		;;
 
 esac

patch/kernel/archive/meson64-6.8/board-bananapi-cm4-cm4io-fixes.patch

@@ -44,16 +44,16 @@ index 13d478f9c891..a7d460e46611 100644
  	};
  
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
-index 995ce10d5c81..bc871f6a05c6 100644
+index 08c33ec7e9f1..528741fcc0ec 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
 @@ -369,8 +369,8 @@ &uart_A {
  
  	bluetooth {
  		compatible = "realtek,rtl8822cs-bt";
--		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
+-		enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
 -		host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
-+		enable-gpios  = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
++		enable-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
 +		//host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
  		device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
  	};

patch/kernel/archive/meson64-6.8/board-bananapi-m2s-meson64-reboot-driver.patch

@@ -26,7 +26,7 @@ index ac6f7ae1d103..55b691368598 100644
  &i2c1 {
  	status = "okay";
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
-index 0a6a12808568..958fe59281da 100644
+index 4b8db872bbf3..dedadb252984 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
 @@ -17,6 +17,15 @@ aliases {

patch/kernel/archive/meson64-6.8/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch

@@ -16,10 +16,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 87480a6e6d93..80ed09e9be4a 100644
+index e38a4124f610..2b2932b9b1c5 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5884,7 +5884,7 @@ static const struct usb_device_id hub_id_table[] = {
+@@ -5927,7 +5927,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,

patch/kernel/archive/meson64-6.8/board-t95z-add-rc-remote-keymap.patch

@@ -31,10 +31,10 @@ index 7bbe580c80f7..dc53a1cbf6fd 100644
        - rc-tanix-tx3mini
        - rc-tanix-tx5max
 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-index 309b94c328c8..2236510eb594 100644
+index 1a0dc04f1db4..3dc50d49e54d 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -1348,6 +1348,8 @@ patternProperties:
+@@ -1366,6 +1366,8 @@ patternProperties:
      description: Sundance DSP Inc.
    "^sunplus,.*":
      description: Sunplus Technology Co., Ltd.

patch/kernel/archive/meson64-6.8/general-add-overlay-compilation-support.patch

@@ -55,7 +55,7 @@ index 4405d5b67578..04df2e7c8453 100644
  $(subdirs):
  	$(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 1a965fe68e01..989bcf25abc9 100644
+index cd5b181060f1..75008c9921f6 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -343,6 +343,9 @@ DTC ?= $(objtree)/scripts/dtc/dtc

patch/kernel/archive/meson64-6.8/general-driver-tm1628-auxdisplay-add-support-for-Titanmec-TM16.patch

@@ -168,10 +168,10 @@ index 000000000000..d9cbbc950aab
 +    };
 +...
 diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
-index 64012cda4d12..2764afc5c5d9 100644
+index d944d5298eca..f3d513139e5c 100644
 --- a/drivers/auxdisplay/Kconfig
 +++ b/drivers/auxdisplay/Kconfig
-@@ -203,6 +203,17 @@ config ARM_CHARLCD
+@@ -197,6 +197,17 @@ config ARM_CHARLCD
  	  line and the Linux version on the second line, but that's
  	  still useful.
  

patch/kernel/archive/meson64-6.8/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch

@@ -10,10 +10,10 @@ Unknown patch. Archeology:
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 52d91a0df85e..f42089295834 100644
+index aca5bb0866f8..2b9c2041034b 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-@@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
+@@ -767,6 +767,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable)
  	else
  		hdmi->mc_clkdis |= HDMI_MC_CLKDIS_AUDCLK_DISABLE;
  	hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);

patch/kernel/archive/meson64-6.8/general-drm-panfrost-fix-reference-leak.patch

@@ -21,7 +21,7 @@ Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
-index ecd2e035147f..34dd32d58404 100644
+index 0c2dbf6ef2a5..40eb2911d649 100644
 --- a/drivers/gpu/drm/panfrost/panfrost_job.c
 +++ b/drivers/gpu/drm/panfrost/panfrost_job.c
 @@ -204,7 +204,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js)

patch/kernel/archive/meson64-6.8/general-fix-Kodi-sysinfo-CPU-information.patch

@@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index a257da7b56fe..de893e3a5e57 100644
+index 47043c0d95ec..03410a9fac77 100644
 --- a/arch/arm64/kernel/cpuinfo.c
 +++ b/arch/arm64/kernel/cpuinfo.c
-@@ -192,8 +192,7 @@ static int c_show(struct seq_file *m, void *v)
+@@ -190,8 +190,7 @@ static int c_show(struct seq_file *m, void *v)
  		 * "processor".  Give glibc what it expects.
  		 */
  		seq_printf(m, "processor\t: %d\n", i);

patch/kernel/archive/meson64-6.8/general-hdmi-codec-reorder-channel-allocation-list.patch

@@ -24,10 +24,10 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
  1 file changed, 77 insertions(+), 63 deletions(-)
 
 diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
-index 0938671700c6..03290d3ae59c 100644
+index d3abb7ce2153..63e063fb02de 100644
 --- a/sound/soc/codecs/hdmi-codec.c
 +++ b/sound/soc/codecs/hdmi-codec.c
-@@ -184,84 +184,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {
+@@ -185,84 +185,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {
  /*
   * hdmi_codec_channel_alloc: speaker configuration available for CEA
   *
@@ -187,7 +187,7 @@ index 0938671700c6..03290d3ae59c 100644
  };
  
  struct hdmi_codec_priv {
-@@ -370,7 +383,8 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol,
+@@ -371,7 +384,8 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol,
  	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
  	struct hdmi_codec_priv *hcp = info->private_data;
  

patch/kernel/archive/meson64-6.8/general-input-touchscreen-Add-D-WAV-Multitouch.patch

@@ -13,10 +13,10 @@ Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71
  5 files changed, 574 insertions(+)
 
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 72046039d1be..5c0efbad32ac 100644
+index 828a5c022c64..3bb5816af1e0 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -1461,4 +1461,10 @@
+@@ -1468,4 +1468,10 @@
  #define USB_VENDOR_ID_SIGNOTEC			0x2133
  #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011	0x0018
  
@@ -72,7 +72,7 @@ index 62bd24f3ac8e..51ddd5304d79 100644
  obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B)	+= himax_hx83112b.o
 diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c
 new file mode 100644
-index 000000000000..7ec8b6dd15fd
+index 000000000000..918bdea3cb60
 --- /dev/null
 +++ b/drivers/input/touchscreen/dwav-usb-mt.c
 @@ -0,0 +1,554 @@
@@ -537,7 +537,7 @@ index 000000000000..7ec8b6dd15fd
 +	dwav_usb_mt->interface  = intf;
 +
 +	if (udev->manufacturer)
-+		strlcpy(dwav_usb_mt->name,
++		strscpy(dwav_usb_mt->name,
 +				udev->manufacturer, sizeof(dwav_usb_mt->name));
 +
 +	if (udev->product) {

patch/kernel/archive/meson64-6.8/general-media-cec-silence-CEC-timeout-message-HACK.patch

@@ -19,7 +19,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
-index 6bb49bb3f98c..118511ec69b7 100644
+index 5741adf09a2e..696e347d97f9 100644
 --- a/drivers/media/cec/core/cec-adap.c
 +++ b/drivers/media/cec/core/cec-adap.c
 @@ -501,9 +501,9 @@ int cec_thread_func(void *_adap)

patch/kernel/archive/meson64-6.8/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch

@@ -12,7 +12,7 @@ Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-index a49aa62e3f9f..01fa5d42c74d 100644
+index 7e5ac9db93f8..1d5e10a6f617 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 @@ -13,6 +13,7 @@
@@ -23,7 +23,7 @@ index a49aa62e3f9f..01fa5d42c74d 100644
  
  / {
  	compatible = "amlogic,meson-axg";
-@@ -1893,6 +1894,7 @@ sd_emmc_b: mmc@5000 {
+@@ -1914,6 +1915,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 a49aa62e3f9f..01fa5d42c74d 100644
  				resets = <&reset RESET_SD_EMMC_B>;
  			};
  
-@@ -1906,6 +1908,7 @@ sd_emmc_c: mmc@7000 {
+@@ -1927,6 +1929,7 @@ sd_emmc_c: mmc@7000 {
  					<&clkc CLKID_FCLK_DIV2>;
  				clock-names = "core", "clkin0", "clkin1";
  				resets = <&reset RESET_SD_EMMC_C>;

patch/kernel/archive/meson64-6.8/general-meson64-overlays.patch

@@ -9,10 +9,10 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 989bcf25abc9..49e8ac24c604 100644
+index 75008c9921f6..6ddb83df5177 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
-@@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m,
+@@ -88,6 +88,9 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs))
  
  always-y			+= $(dtb-y)
  

patch/kernel/archive/meson64-6.8/general-socinfo-sm-1-soc-amlogic-meson-gx-socinfo-move-common-code-to-hea.patch

@@ -1,18 +1,16 @@
-From 5cb16b97c9c05d628a2c18d5e4590b0765011766 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
 Date: Wed, 21 Feb 2024 16:35:01 +0300
-Subject: [PATCH 1/5] soc: amlogic: meson-gx-socinfo: move common code to
- header file
+Subject: soc: amlogic: meson-gx-socinfo: move common code to header file
 
 Move common constants and inline functions from meson-gx-socinfo driver
 to header file. Create new structures for store meson64 cpu_id and chip_id.
 
 Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
 ---
- .../soc/amlogic/meson-gx-socinfo-internal.h   | 120 ++++++++++++++++
- drivers/soc/amlogic/meson-gx-socinfo.c        | 136 ++----------------
+ drivers/soc/amlogic/meson-gx-socinfo-internal.h | 120 ++++++++
+ drivers/soc/amlogic/meson-gx-socinfo.c          | 136 +---------
  2 files changed, 134 insertions(+), 122 deletions(-)
- create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-internal.h
 
 diff --git a/drivers/soc/amlogic/meson-gx-socinfo-internal.h b/drivers/soc/amlogic/meson-gx-socinfo-internal.h
 new file mode 100644
@@ -323,5 +321,5 @@ index 6abb730344ab..006f3b09940d 100644
  	return 0;
  }
 -- 
-2.43.2
+Armbian
 

patch/kernel/archive/meson64-6.8/general-socinfo-sm-2-soc-amlogic-meson-gx-socinfo-sm-Add-Amlogic-secure-m.patch

@@ -1,8 +1,8 @@
-From 123aeab42e92b5af75df937e4f78976429e66a1e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
 Date: Wed, 21 Feb 2024 16:41:30 +0300
-Subject: [PATCH 2/5] soc: amlogic: meson-gx-socinfo-sm: Add Amlogic
- secure-monitor SoC Information driver
+Subject: soc: amlogic: meson-gx-socinfo-sm: Add Amlogic secure-monitor SoC
+ Information driver
 
 Amlogic SoCs have a SoC information secure-monitor call for SoC type,
 package type, revision information and chipid.
@@ -12,11 +12,10 @@ Information driver.
 
 Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
 ---
- drivers/soc/amlogic/Kconfig               |  10 ++
+ drivers/soc/amlogic/Kconfig               |  10 +
  drivers/soc/amlogic/Makefile              |   1 +
- drivers/soc/amlogic/meson-gx-socinfo-sm.c | 192 ++++++++++++++++++++++
+ drivers/soc/amlogic/meson-gx-socinfo-sm.c | 192 ++++++++++
  3 files changed, 203 insertions(+)
- create mode 100644 drivers/soc/amlogic/meson-gx-socinfo-sm.c
 
 diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig
 index d08e398bdad4..82fc77ca3b4b 100644
@@ -248,5 +247,5 @@ index 000000000000..e30e1d2feb61
 +MODULE_DESCRIPTION("Amlogic Meson GX SOC SM driver");
 +MODULE_LICENSE("GPL");
 -- 
-2.43.2
+Armbian
 

patch/kernel/archive/meson64-6.8/general-socinfo-sm-3-soc-amlogic-meson-gx-socinfo-add-new-definition-for-.patch

@@ -1,8 +1,8 @@
-From 611420cf4ac58a29d889540daddf2d7c40a93004 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
 Date: Wed, 21 Feb 2024 15:30:32 +0300
-Subject: [PATCH 3/5] soc: amlogic: meson-gx-socinfo: add new definition for
- Amlogic A113X package
+Subject: soc: amlogic: meson-gx-socinfo: add new definition for Amlogic A113X
+ package
 
 Add new definition for Amlogix A113X soc found in JetHub D1/D1+ devices.
 
@@ -24,5 +24,5 @@ index 3ebb80972fc7..2028101bb9b2 100644
  	{ "S905D2", 0x28, 0x10, 0xf0 },
  	{ "S905Y2", 0x28, 0x30, 0xf0 },
 -- 
-2.43.2
+Armbian
 

patch/kernel/archive/meson64-6.8/general-socinfo-sm-4-arm64-dts-meson-add-dts-links-to-secure-monitor-for-.patch

@@ -1,8 +1,8 @@
-From 3186e16e95ff6700a37f4ec64960d59e3b7b2aa3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Viacheslav Bocharov <adeep@lexina.in>
 Date: Thu, 22 Feb 2024 12:00:32 +0300
-Subject: [PATCH 4/5] arm64: dts: meson: add dts links to secure-monitor for
- soc driver in a1, axg, gx, g12
+Subject: arm64: dts: meson: add dts links to secure-monitor for soc driver in
+ a1, axg, gx, g12
 
 Add links to secure-monitor in soc driver section for A1, AXG, GX, G12
 Amlogic family for use with meson-socinfo-sm driver.
@@ -28,10 +28,10 @@ index 648e7f49424f..449b328d62b1 100644
  			};
  
 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-index 7e5ac9db93f8..51bd63ac5db0 100644
+index 1d5e10a6f617..97c9b2770a74 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
-@@ -1681,6 +1681,7 @@ mux {
+@@ -1682,6 +1682,7 @@ mux {
  			sec_AO: ao-secure@140 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x140 0x0 0x140>;
@@ -40,10 +40,10 @@ index 7e5ac9db93f8..51bd63ac5db0 100644
  			};
  
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index ff68b911b729..0a6b703b0dc0 100644
+index abc0483ff3b4..a33deaee557e 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-@@ -2026,6 +2026,7 @@ cec_AO: cec@100 {
+@@ -2035,6 +2035,7 @@ cec_AO: cec@100 {
  			sec_AO: ao-secure@140 {
  				compatible = "amlogic,meson-gx-ao-secure", "syscon";
  				reg = <0x0 0x140 0x0 0x140>;
@@ -64,5 +64,5 @@ index 2673f0dbafe7..656e08b3d872 100644
  			};
  
 -- 
-2.43.2
+Armbian
 

patch/kernel/archive/meson64-6.8/general-spi-nor-add-support-for-XT25F128B.patch

@@ -43,10 +43,10 @@ index 5e68468b72fc..4463d161aa5b 100644
  obj-$(CONFIG_MTD_SPI_NOR)	+= spi-nor.o
  
 diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
-index 1c443fe568cf..a5127a62a6c0 100644
+index 4129764fad8c..7fd85ed0095c 100644
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
-@@ -2013,6 +2013,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
+@@ -2051,6 +2051,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = {
  	&spi_nor_winbond,
  	&spi_nor_xilinx,
  	&spi_nor_xmc,
@@ -55,7 +55,7 @@ index 1c443fe568cf..a5127a62a6c0 100644
  
  static const struct flash_info spi_nor_generic_flash = {
 diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
-index 93cd2fc3606d..349a11a2e9f5 100644
+index d36c0e072954..5de9fb289170 100644
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
 @@ -615,6 +615,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst;

patch/kernel/archive/meson64-6.8/general-usb-core-improve-handling-of-hubs-with-no-ports.patch

@@ -33,10 +33,10 @@ Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 80ed09e9be4a..565c5f5b9fce 100644
+index 2b2932b9b1c5..08b30a306d6b 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -1435,9 +1435,8 @@ static int hub_configure(struct usb_hub *hub,
+@@ -1447,9 +1447,8 @@ static int hub_configure(struct usb_hub *hub,
  		ret = -ENODEV;
  		goto fail;
  	} else if (hub->descriptor->bNbrPorts == 0) {

patch/kernel/archive/meson64-6.8/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch

@@ -10,11 +10,11 @@ Add node for eeprom on baseboard in JetHub D1+ device
  2 files changed, 24 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
-index 0062667c4f65..140c724c57fb 100644
+index 8a18ce948450..e02f7b1cb0c1 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts
-@@ -35,3 +35,15 @@ bluetooth {
- 		device-wake-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>;
+@@ -47,3 +47,15 @@ eeprompd: eeprom@56 {
+ 		vcc-supply = <&vddao_3v3>;
  	};
  };
 +
@@ -30,12 +30,12 @@ index 0062667c4f65..140c724c57fb 100644
 +        };
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
-index c2d22b00c1cd..6a5664d908d5 100644
+index c356bd2cc63a..1f894a429534 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
 +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts
-@@ -25,3 +25,15 @@ memory@0 {
- &sd_emmc_b {
- 	broken-cd;/* cd-gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>;*/
+@@ -37,3 +37,15 @@ eeprompd: eeprom@56 {
+ 		vcc-supply = <&vddao_3v3>;
+ 	};
  };
 +
 +&i2c_AO {

patch/kernel/archive/meson64-6.8/kernel-6.8-tools-cgroup-makefile.patch

@@ -0,0 +1,41 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
+Date: Sat, 30 Mar 2024 21:09:12 +0100
+Subject: [ARCHEOLOGY] meson-s4t7: Fix custom_kernel_config: hash modification
+ has to happen inside the first function call
+
+> X-Git-Archeology: > recovered message: > Will be ignored on second time the function is called
+> X-Git-Archeology: - Revision 6ced5cc02637fb6dbc980aa77fcdc77f2ccf5067: https://github.com/armbian/build/commit/6ced5cc02637fb6dbc980aa77fcdc77f2ccf5067
+> X-Git-Archeology:   Date: Sat, 30 Mar 2024 21:09:12 +0100
+> X-Git-Archeology:   From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
+> X-Git-Archeology:   Subject: meson-s4t7: Fix custom_kernel_config: hash modification has to happen inside the first function call
+> X-Git-Archeology:
+> X-Git-Archeology: - Revision caf0529240948df416b015aeea8c23e420a55ce6: https://github.com/armbian/build/commit/caf0529240948df416b015aeea8c23e420a55ce6
+> X-Git-Archeology:   Date: Sun, 31 Mar 2024 18:21:26 -0400
+> X-Git-Archeology:   From: Barry Lind (SteeManMI) <barrylind@yahoo.com>
+> X-Git-Archeology:   Subject: Bump meson64 edge from 6.7 to 6.8
+> X-Git-Archeology:
+---
+ tools/cgroup/Makefile | 11 ++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/tools/cgroup/Makefile b/tools/cgroup/Makefile
+new file mode 100644
+index 000000000000..ffca068e4a76
+--- /dev/null
++++ b/tools/cgroup/Makefile
+@@ -0,0 +1,11 @@
++# SPDX-License-Identifier: GPL-2.0
++# Makefile for cgroup tools
++
++CFLAGS = -Wall -Wextra
++
++all: cgroup_event_listener
++%: %.c
++	$(CC) $(CFLAGS) -o $@ $^
++
++clean:
++	$(RM) cgroup_event_listener
+-- 
+Armbian
+

patch/kernel/archive/meson64-6.8/meson-g12a-pinctrl-add-missing-ir-options.patch

@@ -12,7 +12,7 @@ Signed-off-by: Yuntian Zhang <yt@radxa.com>
  2 files changed, 25 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index abc0483ff3b4..64ca8767cb83 100644
+index a33deaee557e..c7e78ae7933d 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
 @@ -563,6 +563,14 @@ mux {

patch/kernel/archive/meson64-6.8/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch

@@ -9,7 +9,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index 2673f0dbafe7..81ac2bff38fe 100644
+index 656e08b3d872..87b1890d2ab1 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 @@ -223,6 +223,10 @@ sm: secure-monitor {

patch/kernel/archive/meson64-6.8/meson-gxl-gxm-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch

@@ -87,10 +87,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  2 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-index 18f7b730289e..59f7b51598b5 100644
+index e59c3c92b1e7..135142a991e5 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
-@@ -257,7 +257,11 @@ &sd_emmc_a {
+@@ -256,7 +256,11 @@ &sd_emmc_a {
  
  	bus-width = <4>;
  	cap-sd-highspeed;