linux: update Amlogic Linux 6.1.x patches

packages/linux/package.mk

@@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"
 
 case "${LINUX}" in
   amlogic)
-    PKG_VERSION="7d54cb2c26dad1264ecca85992bfe8984df4b7b5" # 6.1.14
-    PKG_SHA256="76f039741d61e06c740b846291e5017b97da7d3f91fb2f368230a161d46905a6"
+    PKG_VERSION="42616e0f09fb4e9a6c59892a227f7bdefbd2d6d3" # 6.1.15
+    PKG_SHA256="963efd296b713d1eba66cfc831b6b09bcd380fe565baf4f7f63aa1cedc78dd18"
     PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     PKG_PATCH_DIRS="default"

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch

@@ -1,7 +1,7 @@
-From 6142085e9460414a2fc7f51f0a52afea5eaf0923 Mon Sep 17 00:00:00 2001
+From 3d13e5ef9b0be2a25ab1fff395db44bbe0a3cd22 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:41:51 +0000
-Subject: [PATCH 001/119] LOCAL: set meson-gx cma pool to 896MB
+Subject: [PATCH 001/124] LOCAL: set meson-gx cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch

@@ -1,7 +1,7 @@
-From c0df9052aeb8d47bc2a18e0873b20fb68b54321a Mon Sep 17 00:00:00 2001
+From 6a2448485c0944260935c633e84ac807940cd17d Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 14 Aug 2019 19:58:14 +0000
-Subject: [PATCH 002/119] LOCAL: set meson-g12 cma pool to 896MB
+Subject: [PATCH 002/124] LOCAL: set meson-g12 cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch

@@ -1,7 +1,7 @@
-From 980967e34f6463f7b8dc3d37e7a255abb4950dfc Mon Sep 17 00:00:00 2001
+From 94fa4941a5cc58275a9060386480a330af953a03 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:45:18 +0000
-Subject: [PATCH 003/119] LOCAL: arm64: fix Kodi sysinfo CPU information
+Subject: [PATCH 003/124] LOCAL: arm64: fix Kodi sysinfo CPU information
 
 This allows the CPU information to show in the Kodi sysinfo screen, e.g.
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch

@@ -1,7 +1,7 @@
-From 6ef4c65b5e4796e163beb7241cdb0b5d2c7698de Mon Sep 17 00:00:00 2001
+From d8485fc35c8f74f174bb9dc66532fda6d2ccaf4d Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:23 +0100
-Subject: [PATCH 004/119] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
+Subject: [PATCH 004/124] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
 
 The Amlogic Meson GX SoCs uses a non-standard argument to the
 PSCI CPU_SUSPEND call to enter system suspend.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch

@@ -1,7 +1,7 @@
-From 2712b6a5207c3bdff9612c9938ee0d97a683e007 Mon Sep 17 00:00:00 2001
+From 5de1504fd7f5dbb61045a427fe81ad1c8d344c36 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:25 +0100
-Subject: [PATCH 005/119] LOCAL: arm64: dts: meson: add support for GX PM and
+Subject: [PATCH 005/124] LOCAL: arm64: dts: meson: add support for GX PM and
  Virtual RTC
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch

@@ -1,7 +1,7 @@
-From 694b9b83d3442791ee6d6c01868d04357bc9b782 Mon Sep 17 00:00:00 2001
+From 896c7e487a9b85565d5f032472479589870fbb7f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 21 Jan 2021 01:35:36 +0000
-Subject: [PATCH 006/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 006/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Khadas VIM
 
 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch

@@ -1,7 +1,7 @@
-From 70d3c7b8d66da08a0deef1c99657ed822b7131b0 Mon Sep 17 00:00:00 2001
+From cf9c9c87c8f4e9b9bd6b77c82160fe37d02ce8cd Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 6 Nov 2021 13:01:08 +0000
-Subject: [PATCH 007/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 007/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Khadas VIM2
 
 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch

@@ -1,7 +1,7 @@
-From a2df580982a2c364aa35da82aa66feddf2e56f36 Mon Sep 17 00:00:00 2001
+From 4fae9dab8a66664eda75b2e72d11be84495874e6 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 1 Feb 2021 19:27:40 +0000
-Subject: [PATCH 008/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 008/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Minix NEO U9-H
 
 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch

@@ -1,7 +1,7 @@
-From 86032671e6f5efd8eac2ba503c50b10f538e2c52 Mon Sep 17 00:00:00 2001
+From 6d951d1064742ff05f3c753d2830ee82597f5150 Mon Sep 17 00:00:00 2001
 From: Anssi Hannula <anssi.hannula@iki.fi>
 Date: Sun, 17 Apr 2022 04:37:48 +0000
-Subject: [PATCH 009/119] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958
+Subject: [PATCH 009/124] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958
  kctls to device 0
 
 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch

@@ -1,7 +1,7 @@
-From 95087f3fd82785ef72de4dc4ab3364a76ecbfdf4 Mon Sep 17 00:00:00 2001
+From c2d5a3c9cd74bd38f70e5e0aaac3e0f73a4af506 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 3 Jan 2022 10:44:17 +0000
-Subject: [PATCH 010/119] LOCAL: usb: hub: disable autosuspend for Genesys
+Subject: [PATCH 010/124] LOCAL: usb: hub: disable autosuspend for Genesys
  Logic Hubs
 
 Disable autosuspend in Genesys Logic hubs to allow USB devices on the
@@ -17,10 +17,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 0aaaadb02cc6..1ca434aed00b 100644
+index 1abe43ddb75f..7889811e5516 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5800,7 +5800,7 @@ static const struct usb_device_id hub_id_table[] = {
+@@ -5799,7 +5799,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,

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch

@@ -1,7 +1,7 @@
-From 9742de1efcdbf512e3ee5671e0b5d4b7b2dde9d1 Mon Sep 17 00:00:00 2001
+From 9d7af11c29d31e837497210fb027c6e71619ea5d Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Sep 2021 05:00:45 +0000
-Subject: [PATCH 011/119] LOCAL: of: partial revert of fdt.c changes
+Subject: [PATCH 011/124] LOCAL: of: partial revert of fdt.c changes
 
 This resolves reports similar to the below which are present in dmesg
 since Linux 5.10; which are also causing crashes in some distros:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch

@@ -1,7 +1,7 @@
-From ebc9244e10d017655e8df41d0f7f12da5a90fb9a Mon Sep 17 00:00:00 2001
+From fcc187a4ae5a17045c2922b37b9158ee6830a31e Mon Sep 17 00:00:00 2001
 From: Carlo Caione <ccaione@baylibre.com>
 Date: Mon, 13 Feb 2023 10:32:09 +0100
-Subject: [PATCH 058/119] FROMLIST(v2): drm/meson/meson_venc: Relax the
+Subject: [PATCH 012/124] FROMGIT(FIXES): drm/meson/meson_venc: Relax the
  supported mode checks
 
 Relax a bit the supported modes list by including also 480x1920 and

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch

@@ -0,0 +1,38 @@
+From 2af8142b44df714599fe5f7a5d9c3f678231bbe1 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Wed, 1 Mar 2023 12:48:28 +0000
+Subject: [PATCH 013/124] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM
+ when scaling video overlay
+
+Playing media with a resolution smaller than the crtc size requires the
+video overlay to be scaled for output and GXM boards display a 1px pink
+line on the bottom of the scaled overlay. Comparing with the downstream
+vendor driver revealed VPP_DUMMY_DATA not being set [0].
+
+Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen.
+
+[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869
+
+Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
+Suggested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ drivers/gpu/drm/meson/meson_vpp.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c
+index 154837688ab0..5df1957c8e41 100644
+--- a/drivers/gpu/drm/meson/meson_vpp.c
++++ b/drivers/gpu/drm/meson/meson_vpp.c
+@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv)
+ 			       priv->io_base + _REG(VPP_DOLBY_CTRL));
+ 		writel_relaxed(0x1020080,
+ 				priv->io_base + _REG(VPP_DUMMY_DATA1));
++		writel_relaxed(0x42020,
++				priv->io_base + _REG(VPP_DUMMY_DATA));
+ 	} else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
+ 		writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL));
+ 
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch

@@ -1,7 +1,7 @@
-From 933161dcf2708d0d8765f0134d6cf08f0634737f Mon Sep 17 00:00:00 2001
+From 923a36494f202ce6c3e0b2febfe2fe3fad70256f Mon Sep 17 00:00:00 2001
 From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
 Date: Wed, 4 Jan 2023 15:19:06 +0000
-Subject: [PATCH 012/119] FROMGIT(6.2): Revert "arm64: dts:
+Subject: [PATCH 014/124] FROMGIT(6.2): Revert "arm64: dts:
  meson-sm1-odroid-hc4: disable unused USB PHY0"
 
 This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch

@@ -1,7 +1,7 @@
-From 04e35d23966417d7feea63379cfa97734e88882c Mon Sep 17 00:00:00 2001
+From 700cf88d7bc8a96082f0a55bdaf1990e445862e3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 19 Jan 2023 05:03:53 +0000
-Subject: [PATCH 013/119] FROMGIT(6.3): arm64: dts: meson: remove CPU opps
+Subject: [PATCH 015/124] FROMGIT(6.3): arm64: dts: meson: remove CPU opps
  below 1GHz for G12A boards
 
 Amlogic G12A devices experience CPU stalls and random board wedges when

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch

@@ -1,7 +1,7 @@
-From dbc56924b4ef2ef4929dbbd3a71dd5f9c587cb56 Mon Sep 17 00:00:00 2001
+From d4e849bab8f5cbd70d8198e0deb9273c3e63187c Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:50:01 +0000
-Subject: [PATCH 014/119] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to
+Subject: [PATCH 016/124] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to
  P212 dtsi
 
 The P212 has a combined WiFi/BT module. The BT side is already enabled

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch

@@ -1,7 +1,7 @@
-From 734fe8a9758c83353f4e87d92217fe3f0c94a773 Mon Sep 17 00:00:00 2001
+From c2c6ad295dcfc54e39d48c6981f22a2cebb054c5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:56:12 +0000
-Subject: [PATCH 015/119] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in
+Subject: [PATCH 017/124] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in
  P212 dtsi
 
 Cosmetic-only change to alpha-sort the pwm_ef node.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch

@@ -1,7 +1,7 @@
-From 687aa721901391c0d26b6f11b164963881cccde0 Mon Sep 17 00:00:00 2001
+From c1114a0f97a5a44bc25e972c37644792cc74953f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:58:58 +0000
-Subject: [PATCH 016/119] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes
+Subject: [PATCH 018/124] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes
  from Khadas VIM1
 
 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch

@@ -1,7 +1,7 @@
-From 5b1f67e6014292c83505302f67d7f0d1ebd8a93f Mon Sep 17 00:00:00 2001
+From bc7ca33a87ab8569cbc54a08fea7fa059be48fe7 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 04:30:44 +0000
-Subject: [PATCH 017/119] FROMGIT(6.3): arm64: dts: meson: add audio playback
+Subject: [PATCH 019/124] FROMGIT(6.3): arm64: dts: meson: add audio playback
  to S905X-P212 dts
 
 Add support for the HDMI and Analogue i2s audio outputs.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch

@@ -1,7 +1,7 @@
-From 2650a26be4c5432a8263096f2a89a5d10d270154 Mon Sep 17 00:00:00 2001
+From 37040153930ec646ca47f954b9e3c85ef7597843 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:03:14 +0000
-Subject: [PATCH 018/119] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add
+Subject: [PATCH 020/124] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add
  missing NNA reset
 
 Doesn't appear in the TRM I have, but it is used by the downstream

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch

@@ -1,7 +1,7 @@
-From 3d021e127ccda3f91708b37f14ad3ea1da299d1e Mon Sep 17 00:00:00 2001
+From 397a8f83bff92b2797585433274ac2ea176f7e75 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:04:02 +0000
-Subject: [PATCH 019/119] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power
+Subject: [PATCH 021/124] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power
  domain
 
 Add define for the NNA power domain for the NPU in the G12A.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch

@@ -1,7 +1,7 @@
-From 0e9313ae8e525d1d811e35a778fc17cf590661f7 Mon Sep 17 00:00:00 2001
+From 21a3fd2803e4fd17ce9bd98aba0c4504a9e29dd1 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:04:51 +0000
-Subject: [PATCH 020/119] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power
+Subject: [PATCH 022/124] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power
  domain for A311D
 
 Based on power initialization sequence in downstream driver.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch

@@ -1,7 +1,7 @@
-From fe1c33c1c209927e3cf08485eba3498275dccc32 Mon Sep 17 00:00:00 2001
+From af35fb5c2bfc4b722a4e2268a217099e7a664f64 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Wed, 30 Nov 2022 12:05:46 +0000
-Subject: [PATCH 021/119] FROMGIT(6.3): arm64: dts: Add DT node for the
+Subject: [PATCH 023/124] FROMGIT(6.3): arm64: dts: Add DT node for the
  VIPNano-QI on the A311D
 
 This "NPU" is very similar to the Vivante GPUs and Etnaviv works well

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch

@@ -1,7 +1,7 @@
-From 88b256191bb62756826193b5b8cce03f046bd946 Mon Sep 17 00:00:00 2001
+From f033edaa3332d18828e348d75f21ef806336e663 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:01:47 +0000
-Subject: [PATCH 022/119] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip
+Subject: [PATCH 024/124] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip
  feature struct
 
 We will use these for differentiating between GPUs and NPUs, as the

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch

@@ -1,7 +1,7 @@
-From 6bc70bd7f8321a13dab880378d239c813a6c74c1 Mon Sep 17 00:00:00 2001
+From b259ac5ee71948b18626f8c098c19f25e8b9f106 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:02:31 +0000
-Subject: [PATCH 023/119] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs
+Subject: [PATCH 025/124] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs
 
 Userspace is still not making full use of the hardware, so we don't know
 yet if changes to the UAPI won't be needed. Warn about it.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch

@@ -1,7 +1,7 @@
-From 726e813f6501345007ebca68891fd137945b8a88 Mon Sep 17 00:00:00 2001
+From 18745ede1bba607053170d114500a05410897acd Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:03:16 +0000
-Subject: [PATCH 024/119] FROMGIT(6.3): drm/etnaviv: add HWDB entry for
+Subject: [PATCH 026/124] FROMGIT(6.3): drm/etnaviv: add HWDB entry for
  VIPNano-QI.7120.0055
 
 This is a compute-only module marketed towards AI and vision

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch

@@ -1,7 +1,7 @@
-From b314d9f65e9d729c33229230c61a6d7ca05d67ab Mon Sep 17 00:00:00 2001
+From 21bf955b7c8c397c28eb24b6ab3fccc7f11d0492 Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Sat, 3 Dec 2022 06:04:00 +0000
-Subject: [PATCH 025/119] FROMGIT(6.3): arm64: dts: Fix NPU power domain
+Subject: [PATCH 027/124] FROMGIT(6.3): arm64: dts: Fix NPU power domain
  references in Amlogic G12-based SoCs
 
 The power sequence is different between SoCs in that family, so get the

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch

@@ -1,7 +1,7 @@
-From feb3f7acd48af99a6a3cc3e247f1ee39dd8c0727 Mon Sep 17 00:00:00 2001
+From dea931026d73bc6d8af46ec56a9694213a2aab61 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:41:46 +0000
-Subject: [PATCH 026/119] FROMGIT(6.3): clk: meson: mpll: Switch from
+Subject: [PATCH 028/124] FROMGIT(6.3): clk: meson: mpll: Switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch

@@ -1,7 +1,7 @@
-From d446faa2fd433dcdddf9bb3c6903fb41f21cc7de Mon Sep 17 00:00:00 2001
+From d974f9603f560a46024fe8ff88a066d6f8794980 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:42:41 +0000
-Subject: [PATCH 027/119] FROMGIT(6.3): clk: meson: dualdiv: switch from
+Subject: [PATCH 029/124] FROMGIT(6.3): clk: meson: dualdiv: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch

@@ -1,7 +1,7 @@
-From b25c8b76c5c500741e1bae5be92f40af8302646f Mon Sep 17 00:00:00 2001
+From 3f16df9ced198c479d359fd65846bbea179a38af Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:43:33 +0000
-Subject: [PATCH 028/119] FROMGIT(6.3): clk: meson: sclk-div: switch from
+Subject: [PATCH 030/124] FROMGIT(6.3): clk: meson: sclk-div: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch

@@ -1,7 +1,7 @@
-From b3173d4cbebb7494013b2471869f61aa7c50523b Mon Sep 17 00:00:00 2001
+From 98e5f6b3c291633477aa99bf82cb9614900e77e5 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Mon, 26 Dec 2022 04:44:26 +0000
-Subject: [PATCH 029/119] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from
+Subject: [PATCH 031/124] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from
  .round_rate to .determine_rate
 
 clk_ops.round_rate will be removed at some point. It's replacement is

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch

@@ -1,7 +1,7 @@
-From 827db0a8686d83ae15ba6a60c219c9ca7a91a599 Mon Sep 17 00:00:00 2001
+From bb12a49637fd4e0a711d27a049ad07295e52aaa8 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <neil.armstrong@linaro.org>
 Date: Tue, 24 Jan 2023 12:39:08 +0100
-Subject: [PATCH 030/119] FROMGIT(6.3): arm64: dts: amlogic:
+Subject: [PATCH 032/124] FROMGIT(6.3): arm64: dts: amlogic:
  meson-sm1-odroid-hc4: fix active fan thermal trip
 
 Add an active trip tied to the on-board fan cooling device, which is better

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch

@@ -1,7 +1,7 @@
-From 6a563c7bffe748e52a415383f4fb9d1fcbf1caaa Mon Sep 17 00:00:00 2001
+From 8427e08cb0e9aa76e4f4362004bc95b36e1eb5b2 Mon Sep 17 00:00:00 2001
 From: David Heidelberg <david@ixit.cz>
 Date: Sat, 27 Nov 2021 07:23:35 +0000
-Subject: [PATCH 031/119] FROMGIT(6.3): arm64: dts: meson: make dts use
+Subject: [PATCH 033/124] FROMGIT(6.3): arm64: dts: meson: make dts use
  gpio-fan matrix instead of array
 
 No functional changes.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch

@@ -1,7 +1,7 @@
-From 24cdc899972f989681b564140e1ac677cd0dc12a Mon Sep 17 00:00:00 2001
+From d1fe2551af812a91518cd0334a26315b09c87724 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 26 Jan 2023 12:20:19 +0000
-Subject: [PATCH 032/119] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow
+Subject: [PATCH 034/124] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow
  usb otg mode
 
 Setting dr_mode to "host" prevents otg which can be useful on a board

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch

@@ -1,7 +1,7 @@
-From d4acc14701de1429557af4e427e4e85131f12802 Mon Sep 17 00:00:00 2001
+From 4bda0546e6690a9f52773a94fa77b3b91d228cd8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 26 Jan 2023 16:15:59 +0000
-Subject: [PATCH 033/119] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch
+Subject: [PATCH 035/124] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch
  VDDIO_C pin to OPEN_DRAIN
 
 For proper warm (re)boot from SD card the BPI-M5 board requires TFLASH_VDD_EN

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -1,28 +0,0 @@
-From 84ce435b0892826680ab99807b7e086c8b5569f5 Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Wed, 25 Jan 2023 09:28:27 +0000
-Subject: [PATCH 035/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
- for BananaPi M2-Pro
-
-BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 9fda2436c618..d63f6b899f25 100644
---- a/Documentation/devicetree/bindings/arm/amlogic.yaml
-+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -175,6 +175,7 @@ properties:
-           - enum:
-               - amediatech,x96-air
-               - amediatech,x96-air-gbit
-+              - bananapi,bpi-m2-pro
-               - bananapi,bpi-m5
-               - cyx,a95xf3-air
-               - cyx,a95xf3-air-gbit
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch

@@ -1,7 +1,7 @@
-From fe8bd6ed716a8dee218e13d39eec3bf6df05f055 Mon Sep 17 00:00:00 2001
+From 4790c0f01fa63b6883c0a76e82d3b1edd11bfcd6 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 25 Jan 2023 08:10:48 +0000
-Subject: [PATCH 034/119] FROMGIT(6.3): arm64: dts: meson:
+Subject: [PATCH 036/124] FROMGIT(6.3): arm64: dts: meson:
  meson-sm1-bananapi-m5: convert to dtsi
 
 Convert the BPI-M5 dts into meson-sm1-bananapi.dtsi to support the

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -1,30 +1,28 @@
-From 7fa5cf2ed6c65f2071fcf92d5e1ede56322154f6 Mon Sep 17 00:00:00 2001
+From 4b448f98adc272243d49334e06a916b9cb712709 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Wed, 16 Feb 2022 07:27:07 +0000
-Subject: [PATCH 037/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
- for Radxa Zero2
+Date: Wed, 25 Jan 2023 09:28:27 +0000
+Subject: [PATCH 037/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
+ for BananaPi M2-Pro
 
-The Radxa Zero2 is a small form-factor SBC using the Amlogic
-A311D chip.
+BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset.
 
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
-Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 ---
  Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index d63f6b899f25..7ded40b309a4 100644
+index 9fda2436c618..d63f6b899f25 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -154,6 +154,7 @@ properties:
-         items:
+@@ -175,6 +175,7 @@ properties:
            - enum:
-               - khadas,vim3
-+              - radxa,zero2
-           - const: amlogic,a311d
-           - const: amlogic,g12b
- 
+               - amediatech,x96-air
+               - amediatech,x96-air-gbit
++              - bananapi,bpi-m2-pro
+               - bananapi,bpi-m5
+               - cyx,a95xf3-air
+               - cyx,a95xf3-air-gbit
 -- 
 2.34.1
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch

@@ -1,7 +1,7 @@
-From 8a627052d2914e54417e93d22900d3546d116e3a Mon Sep 17 00:00:00 2001
+From 2946da11893f378e8e3091c342faf7efe64428d6 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 25 Jan 2023 08:13:28 +0000
-Subject: [PATCH 036/119] FROMGIT(6.3): arm64: dts: meson: add support for
+Subject: [PATCH 038/124] FROMGIT(6.3): arm64: dts: meson: add support for
  BananaPi M2-Pro
 
 BPI-M2-PRO is based upon the BPI-M5 design except for a different

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch

@@ -0,0 +1,30 @@
+From b9575451cb033823080415404a23397eb376f030 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Wed, 16 Feb 2022 07:27:07 +0000
+Subject: [PATCH 039/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support
+ for Radxa Zero2
+
+The Radxa Zero2 is a small form-factor SBC using the Amlogic
+A311D chip.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index d63f6b899f25..7ded40b309a4 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -154,6 +154,7 @@ properties:
+         items:
+           - enum:
+               - khadas,vim3
++              - radxa,zero2
+           - const: amlogic,a311d
+           - const: amlogic,g12b
+ 
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch

@@ -1,7 +1,7 @@
-From 158ba8f7ed4d4e6e774df5a400bdc63c70db384e Mon Sep 17 00:00:00 2001
+From 230c630b8ba5ff3f4a1a1e27f13ea78b1e0f589f Mon Sep 17 00:00:00 2001
 From: Yuntian Zhang <yt@radxa.com>
 Date: Fri, 14 Jan 2022 15:50:02 +0000
-Subject: [PATCH 038/119] FROMGIT(6.3): arm64: dts: meson: add support for
+Subject: [PATCH 040/124] FROMGIT(6.3): arm64: dts: meson: add support for
  Radxa Zero2
 
 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch

@@ -1,7 +1,7 @@
-From 29d379e87a02cecbe4213618c2a66d1a03768d02 Mon Sep 17 00:00:00 2001
+From da6bd559e6d8c65a385eb15a1818825820e3a5e2 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Mon, 30 Jan 2023 16:16:15 +0100
-Subject: [PATCH 039/119] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio
+Subject: [PATCH 041/124] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio
  multiplexer
 
 Add documentation for the MDIO bus multiplexer found on the Amlogic GXL

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch

@@ -1,7 +1,7 @@
-From 3fa339d30ff897466809b54738aef7b0884f1b54 Mon Sep 17 00:00:00 2001
+From e7783502af6a0585bb0d46cefd4d2afcd3f0b3ba Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Mon, 30 Jan 2023 16:16:16 +0100
-Subject: [PATCH 040/119] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux
+Subject: [PATCH 042/124] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux
  support
 
 Add support for the mdio mux and internal phy glue of the GXL SoC

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch

@@ -1,7 +1,7 @@
-From 90b6d6340680523ec3b0390d182f058fe4cfd272 Mon Sep 17 00:00:00 2001
+From e0c54c7d8dae134cb4f306edafbbaf83a639c295 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 12 Feb 2023 22:43:32 +0100
-Subject: [PATCH 041/119] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd
+Subject: [PATCH 043/124] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd
 
 MMC core only checks whether return value of .get_cd() equals zero.
 Therefore -ENOSYS and 1 are effectively the same and the function

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch

@@ -1,7 +1,7 @@
-From c0fa86921daa596b83cd24ca6ee9d832d3f62f55 Mon Sep 17 00:00:00 2001
+From ca39f3e579c6e65e74c309b96f8363f5c5efb97d Mon Sep 17 00:00:00 2001
 From: Benjamin Roszak <benjamin545@gmail.com>
 Date: Thu, 15 Jul 2021 14:32:33 -0400
-Subject: [PATCH 050/119] FROMLIST(v1): media: meson: vdec: remove redundant if
+Subject: [PATCH 044/124] FROMGIT(6.4): media: meson: vdec: remove redundant if
  statement
 
 Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch

@@ -1,7 +1,7 @@
-From a504e22a654a64c4920b96446f74c5d007140329 Mon Sep 17 00:00:00 2001
+From 57745077b1446f15f12c0e4a3d9839f83de97860 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 1 Feb 2023 08:53:39 +0000
-Subject: [PATCH 054/119] FROMLIST(v2): dt-bindings: media: rc: add rc-dreambox
+Subject: [PATCH 045/124] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox
  binding
 
 Add a binding for the rc-dreambox remote keymap

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch

@@ -1,7 +1,7 @@
-From d978b4f1de65c75d27f09e370054946b600eb091 Mon Sep 17 00:00:00 2001
+From 4af5a66da2b8d8237642c589992321bec5818f17 Mon Sep 17 00:00:00 2001
 From: Emanuel Strobel <emanuel.strobel@yahoo.com>
 Date: Mon, 5 Apr 2021 17:57:57 +0000
-Subject: [PATCH 055/119] FROMLIST(v2): media: rc: add common keymap for
+Subject: [PATCH 046/124] FROMGIT(6.4): media: rc: add common keymap for
  Dreambox RC10/RC0 and RC20/RC-BT remotes
 
 Add a common keymap for the RC10/RC0 and RC20/RC-BT remotes used with

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch

@@ -1,7 +1,7 @@
-From 89bf0cf980d400a58d5fb12f0cb23af6c00e0415 Mon Sep 17 00:00:00 2001
+From fc398d991d1e5cf43901adcf21b75f9ee9bafafe Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 4 Feb 2023 06:42:20 +0000
-Subject: [PATCH 056/119] FROMLIST(v2): dt-bindings: media: rc: add
+Subject: [PATCH 047/124] FROMGIT(6.4): dt-bindings: media: rc: add
  rc-beelink-mxiii
 
 Add a binding for the rc-beelink-mxiii remote keymap

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch

@@ -1,7 +1,7 @@
-From 39794f188cf5778a6b84517d95c50e830d9d89ba Mon Sep 17 00:00:00 2001
+From ce9f721bd1c6e1194709364701f15e6ab4ae0834 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:33:47 +0000
-Subject: [PATCH 057/119] FROMLIST(v2): media: rc: add Beelink Mini MXIII
+Subject: [PATCH 048/124] FROMGIT(6.4): media: rc: add Beelink Mini MXIII
  keymap
 
 Add a keymap for the simple IR (NEC) remote used with the Beelink

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch

@@ -1,7 +1,7 @@
-From 5ecde6b3e72b51715d366c5f2a63b4161aab4ac8 Mon Sep 17 00:00:00 2001
+From 349e97058c6823553bd7ad5f7f60355b3c0c05f5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:16:12 +0000
-Subject: [PATCH 059/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: sort
+Subject: [PATCH 049/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort
  and tidy the dts
 
 Alpha-sort the nodes, move the default line in the LED node to where it's

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch

@@ -1,7 +1,7 @@
-From 8e6a3584cedb7b625d698b08781ab96f7f515a9d Mon Sep 17 00:00:00 2001
+From 773768b2f3823d574569e8f607eaa4005ced8bf5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:21:08 +0000
-Subject: [PATCH 060/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro:
+Subject: [PATCH 050/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro:
  complete the bluetooth node
 
 Add missing content to the bluetooth node to align it with the content

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch

@@ -1,7 +1,7 @@
-From 26e09e684c37965401d31cacdc5f03912b84121b Mon Sep 17 00:00:00 2001
+From 51a4ffc98695b4e6e491678269e58f32d2311f30 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 10 Feb 2023 02:29:00 +0000
-Subject: [PATCH 061/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: add
+Subject: [PATCH 051/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add
  initial audio support
 
 Add initial support for HDMI and S/PDIF audio output.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch

@@ -0,0 +1,39 @@
+From b72738ccb1d004c6430cc8a90a0ecfa834c28056 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Fri, 3 Mar 2023 18:37:57 +0100
+Subject: [PATCH 052/124] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the
+ boards with the BPI-CM4 connected
+
+The BPI-CM4 module with an Amlogic A311D SoC is a module compatible
+with the Raspberry Pi CM4 specifications.
+
+Document the boards using this module, by specifying the BananaPi CM4
+compatible in addition to the baseboard compatible.
+
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index 7ded40b309a4..94f68e7c85ed 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -158,6 +158,14 @@ properties:
+           - const: amlogic,a311d
+           - const: amlogic,g12b
+ 
++      - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC
++        items:
++          - enum:
++              - bananapi,bpi-cm4io
++          - const: bananapi,bpi-cm4
++          - const: amlogic,a311d
++          - const: amlogic,g12b
++
+       - description: Boards with the Amlogic Meson G12B S922X SoC
+         items:
+           - enum:
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch

@@ -0,0 +1,610 @@
+From 3fed5b6e5327443a8aaccb08e720ee4209726352 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Sat, 4 Mar 2023 07:14:17 +0000
+Subject: [PATCH 053/124] FROMGIT(6.4): arm64: dts: amlogic: Add initial
+ support for BPI-CM4 module with BPI-CM4IO baseboard
+
+Add support for both the BananaPi BPI-CM4 module and the BananaPi
+baseboard which is comnpatible with the RaspberryPi CM4IO baseboard.
+
+The BananaPi BPI-CM4 module follows the CM4 specifications at [1],
+but with a single HDMI port and a since DSI output.
+
+The current CM4IO baseboard DT should work fine on the Raspberry CM4
+baseboard and other derivatives baseboards, but proper DT should
+be written for other baseboards.
+
+The split is done so it's easy to describe a new CM4 baseboard, enabling
+only the necessary HW used on the baseboard.
+
+[1] https://datasheets.raspberrypi.com/cm4io/cm4io-datasheet.pdf
+
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |   1 +
+ .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++
+ .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi  | 388 ++++++++++++++++++
+ 3 files changed, 554 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index 5d5ec22a469e..f5845e565efb 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
++++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+new file mode 100644
+index 000000000000..1b0c3881c6a1
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts
+@@ -0,0 +1,165 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
++ */
++
++/dts-v1/;
++
++#include "meson-g12b-bananapi-cm4.dtsi"
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
++
++/ {
++	compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
++	model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module";
++
++	aliases {
++		ethernet0 = &ethmac;
++		i2c0 = &i2c1;
++		i2c1 = &i2c3;
++	};
++
++	adc-keys {
++		compatible = "adc-keys";
++		io-channels = <&saradc 2>;
++		io-channel-names = "buttons";
++		keyup-threshold-microvolt = <1710000>;
++
++		button-function {
++			label = "Function";
++			linux,code = <KEY_FN>;
++			press-threshold-microvolt = <10000>;
++		};
++	};
++
++	hdmi_connector: hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_connector_in: endpoint {
++				remote-endpoint = <&hdmi_tx_tmds_out>;
++			};
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led-blue {
++			color = <LED_COLOR_ID_BLUE>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>;
++			linux,default-trigger = "heartbeat";
++		};
++
++		led-green {
++			color = <LED_COLOR_ID_GREEN>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
++		};
++	};
++
++	sound {
++		compatible = "amlogic,axg-sound-card";
++		model = "BPI-CM4IO";
++		audio-aux-devs = <&tdmout_b>;
++		audio-routing =	"TDMOUT_B IN 0", "FRDDR_A OUT 1",
++				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
++				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
++				"TDM_B Playback", "TDMOUT_B OUT";
++
++		assigned-clocks = <&clkc CLKID_MPLL2>,
++				  <&clkc CLKID_MPLL0>,
++				  <&clkc CLKID_MPLL1>;
++		assigned-clock-parents = <0>, <0>, <0>;
++		assigned-clock-rates = <294912000>,
++				       <270950400>,
++				       <393216000>;
++
++		dai-link-0 {
++			sound-dai = <&frddr_a>;
++		};
++
++		dai-link-1 {
++			sound-dai = <&frddr_b>;
++		};
++
++		dai-link-2 {
++			sound-dai = <&frddr_c>;
++		};
++
++		/* 8ch hdmi interface */
++		dai-link-3 {
++			sound-dai = <&tdmif_b>;
++			dai-format = "i2s";
++			dai-tdm-slot-tx-mask-0 = <1 1>;
++			dai-tdm-slot-tx-mask-1 = <1 1>;
++			dai-tdm-slot-tx-mask-2 = <1 1>;
++			dai-tdm-slot-tx-mask-3 = <1 1>;
++			mclk-fs = <256>;
++
++			codec {
++				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
++			};
++		};
++
++		/* hdmi glue */
++		dai-link-4 {
++			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
++
++			codec {
++				sound-dai = <&hdmi_tx>;
++			};
++		};
++	};
++};
++
++&cecb_AO {
++	status = "okay";
++};
++
++&ethmac {
++	status = "okay";
++};
++
++&hdmi_tx {
++	status = "okay";
++};
++
++&hdmi_tx_tmds_port {
++	hdmi_tx_tmds_out: endpoint {
++		remote-endpoint = <&hdmi_connector_in>;
++	};
++};
++
++/* CSI port */
++&i2c1 {
++	status = "okay";
++};
++
++/* DSI port for touchscreen */
++&i2c3 {
++	status = "okay";
++};
++
++/* miniPCIe port with USB + SIM slot */
++&pcie {
++	status = "okay";
++};
++
++&sd_emmc_b {
++	status = "okay";
++};
++
++&tohdmitx {
++	status = "okay";
++};
++
++/* Peripheral Only USB-C port */
++&usb {
++	dr_mode = "peripheral";
++
++	status = "okay";
++};
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+new file mode 100644
+index 000000000000..dc0988c82694
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
+@@ -0,0 +1,388 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2023 Neil Armstrong <neil.armstrong@linaro.org>
++ */
++
++#include "meson-g12b-a311d.dtsi"
++#include <dt-bindings/gpio/meson-g12a-gpio.h>
++
++/ {
++	aliases {
++		serial0 = &uart_AO;
++		rtc1 = &vrtc;
++	};
++
++	chosen {
++		stdout-path = "serial0:115200n8";
++	};
++
++	emmc_pwrseq: emmc-pwrseq {
++		compatible = "mmc-pwrseq-emmc";
++		reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>;
++	};
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x0 0x0 0x40000000>;
++	};
++
++	sdio_pwrseq: sdio-pwrseq {
++		compatible = "mmc-pwrseq-simple";
++		reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>;
++		clocks = <&wifi32k>;
++		clock-names = "ext_clock";
++	};
++
++	emmc_1v8: regulator-emmc_1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "EMMC_1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		vin-supply = <&vddao_3v3>;
++		regulator-always-on;
++	};
++
++	dc_in: regulator-dc-in {
++		compatible = "regulator-fixed";
++		regulator-name = "DC_IN";
++		regulator-min-microvolt = <5000000>;
++		regulator-max-microvolt = <5000000>;
++		regulator-always-on;
++	};
++
++	vddio_c: regulator-vddio-c {
++		compatible = "regulator-gpio";
++		regulator-name = "VDDIO_C";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <3300000>;
++
++		enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>;
++		enable-active-high;
++		regulator-always-on;
++
++		gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>;
++		gpios-states = <1>;
++
++		states = <1800000 0>,
++			 <3300000 1>;
++	};
++
++	vddao_1v8: regulator-vddao-1v8 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDAO_1V8";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <1800000>;
++		vin-supply = <&vddao_3v3>;
++		regulator-always-on;
++	};
++
++	vddao_3v3: regulator-vddao-3v3 {
++		compatible = "regulator-fixed";
++		regulator-name = "VDDAO_3V3";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		vin-supply = <&dc_in>;
++		regulator-always-on;
++	};
++
++	vddcpu_a: regulator-vddcpu-a {
++		/*
++		 * MP8756GD DC/DC Regulator.
++		 */
++		compatible = "pwm-regulator";
++
++		regulator-name = "VDDCPU_A";
++		regulator-min-microvolt = <680000>;
++		regulator-max-microvolt = <1040000>;
++
++		pwm-supply = <&dc_in>;
++
++		pwms = <&pwm_ab 0 1250 0>;
++		pwm-dutycycle-range = <100 0>;
++
++		regulator-boot-on;
++		regulator-always-on;
++	};
++
++	vddcpu_b: regulator-vddcpu-b {
++		/*
++		 * SY8120B1ABC DC/DC Regulator.
++		 */
++		compatible = "pwm-regulator";
++
++		regulator-name = "VDDCPU_B";
++		regulator-min-microvolt = <680000>;
++		regulator-max-microvolt = <1040000>;
++
++		pwm-supply = <&dc_in>;
++
++		pwms = <&pwm_AO_cd 1 1250 0>;
++		pwm-dutycycle-range = <100 0>;
++
++		regulator-boot-on;
++		regulator-always-on;
++	};
++
++	wifi32k: wifi32k {
++		compatible = "pwm-clock";
++		#clock-cells = <0>;
++		clock-frequency = <32768>;
++		pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */
++	};
++};
++
++&arb {
++	status = "okay";
++};
++
++&clkc_audio {
++	status = "okay";
++};
++
++&cec_AO {
++	pinctrl-0 = <&cec_ao_a_h_pins>;
++	pinctrl-names = "default";
++	hdmi-phandle = <&hdmi_tx>;
++};
++
++&cecb_AO {
++	pinctrl-0 = <&cec_ao_b_h_pins>;
++	pinctrl-names = "default";
++	hdmi-phandle = <&hdmi_tx>;
++};
++
++&cpu0 {
++	cpu-supply = <&vddcpu_b>;
++	operating-points-v2 = <&cpu_opp_table_0>;
++	clocks = <&clkc CLKID_CPU_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu1 {
++	cpu-supply = <&vddcpu_b>;
++	operating-points-v2 = <&cpu_opp_table_0>;
++	clocks = <&clkc CLKID_CPU_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu100 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu101 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu102 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&cpu103 {
++	cpu-supply = <&vddcpu_a>;
++	operating-points-v2 = <&cpub_opp_table_1>;
++	clocks = <&clkc CLKID_CPUB_CLK>;
++	clock-latency = <50000>;
++};
++
++&ext_mdio {
++	external_phy: ethernet-phy@0 {
++		/* Realtek RTL8211F (0x001cc916) */
++		reg = <0>;
++		max-speed = <1000>;
++
++		interrupt-parent = <&gpio_intc>;
++		/* MAC_INTR on GPIOZ_14 */
++		interrupts = <26 IRQ_TYPE_LEVEL_LOW>;
++	};
++};
++
++/* Ethernet to be enabled in baseboard DT */
++&ethmac {
++	pinctrl-0 = <&eth_pins>, <&eth_rgmii_pins>;
++	pinctrl-names = "default";
++	phy-mode = "rgmii-txid";
++	phy-handle = <&external_phy>;
++};
++
++&frddr_a {
++	status = "okay";
++};
++
++&frddr_b {
++	status = "okay";
++};
++
++&frddr_c {
++	status = "okay";
++};
++
++/* HDMI to be enabled in baseboard DT */
++&hdmi_tx {
++	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
++	pinctrl-names = "default";
++	hdmi-supply = <&dc_in>;
++};
++
++/* "Camera" I2C bus */
++&i2c1 {
++	pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>;
++	pinctrl-names = "default";
++};
++
++/* Main I2C bus */
++&i2c2 {
++	pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
++	pinctrl-names = "default";
++};
++
++/* "ID" I2C bus */
++&i2c3 {
++	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
++	pinctrl-names = "default";
++};
++
++&pcie {
++	reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>;
++};
++
++&pwm_ab {
++	pinctrl-0 = <&pwm_a_e_pins>;
++	pinctrl-names = "default";
++	clocks = <&xtal>;
++	clock-names = "clkin0";
++
++	status = "okay";
++};
++
++&pwm_ef {
++	pinctrl-0 = <&pwm_e_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&pwm_AO_cd {
++	pinctrl-0 = <&pwm_ao_d_e_pins>;
++	pinctrl-names = "default";
++	clocks = <&xtal>;
++	clock-names = "clkin1";
++
++	status = "okay";
++};
++
++&saradc {
++	vref-supply = <&vddao_1v8>;
++
++	status = "okay";
++};
++
++/* on-module SDIO WiFi */
++&sd_emmc_a {
++	pinctrl-0 = <&sdio_pins>;
++	pinctrl-1 = <&sdio_clk_gate_pins>;
++	pinctrl-names = "default", "clk-gate";
++	#address-cells = <1>;
++	#size-cells = <0>;
++
++	bus-width = <4>;
++	sd-uhs-sdr104;
++	max-frequency = <50000000>;
++
++	non-removable;
++	disable-wp;
++
++	/* WiFi firmware requires power in suspend */
++	keep-power-in-suspend;
++
++	mmc-pwrseq = <&sdio_pwrseq>;
++
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddao_3v3>;
++
++	status = "okay";
++
++	rtl8822cs: wifi@1 {
++		reg = <1>;
++	};
++};
++
++/* SD card to be enabled in baseboard DT */
++&sd_emmc_b {
++	pinctrl-0 = <&sdcard_c_pins>;
++	pinctrl-1 = <&sdcard_clk_gate_c_pins>;
++	pinctrl-names = "default", "clk-gate";
++
++	bus-width = <4>;
++	cap-sd-highspeed;
++	max-frequency = <50000000>;
++	disable-wp;
++
++	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddio_c>;
++};
++
++/* on-module eMMC */
++&sd_emmc_c {
++	pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>;
++	pinctrl-1 = <&emmc_clk_gate_pins>;
++	pinctrl-names = "default", "clk-gate";
++
++	bus-width = <8>;
++	cap-mmc-highspeed;
++	mmc-ddr-1_8v;
++	mmc-hs200-1_8v;
++	max-frequency = <200000000>;
++	disable-wp;
++
++	mmc-pwrseq = <&emmc_pwrseq>;
++	vmmc-supply = <&vddao_3v3>;
++	vqmmc-supply = <&vddao_1v8>;
++
++	status = "okay";
++};
++
++&tdmif_b {
++	status = "okay";
++};
++
++&tdmout_b {
++	status = "okay";
++};
++
++/* on-module UART BT */
++&uart_A {
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	status = "okay";
++
++	bluetooth {
++		compatible = "realtek,rtl8822cs-bt";
++		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
++		host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
++		device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&uart_AO {
++	pinctrl-0 = <&uart_ao_a_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&usb {
++	phys = <&usb2_phy0>, <&usb2_phy1>;
++	phy-names = "usb2-phy0", "usb2-phy1";
++};
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch

@@ -1,7 +1,7 @@
-From ec6df411382a6b218aed3dc3f3247c88d6f533da Mon Sep 17 00:00:00 2001
+From cb3f73c01b56bc2762dfdfcf25c3a85c2dd6cdec Mon Sep 17 00:00:00 2001
 From: Sergey Shtylyov <s.shtylyov@omp.ru>
 Date: Fri, 24 Dec 2021 06:09:57 +0000
-Subject: [PATCH 042/119] FROMLIST(v1): mmc: meson-gx: fix deferred probing
+Subject: [PATCH 054/124] FROMLIST(v1): mmc: meson-gx: fix deferred probing
 
 The driver overrides the error codes and IRQ0 returned by platform_get_irq()
 to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch

@@ -1,7 +1,7 @@
-From 76869c873dc2fc0bb999a7f078a981b3cca8d79b Mon Sep 17 00:00:00 2001
+From b937c4545b48fc4b9685c631c8c34ff96ddb6ec2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Sun, 20 Feb 2022 08:23:12 +0000
-Subject: [PATCH 043/119] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
+Subject: [PATCH 055/124] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
  Micro Electronics
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch

@@ -1,7 +1,7 @@
-From ea68b39d92eb6daeae900078a8d5fb884aa2aedb Mon Sep 17 00:00:00 2001
+From b3469395f4da7a3fd81780a2bc20dc9752323a65 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:24:47 +0000
-Subject: [PATCH 044/119] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan
+Subject: [PATCH 056/124] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan
  Micro Electronics TM1628
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch

@@ -1,7 +1,7 @@
-From 9b520e8a8d6edbd7da36baed8a221f4abe110633 Mon Sep 17 00:00:00 2001
+From 567668ede141f733821710c8a640aa42b496939d Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:26:27 +0000
-Subject: [PATCH 045/119] FROMLIST(v5): docs: ABI: document tm1628 attribute
+Subject: [PATCH 057/124] FROMLIST(v5): docs: ABI: document tm1628 attribute
  display-text
 
 Document the attribute for reading / writing the text to be displayed on

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch

@@ -1,7 +1,7 @@
-From 1f2f8f35ca011bbc72ef1292b1927aa002a34811 Mon Sep 17 00:00:00 2001
+From 2cb43fe6c04b9e0b5fea923f6fc3872b21a0755c Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:51:20 +0000
-Subject: [PATCH 046/119] FROMLIST(v5): auxdisplay: add support for Titanmec
+Subject: [PATCH 058/124] FROMLIST(v5): auxdisplay: add support for Titanmec
  TM1628 7 segment display controller
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch

@@ -1,7 +1,7 @@
-From a8d66974c12c82d16e132e6bdbaf8bd309e2e8e0 Mon Sep 17 00:00:00 2001
+From d5b29dd52f3de3d8b97c51d4442a1619372fce18 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:52:34 +0000
-Subject: [PATCH 047/119] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini:
+Subject: [PATCH 059/124] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini:
  add support for the 7 segment display
 
 This patch adds support for the 7 segment display of the device.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch

@@ -1,7 +1,7 @@
-From 61450e18700a00f6fbf4194f2afa3238687c8044 Mon Sep 17 00:00:00 2001
+From 58501d9aad75798a85e434547b7949287ede7506 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:53:32 +0000
-Subject: [PATCH 048/119] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
+Subject: [PATCH 060/124] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
  auxdisplay driver
 
 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch

@@ -1,7 +1,7 @@
-From 24048a5997adb905190d42eb60c3b73118d860b1 Mon Sep 17 00:00:00 2001
+From 6d32b35e79596ed1350d739f37bfeec056f592bc Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 23 Dec 2018 02:24:38 +0100
-Subject: [PATCH 049/119] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
+Subject: [PATCH 061/124] FROMLIST(v1): ASoC: hdmi-codec: reorder channel
  allocation list
 
 Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch

@@ -1,7 +1,7 @@
-From 93eacecf63e1c2f0fe5abcaed4a78c2bebd24560 Mon Sep 17 00:00:00 2001
+From 45918db1c9f75ddf16fe9cfc29cb7abd5d140f6c Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 22 Nov 2021 09:15:21 +0000
-Subject: [PATCH 051/119] FROMLIST(v1): media: meson: vdec: esparser: check
+Subject: [PATCH 062/124] FROMLIST(v1): media: meson: vdec: esparser: check
  parsing state with hardware write pointer
 
 Also check the hardware write pointer to check if ES Parser has stalled.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch

@@ -1,7 +1,7 @@
-From 7c7cfd0c00e1037fc0226393ee509169893756f0 Mon Sep 17 00:00:00 2001
+From 216f4500ccf36f6a74e0b3ffd378ee557ed9dbdc Mon Sep 17 00:00:00 2001
 From: Benjamin Roszak <benjamin545@gmail.com>
 Date: Mon, 23 Jan 2023 10:56:46 +0000
-Subject: [PATCH 052/119] FROMLIST(v2): media: meson: vdec: implement 10bit
+Subject: [PATCH 063/124] FROMLIST(v2): media: meson: vdec: implement 10bit
  bitstream handling
 
 In order to support 10bit bitstream decoding, buffers and MMU

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch

@@ -1,7 +1,7 @@
-From 5033662952d289300d6ee76c17913abe3e5de47e Mon Sep 17 00:00:00 2001
+From 0799916720ff59f4cb5132453a17748b8d1e81a4 Mon Sep 17 00:00:00 2001
 From: Maxime Jourdan <mjourdan@baylibre.com>
 Date: Mon, 23 Jan 2023 11:07:04 +0000
-Subject: [PATCH 053/119] FROMLIST(v2): media: meson: vdec: add HEVC decode
+Subject: [PATCH 064/124] FROMLIST(v2): media: meson: vdec: add HEVC decode
  codec
 
 Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch

@@ -1,7 +1,7 @@
-From 4df952eb87fb849535fa3ce7b9b8c86e9c3d7e1a Mon Sep 17 00:00:00 2001
+From 3167ffdc14544e74a82566d3bc0f1e39c0d3a8d6 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:41:53 +0100
-Subject: [PATCH 062/119] FROMLIST(v2): dt-bindings: serial:
+Subject: [PATCH 065/124] FROMLIST(v2): dt-bindings: serial:
  amlogic,meson-uart: Add compatible string for G12A
 
 Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch

@@ -1,7 +1,7 @@
-From a795fe52d97a8792a94d8c1109f68984c89ed527 Mon Sep 17 00:00:00 2001
+From ae9f3f449af22ca1806b8ca65b622d2f91b611a4 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:44:16 +0100
-Subject: [PATCH 063/119] FROMLIST(v2): tty: serial: meson: Add a new
+Subject: [PATCH 066/124] FROMLIST(v2): tty: serial: meson: Add a new
  compatible string for the G12A SoC
 
 Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch

@@ -1,7 +1,7 @@
-From 0e9c49a97b49745c4de3ec41bd9f3eaf6755d71a Mon Sep 17 00:00:00 2001
+From 36552905b53f40bd89e007fa714b7d52f05b5d87 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 22 Feb 2023 21:47:16 +0100
-Subject: [PATCH 064/119] FROMLIST(v2): arm64: dts: meson-g12-common: Use the
+Subject: [PATCH 067/124] FROMLIST(v2): arm64: dts: meson-g12-common: Use the
  G12A UART compatible string
 
 Switch meson-12-common.dtsi to use the Meson G12A specific UART

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch

@@ -1,7 +1,7 @@
-From f589d7cc58e31e96f58b80e516945e5f701b62a1 Mon Sep 17 00:00:00 2001
+From 69724ec6d9aa2c6eed4c19b2432fe4e3cea1517f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 5 Jan 2023 15:16:46 +0000
-Subject: [PATCH 065/119] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware
+Subject: [PATCH 068/124] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware
  decoding
 
 The MPEG1/2 decoder is broken and nobody has volunteered to poke

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch

@@ -1,7 +1,7 @@
-From 76d5200e280b14a0f50556b7b50371c13455dddc Mon Sep 17 00:00:00 2001
+From 49a02986cb8ae08090e576d0d78f9a71b89c2e27 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:09:12 +0000
-Subject: [PATCH 066/119] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
+Subject: [PATCH 069/124] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
  100MHz
 
 Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch

@@ -1,7 +1,7 @@
-From f1eb8cf980881ab603ec1fd257e5801d3b412032 Mon Sep 17 00:00:00 2001
+From 814b6de6186193cccf6517e0a243fd64a549851d Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 06:45:06 +0000
-Subject: [PATCH 067/119] WIP: arm64: dts: meson: add UHS SDIO capabilities to
+Subject: [PATCH 070/124] WIP: arm64: dts: meson: add UHS SDIO capabilities to
  p212/p23x/q20x
 
 Add UHS capabilities to the SDIO node to enable 100MHz speeds.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch

@@ -1,7 +1,7 @@
-From bebad1696209039640521ca5649548d106d32eeb Mon Sep 17 00:00:00 2001
+From 58eb5ad2cea635f2941ead75106654455f81951a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:18:32 +0000
-Subject: [PATCH 068/119] WIP: arm64: dts: meson: remove SDIO node from Khadas
+Subject: [PATCH 071/124] WIP: arm64: dts: meson: remove SDIO node from Khadas
  VIM1
 
 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch

@@ -1,7 +1,7 @@
-From 855a21c63c2b82230248a9bab6ba2865518a7bd5 Mon Sep 17 00:00:00 2001
+From bdb0515c10ba11b7e010681820bb2916be9b43f9 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:52:47 +0000
-Subject: [PATCH 069/119] WIP: arm64: dts: meson: add audio playback to p201
+Subject: [PATCH 072/124] WIP: arm64: dts: meson: add audio playback to p201
 
 Add initial audio support limited to HDMI i2s.
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch

@@ -1,7 +1,7 @@
-From c6e8181b98c57349768ad232ee3557ce9b606c06 Mon Sep 17 00:00:00 2001
+From 1b834e16307438e9a29efc9ad046f12d8972a055 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:56:15 +0000
-Subject: [PATCH 070/119] WIP: arm64: dts: meson: add audio playback to p200
+Subject: [PATCH 073/124] WIP: arm64: dts: meson: add audio playback to p200
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch

@@ -1,7 +1,7 @@
-From fff41879355aba35bc6c674ca32a4f90408e7f98 Mon Sep 17 00:00:00 2001
+From 85116c417b26bdb50e3faa278b7939c0e4f4e81e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 17 May 2020 05:00:55 +0000
-Subject: [PATCH 071/119] WIP: arm64: dts: meson: add audio playback to u200
+Subject: [PATCH 074/124] WIP: arm64: dts: meson: add audio playback to u200
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch

@@ -1,7 +1,7 @@
-From 6e49e1d60237acf467191c490b5fecb8536f7536 Mon Sep 17 00:00:00 2001
+From 7a41e52459e177ecd1e728c84d321fd46549b82c Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 27 Nov 2021 13:50:06 +0000
-Subject: [PATCH 072/119] WIP: arm64: dts: meson: add Headphone output to
+Subject: [PATCH 075/124] WIP: arm64: dts: meson: add Headphone output to
  Beelink GT-King
 
 Add support for the Headphone audio DAC built-in to the S922X chip.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch

@@ -1,7 +1,7 @@
-From 959c3000813126592068fc508428b3dd8a2f7445 Mon Sep 17 00:00:00 2001
+From fb48811743b3c70e5fa8fdbfb709c1116a06b219 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 29 Feb 2020 15:13:02 +0000
-Subject: [PATCH 073/119] WIP: dt-bindings: arm: amlogic: add support for the
+Subject: [PATCH 076/124] WIP: dt-bindings: arm: amlogic: add support for the
  Tanix TX5 Max
 
 The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 7ded40b309a4..940fda576809 100644
+index 94f68e7c85ed..845a5eb56ff3 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -146,6 +146,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch

@@ -1,7 +1,7 @@
-From 616ee1bf2dd2072b2a52f04917f32e2ad4b75d66 Mon Sep 17 00:00:00 2001
+From 191edeaf7c267716ebc1f4ed802135e8170fa2ad Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 20 Oct 2019 04:06:59 +0000
-Subject: [PATCH 074/119] WIP: arm64: dts: meson: add support for the Tanix TX5
+Subject: [PATCH 077/124] WIP: arm64: dts: meson: add support for the Tanix TX5
  Max
 
 The Tanix TX5 Max is based on the Amlogic U200 reference design
@@ -26,7 +26,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 5d5ec22a469e..a69bd3a4769f 100644
+index f5845e565efb..5897fd0f594b 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
 @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch

@@ -1,7 +1,7 @@
-From 986b38291ffc617c93f8fa37cb88cc7ccdc91957 Mon Sep 17 00:00:00 2001
+From 2a0bbdd4019af1fb6c3326ec024fe5867e0e54f0 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 21 Oct 2019 03:58:06 +0000
-Subject: [PATCH 075/119] WIP: arm64: dts: meson: add multiple MeCool device
+Subject: [PATCH 078/124] WIP: arm64: dts: meson: add multiple MeCool device
  trees
 
 This adds initial device trees for a range of MeCool devices based on various
@@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index a69bd3a4769f..791c6ff9f121 100644
+index 5897fd0f594b..be7cc188706a 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -19,6 +19,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
+@@ -20,6 +20,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
@@ -37,7 +37,7 @@ index a69bd3a4769f..791c6ff9f121 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
-@@ -32,12 +34,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
+@@ -33,12 +35,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch

@@ -1,7 +1,7 @@
-From cb6409dbc874089f3e7a75013f999ec02f9f5be5 Mon Sep 17 00:00:00 2001
+From 84cac7ac9589cef2c3c3190a4013870fde942923 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 11 Apr 2021 05:50:13 +0000
-Subject: [PATCH 076/119] WIP: dt-bindings: arm: amlogic: add support for Minix
+Subject: [PATCH 079/124] WIP: dt-bindings: arm: amlogic: add support for Minix
  NEO-U1
 
 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB)
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 940fda576809..dfdf6c42ea47 100644
+index 845a5eb56ff3..657af6e662ea 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -58,6 +58,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch

@@ -1,7 +1,7 @@
-From cc383de661125823c2bea1f074e897dc648d314a Mon Sep 17 00:00:00 2001
+From 380f3ccdb8e979426723e8f44970c17cba846440 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 11 Apr 2021 05:52:14 +0000
-Subject: [PATCH 077/119] WIP: arm64: dts: meson: add initial device-tree for
+Subject: [PATCH 080/124] WIP: arm64: dts: meson: add initial device-tree for
  Minix NEO-U1
 
 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB)
@@ -30,10 +30,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 791c6ff9f121..f5f17f2f0fc2 100644
+index be7cc188706a..c310be848a62 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
+@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-ki-plus.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-kii-pro.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch

@@ -1,7 +1,7 @@
-From 50050fbec8c02222eeb219ec3495caff13560297 Mon Sep 17 00:00:00 2001
+From f27efc1faf0aeec4b1cbd39a707170a363ac019b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 19 Aug 2022 21:32:21 +0000
-Subject: [PATCH 078/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 081/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
  Minix NEO-U1
 
 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch

@@ -1,7 +1,7 @@
-From 54ce89d3f4d99631678c0a0819a9ce6b212dfba3 Mon Sep 17 00:00:00 2001
+From a9ba332ddc1e257b23ae9f10782c61acba1e9020 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:28:50 +0000
-Subject: [PATCH 079/119] WIP: dt-bindings: arm: amlogic: add support for
+Subject: [PATCH 082/124] WIP: dt-bindings: arm: amlogic: add support for
  Beelink Mini MXIII
 
 The Beelink Mini MXIII is an Android STB based on the Amlogic P200
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index dfdf6c42ea47..70cb580f8b7e 100644
+index 657af6e662ea..a0ea076b7b4d 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -56,6 +56,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch

@@ -1,7 +1,7 @@
-From d2ffa2383dec0ec5fd736258b910f68ae7e27a30 Mon Sep 17 00:00:00 2001
+From 1aa48da78d4ce958f87d6575b3b7754a8f17e9c5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:26:00 +0000
-Subject: [PATCH 080/119] WIP: arm64: dts: meson: add support for Beelink Mini
+Subject: [PATCH 083/124] WIP: arm64: dts: meson: add support for Beelink Mini
  MXIII
 
 This is a GXBB board that ships in two variants, one with
@@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-beelink-mini-mxiii.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index f5f17f2f0fc2..b7d7cb46b70a 100644
+index c310be848a62..f27222c9d292 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
+@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch

@@ -1,7 +1,7 @@
-From 3099de0850d5d012648f6addbd236341b43bf842 Mon Sep 17 00:00:00 2001
+From e7e0505675278f27b97535ded162f2636b03c205 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:48:02 +0000
-Subject: [PATCH 081/119] WIP: media: rc: add keymap for MeCool M8S Pro W
+Subject: [PATCH 084/124] WIP: media: rc: add keymap for MeCool M8S Pro W
  remote
 
 Add a keymap and bindings for the simple IR (NEC) remote used with

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch

@@ -1,7 +1,7 @@
-From 08d9f3f5a18a2b8ed87285ed50f298fff7634aa6 Mon Sep 17 00:00:00 2001
+From 9bdca7d4092cae3f006591f958eea92e73111179 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:15:36 +0000
-Subject: [PATCH 082/119] WIP: dt-bindings: arm: amlogic: add support for
+Subject: [PATCH 085/124] WIP: dt-bindings: arm: amlogic: add support for
  MeCool M8S Pro W
 
 The MeCool M8S Pro W is an Android STB based on the Amlogic P281
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 70cb580f8b7e..f9d6a8f82d01 100644
+index a0ea076b7b4d..70706c8d5ed8 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -89,6 +89,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch

@@ -1,37 +0,0 @@
-From 9447b13173e07289f13d43e48c63aa9ffe551a0d Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Tue, 12 Apr 2022 11:21:21 +0000
-Subject: [PATCH 086/119] WIP: arm64: dts: meson: add RTL8822CS bluetooth to
- X96-Air
-
-Add the uart_A/bluetooth node for the RTL8822CS chip.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts     | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
-index 7e1a74046ba5..66e53c25bfb4 100644
---- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
-@@ -131,3 +131,16 @@ &tdmout_b {
- &tohdmitx {
- 	status = "okay";
- };
-+
-+&uart_A {
-+	status = "okay";
-+	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
-+	pinctrl-names = "default";
-+	uart-has-rtscts;
-+
-+	bluetooth {
-+		compatible = "realtek,rtl8822cs-bt";
-+		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
-+		host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
-+	};
-+};
--- 
-2.34.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch

@@ -1,7 +1,7 @@
-From c8111a7e93aee04ee7d1c7c87ef5b552f043f309 Mon Sep 17 00:00:00 2001
+From 2a7053d28f65c8e6fdb092fa5505a5ad4cca3fde Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:17:41 +0000
-Subject: [PATCH 083/119] WIP: arm64: dts: meson: add support for MeCool M8S
+Subject: [PATCH 086/124] WIP: arm64: dts: meson: add support for MeCool M8S
  Pro W
 
 MeCool M8S Pro W is an Android STB based on the Amlogic P281 (GXL)

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch

@@ -1,7 +1,7 @@
-From 04494107d4738b516d6a4302d9e7db7ae77e6d52 Mon Sep 17 00:00:00 2001
+From 98313629608297592ca31d832ec93c876a3143e9 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 02:40:20 +0000
-Subject: [PATCH 084/119] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
+Subject: [PATCH 087/124] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
 
 Add the board binding for the OSMC Vero 4K STB device
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index f9d6a8f82d01..abf58071d4fa 100644
+index 70706c8d5ed8..63a2093cb626 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -102,6 +102,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch

@@ -1,7 +1,7 @@
-From 09a3ea93b7a533fbd8f5aabbeb78124958df968e Mon Sep 17 00:00:00 2001
+From 25c119d7883625bc0bbeded88ce312a9c4102273 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 04:06:17 +0000
-Subject: [PATCH 085/119] WIP: arm64: dts: meson: add support for OSMC Vero 4K
+Subject: [PATCH 088/124] WIP: arm64: dts: meson: add support for OSMC Vero 4K
 
 The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference
 design with the following specifications:
@@ -28,10 +28,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index b7d7cb46b70a..1680f7f6dbd6 100644
+index f27222c9d292..2c4c83cc0a04 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
+@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch

@@ -0,0 +1,62 @@
+From 2969de85cdf6695415496013b30d5340b5a9b91d Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 12 Apr 2022 11:21:21 +0000
+Subject: [PATCH 089/124] WIP: arm64: dts: meson: sm1-x96-air: add RTL8822CS
+ WiFi and Bluetooth support
+
+Add support for the RTL8822CS WiFi and BT module on the board.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ .../dts/amlogic/meson-sm1-x96-air-gbit.dts    | 24 +++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
+index 7e1a74046ba5..9217db5bdcea 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts
+@@ -13,6 +13,10 @@ / {
+ 	compatible = "amediatech,x96-air-gbit", "amlogic,sm1";
+ 	model = "Shenzhen Amediatech Technology Co., Ltd X96 Air";
+ 
++	aliases {
++		serial2 = &uart_A;
++	};
++
+ 	sound {
+ 		compatible = "amlogic,axg-sound-card";
+ 		model = "X96-AIR";
+@@ -120,6 +124,12 @@ &ir {
+ 	linux,rc-map-name = "rc-x96max";
+ };
+ 
++&sd_emmc_a {
++	rtl8822cs: wifi@1 {
++		reg = <1>;
++	};
++};
++
+ &tdmif_b {
+ 	status = "okay";
+ };
+@@ -131,3 +141,17 @@ &tdmout_b {
+ &tohdmitx {
+ 	status = "okay";
+ };
++
++&uart_A {
++	status = "okay";
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	bluetooth {
++		compatible = "realtek,rtl8822cs-bt";
++		enable-gpios  = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
++		host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>;
++		device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>;
++	};
++};
+-- 
+2.34.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch

@@ -1,7 +1,7 @@
-From ec3fd95f8147ceccc0da3647128f42caf5c7f8eb Mon Sep 17 00:00:00 2001
+From b0c6b8195241c1b5ae1cae8ba88722997c5f7bf8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 10 Apr 2022 11:51:38 +0000
-Subject: [PATCH 087/119] WIP: media: rc: add keymap for Venz V10 remote
+Subject: [PATCH 090/124] WIP: media: rc: add keymap for Venz V10 remote
 
 Add a keymap and bindings for the IR (NEC) remote used with
 the Venz V10 Android STB device.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch

@@ -1,7 +1,7 @@
-From 1d7ef8f872d93d1444ddc324830a7f0b895cc7f0 Mon Sep 17 00:00:00 2001
+From 878d4954456473d6f87606b48300b810762c7042 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 9 Apr 2022 06:27:50 +0000
-Subject: [PATCH 088/119] WIP: dt-bindings: arm: amlogic: add S905L and Venz
+Subject: [PATCH 091/124] WIP: dt-bindings: arm: amlogic: add S905L and Venz
  V10 bindings
 
 Add SOC bindings for S905L devices and the board binding for Venz V10.
@@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index abf58071d4fa..fa02463f1e58 100644
+index 63a2093cb626..5ff3e7f43a51 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -83,6 +83,13 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch

@@ -1,7 +1,7 @@
-From c4efd114a22c073b877b7659322774fffabe49a2 Mon Sep 17 00:00:00 2001
+From 2281bee85181532d637cd86e43e25ab35ebfecde Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 9 Apr 2022 06:21:58 +0000
-Subject: [PATCH 089/119] WIP: arm64: dts: meson: add support for Venz V10
+Subject: [PATCH 092/124] WIP: arm64: dts: meson: add support for Venz V10
 
 The Venz V10 is an Android STB based on the Amlogic P212 (GXL)
 reference design with an S905L chip and the following specs:
@@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905l-venz-v10.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 1680f7f6dbd6..fbeea2278187 100644
+index 2c4c83cc0a04..81e8195509b4 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
+@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch

@@ -1,7 +1,7 @@
-From a2dac2285a5381e7265efbe188c9ba4ba499dedf Mon Sep 17 00:00:00 2001
+From 2efd1b2f6307fd48c46cfce51509fe28734f894d Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:15:41 +0000
-Subject: [PATCH 090/119] WIP: dt-bindings: vendor-prefixes: add tbee prefix
+Subject: [PATCH 093/124] WIP: dt-bindings: vendor-prefixes: add tbee prefix
 
 QUIDBox, Lda. are the Portuguese manufacturer of 'TBee' branded
 Android Set-Top Box devices.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch

@@ -1,7 +1,7 @@
-From 94dde8907583a3ea8c9de74c6f8ca5be8d9b81df Mon Sep 17 00:00:00 2001
+From 1ca81121e141538fd7afab3bd192e19946148891 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:05:11 +0000
-Subject: [PATCH 091/119] WIP: dt-bindings: arm: amlogic: add TBee Box binding
+Subject: [PATCH 094/124] WIP: dt-bindings: arm: amlogic: add TBee Box binding
 
 Add the board binding for the TBee Box.
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index fa02463f1e58..ba803d8d6eb2 100644
+index 5ff3e7f43a51..9e410dc8d0c5 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -110,6 +110,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch

@@ -1,7 +1,7 @@
-From 56aaccf3ceb9988ae456dd2212e701acad5f3f68 Mon Sep 17 00:00:00 2001
+From fe987620ab0641d1d8b039a3233c5576ac1a65ca Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:23:12 +0000
-Subject: [PATCH 092/119] WIP: arm64: dts: meson: add support for TBee Box
+Subject: [PATCH 095/124] WIP: arm64: dts: meson: add support for TBee Box
 
 The TBee Box is an Android STB based on the Amlogic P212 (GXL)
 reference design with an S905X chip and the following specs:
@@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-tbee.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index fbeea2278187..281a72ca8918 100644
+index 81e8195509b4..48459c7f8f1e 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
+@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch

@@ -1,7 +1,7 @@
-From b794a923fd9340a46ad7f537e3926449975014fb Mon Sep 17 00:00:00 2001
+From b8976aabd9e76725ea8a29b215a42e7320837819 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 24 Jul 2022 08:50:28 +0000
-Subject: [PATCH 093/119] WIP: dt-bindings: arm: amlogic: add Beelink GT1
+Subject: [PATCH 096/124] WIP: dt-bindings: arm: amlogic: add Beelink GT1
  binding
 
 Add the board binding for the Shenzen AZW (Beelink) GT1 Android
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index ba803d8d6eb2..5844cb31efab 100644
+index 9e410dc8d0c5..658702b68afe 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -132,6 +132,7 @@ properties:

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch

@@ -1,7 +1,7 @@
-From 80b5d49ebfd2ab56d74441e7a22ce252fd4b686f Mon Sep 17 00:00:00 2001
+From a0cb03cf21bb5654eb6937e7dff58621d8806bfc Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 10:01:03 +0000
-Subject: [PATCH 094/119] WIP: arm64: dts: meson: add support for Beelink GT1
+Subject: [PATCH 097/124] WIP: arm64: dts: meson: add support for Beelink GT1
 
 The Beelink GT1 is based on the Amlogic S912 (Q200) reference
 design with the following specifications:
@@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 281a72ca8918..3fad85258de2 100644
+index 48459c7f8f1e..187c83c4c61e 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
+@@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb