linux: update Amlogic patches for Linux 5.19.y

packages/linux/package.mk

@@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"
 
 case "${LINUX}" in
   amlogic)
-    PKG_VERSION="3d7cb6b04c3f3115719235cc6866b10326de34cd" # 5.19
+    PKG_VERSION="58df6af8cea3c5377c0220d9fb47cbf85a216f54" # 5.19.12
-    PKG_SHA256="3e35fa50a8a388ceee5cac5e6c2d08d558594891ec7fd83a193aba44b81e2388"
+    PKG_SHA256="906b4eb148b31d1b65bd425511bcd805b9682f51f4af46d8ae9ea605e76f2b6e"
     PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

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

@@ -1,7 +1,7 @@
-From 2b1bd0511669a7ab73f82e927e973c4ede5e9f8d Mon Sep 17 00:00:00 2001
+From 247e66150aba802bbe0318ba7b6e34775e15e4c3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:41:51 +0000
-Subject: [PATCH 01/75] LOCAL: set meson-gx cma pool to 896MB
+Subject: [PATCH 01/74] 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 1f745f70a5fa74abfe3bd8524bdaab566eb50db4 Mon Sep 17 00:00:00 2001
+From 91461a46644d52131194c47bc6dab98f57bd3701 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 14 Aug 2019 19:58:14 +0000
-Subject: [PATCH 02/75] LOCAL: set meson-g12 cma pool to 896MB
+Subject: [PATCH 02/74] 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 25763a1eac236b3f789dbf658ae3cfcff0b00662 Mon Sep 17 00:00:00 2001
+From 82f0c8be5235d940c0afc57a0a0b7c84a4eb7112 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 13 Apr 2019 05:45:18 +0000
-Subject: [PATCH 03/75] LOCAL: arm64: fix Kodi sysinfo CPU information
+Subject: [PATCH 03/74] 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 03cc9fe426ad4d7f375e79ded1638f8b7bf06622 Mon Sep 17 00:00:00 2001
+From ce1928b0ad20302a56439d28a49347b23b141c31 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:23 +0100
-Subject: [PATCH 04/75] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend
+Subject: [PATCH 04/74] 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 c38b428d5f71cd9b280e47de491d921d7ef56ecf Mon Sep 17 00:00:00 2001
+From f6a3d3903a03f5d56f61ad38a6a0dd2176c44db8 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:25 +0100
-Subject: [PATCH 05/75] LOCAL: arm64: dts: meson: add support for GX PM and
+Subject: [PATCH 05/74] 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 b9f93a4383fe8674cae11bc40ad553b0331f99a3 Mon Sep 17 00:00:00 2001
+From a82296c5a5c357e4b023e7ce180b022a94241e68 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 21 Jan 2021 01:35:36 +0000
-Subject: [PATCH 06/75] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 06/74] 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 3dea5e4ebff6a2dc86ef76ec338d98998cdf57b6 Mon Sep 17 00:00:00 2001
+From a7a0f8594720438b2aa07fc16248c73f8e4ca8ee Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 6 Nov 2021 13:01:08 +0000
-Subject: [PATCH 07/75] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to
+Subject: [PATCH 07/74] 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 cc5722c29ba86a052d824bf1398c300ac4ba8399 Mon Sep 17 00:00:00 2001
+From 66d1c4889050782c17d9516c0a9954d3d42e702f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 1 Feb 2021 19:27:40 +0000
-Subject: [PATCH 08/75] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
+Subject: [PATCH 08/74] 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 544bb9c29c1a32cf0f4c9af43bd0af79199ab154 Mon Sep 17 00:00:00 2001
+From 9d6124fd8159b28826e9f4e94194de18b36064ce 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 09/75] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls
+Subject: [PATCH 09/74] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls
  to device 0
 
 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec
@@ -25,7 +25,7 @@ Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
-index 1fc7c50ffa62..9b40289c1fd1 100644
+index 40751e5aff09..1461463dc320 100644
 --- a/sound/core/pcm_lib.c
 +++ b/sound/core/pcm_lib.c
 @@ -2514,7 +2514,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream,

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

@@ -1,7 +1,7 @@
-From aee6af1b7f123920a3f43afcdb5832c335df909c Mon Sep 17 00:00:00 2001
+From 0a629b7890645c75758f485910f969d0fe4266e8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 3 Jan 2022 10:44:17 +0000
-Subject: [PATCH 10/75] LOCAL: usb: hub: disable autosuspend for Genesys Logic
+Subject: [PATCH 10/74] LOCAL: usb: hub: disable autosuspend for Genesys Logic
  Hubs
 
 Disable autosuspend in Genesys Logic hubs to allow USB devices on the
@@ -17,7 +17,7 @@ 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 68e9121c1878..3c49deb22e68 100644
+index dfef85a18eb5..5073d9ba84c2 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -5807,7 +5807,7 @@ static const struct usb_device_id hub_id_table[] = {

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

@@ -1,7 +1,7 @@
-From 35adc9b22d31e08b16ec81373a590087bf3a923d Mon Sep 17 00:00:00 2001
+From 151002bbd9f3c16d7975caf4f5f1deaec3c836b2 Mon Sep 17 00:00:00 2001
 From: Stefan Agner <stefan@agner.ch>
 Date: Wed, 15 Sep 2021 05:00:45 +0000
-Subject: [PATCH 11/75] LOCAL: of: partial revert of fdt.c changes
+Subject: [PATCH 11/74] 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:
@@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 9 deletions(-)
 
 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
-index a8f5b6532165..2d992db033ff 100644
+index 583ca847a39c..f23eb84b1a96 100644
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
 @@ -481,15 +481,6 @@ static int __init early_init_dt_reserve_memory_arch(phys_addr_t base,

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.0-arm64-dts-meson-add-gpio-fan-control-to-.patch

@@ -1,7 +1,7 @@
-From 19c172b34df55d5ee8119804f8ff410035420c33 Mon Sep 17 00:00:00 2001
+From dbc46a97d2fcaea94f115506d077399e5b2620b4 Mon Sep 17 00:00:00 2001
 From: Furkan Kardame <f.kardame@manjaro.org>
 Date: Tue, 14 Jun 2022 04:09:19 +0000
-Subject: [PATCH 12/75] FROMGIT(5.20): arm64: dts: meson: add gpio-fan control
+Subject: [PATCH 12/74] FROMGIT(6.0): arm64: dts: meson: add gpio-fan control
  to GS-King-X
 
 GS-King-X has a single speed GPIO fan which is always-on by default.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.0-drm-meson-add-YUV422-output-support.patch

@@ -1,7 +1,7 @@
-From 9713c977296bc055cd82da3f02459cf6fec285b7 Mon Sep 17 00:00:00 2001
+From 10f4c3dd4aae21780200346502efc730530c7605 Mon Sep 17 00:00:00 2001
 From: Dongjin Kim <tobetter@gmail.com>
 Date: Mon, 16 May 2022 05:46:15 +0000
-Subject: [PATCH 23/75] FROMLIST(v1): drm/meson: add YUV422 output support
+Subject: [PATCH 13/74] FROMGIT(6.0): drm/meson: add YUV422 output support
 
 Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI
 controller. Without this YUV422 format out of the HDMI encoder
@@ -16,7 +16,7 @@ Tested-by: Furkan Kardame <f.kardame@manjaro.org>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
-index 5e306de6f485..08529efb4405 100644
+index a7692584487c..2f616c55c271 100644
 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
 @@ -218,7 +218,8 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch

@@ -1,233 +0,0 @@
-From 4dd759aa3c2fbb3d5d1b75f4e45fe516510d0c71 Mon Sep 17 00:00:00 2001
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Date: Sun, 3 Oct 2021 05:35:48 +0000
-Subject: [PATCH 13/75] FROMLIST(v1): ASoC: meson: aiu: Fix HDMI codec control
- selection
-
-The HDMI controllers on Amlogic Meson SoCs which use the AIU
-audio-controller have two different audio format inputs:
-- I2S which is also the only configuration supported on GXBB, GXL and
-  GXM SoCs since there's no SPDIF support in the DesignWare HDMI
-  controller driver (at the time of writing this)
-- SPDIF can be used optionally, including pass-through formats
-
-Switching between these requires us to set different registers:
-AIU_HDMI_CLK_DATA_CTRL[1:0] "HDMI_DATA_CLK_SEL":
-- 0x0 disables the HDMI output clock
-- 0x1 selects the PCM clock
-- 0x2 selects the AIU clock
-- 0x3 is reserved
-
-AIU_HDMI_CLK_DATA_CTRL[5:4] "HDMI_DATA_SEL":
-- 0x0 outputs constant zero, disables HDMI data
-- 0x1 selects PCM data
-- 0x2 selects AIU I2S data
-- 0x3 is reserved
-
-AIU_CLK_CTRL_MORE[6] "HDMITX_SEL_AOCLKX2":
-- 0x0 selects cts_i958 as AIU clk to hdmi_tx_audio_master_clk
-- 0x1 selects cts_aoclkx2_int as AIU clk to hdmi_tx_audio_master_clk
-
-The Meson8/8b/8m2 vendor driver uses the following settings:
-SPDIF output to the HDMI controller:
-- 0x2 (AIU clock) in AIU_HDMI_CLK_DATA_CTRL[1:0]
-- 0x0 (no HDMI data) in AIU_HDMI_CLK_DATA_CTRL[5:4]
-- 0x0 (using cts_i958 as AIU clk) in AIU_CLK_CTRL_MORE[6]
-I2S output to the HDMI controller:
-- 0x2 (AIU clock) in AIU_HDMI_CLK_DATA_CTRL[1:0]
-- 0x2 (I2S data) in AIU_HDMI_CLK_DATA_CTRL[5:4]
-- 0x0 (using cts_aoclkx2_int as AIU clk) in AIU_CLK_CTRL_MORE[6]
-
-The GXBB/GXL/GXM vendor driver uses the following settings:
-SPDIF output to the HDMI controller:
-- not setting AIU_HDMI_CLK_DATA_CTRL at all
-- 0x0 (using cts_i958 as AIU clk) in AIU_CLK_CTRL_MORE[6]
-I2S output to the HDMI controller:
-- 0x2 (AIU clock) in AIU_HDMI_CLK_DATA_CTRL[1:0]
-- 0x2 (I2S data) in AIU_HDMI_CLK_DATA_CTRL[5:4]
-- 0x0 (using cts_aoclkx2_int as AIU clk) in AIU_CLK_CTRL_MORE[6]
-
-Set the three registers at the same time following what the vendor
-driver does on Meson8/8b/8m2 SoCs. This makes the SPDIF output to the
-HDMI controller work. The entries and order of the entries in the enum
-is not changed on purpose to not break old configurations.
-
-Fixes: b82b734c0e9a7 ("ASoC: meson: aiu: add hdmi codec control support")
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
----
- sound/soc/meson/aiu-codec-ctrl.c  | 108 ++++++++++++++++++++++--------
- sound/soc/meson/aiu-encoder-i2s.c |   6 --
- 2 files changed, 80 insertions(+), 34 deletions(-)
-
-diff --git a/sound/soc/meson/aiu-codec-ctrl.c b/sound/soc/meson/aiu-codec-ctrl.c
-index 286ac4983d40..616cc7ca7775 100644
---- a/sound/soc/meson/aiu-codec-ctrl.c
-+++ b/sound/soc/meson/aiu-codec-ctrl.c
-@@ -12,14 +12,60 @@
- #include "aiu.h"
- #include "meson-codec-glue.h"
- 
--#define CTRL_CLK_SEL		GENMASK(1, 0)
--#define CTRL_DATA_SEL_SHIFT	4
--#define CTRL_DATA_SEL		(0x3 << CTRL_DATA_SEL_SHIFT)
--
--static const char * const aiu_codec_ctrl_mux_texts[] = {
--	"DISABLED", "PCM", "I2S",
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL			GENMASK(1, 0)
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_DISABLE		0x0
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_PCM		0x1
-+#define AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_AIU		0x2
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL			GENMASK(5, 4)
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_OUTPUT_ZERO	0x0
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_PCM_DATA	0x1
-+#define AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_I2S_DATA	0x2
-+
-+#define AIU_CLK_CTRL_MORE_AMCLK				BIT(6)
-+
-+#define AIU_HDMI_CTRL_MUX_DISABLED			0
-+#define AIU_HDMI_CTRL_MUX_PCM				1
-+#define AIU_HDMI_CTRL_MUX_I2S				2
-+
-+static const char * const aiu_codec_hdmi_ctrl_mux_texts[] = {
-+	[AIU_HDMI_CTRL_MUX_DISABLED] =  "DISABLED",
-+	[AIU_HDMI_CTRL_MUX_PCM] = "PCM",
-+	[AIU_HDMI_CTRL_MUX_I2S] = "I2S",
- };
- 
-+static int aiu_codec_ctrl_mux_get_enum(struct snd_kcontrol *kcontrol,
-+				       struct snd_ctl_elem_value *ucontrol)
-+{
-+	struct snd_soc_component *component =
-+		snd_soc_dapm_kcontrol_component(kcontrol);
-+	unsigned int ctrl, more, mux = AIU_HDMI_CTRL_MUX_DISABLED;
-+
-+	ctrl = snd_soc_component_read(component, AIU_HDMI_CLK_DATA_CTRL);
-+	if (FIELD_GET(AIU_HDMI_CLK_DATA_CTRL_CLK_SEL, ctrl) !=
-+	    AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_AIU) {
-+		goto out;
-+	}
-+
-+	more = snd_soc_component_read(component, AIU_CLK_CTRL_MORE);
-+	if (FIELD_GET(AIU_HDMI_CLK_DATA_CTRL_DATA_SEL, ctrl) ==
-+	    AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_I2S_DATA &&
-+	    !!(more & AIU_CLK_CTRL_MORE_AMCLK)) {
-+		mux = AIU_HDMI_CTRL_MUX_I2S;
-+		goto out;
-+	}
-+
-+	if (FIELD_GET(AIU_HDMI_CLK_DATA_CTRL_DATA_SEL, ctrl) ==
-+	    AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_OUTPUT_ZERO &&
-+	    !(more & AIU_CLK_CTRL_MORE_AMCLK)) {
-+		mux = AIU_HDMI_CTRL_MUX_PCM;
-+		goto out;
-+	}
-+
-+out:
-+	ucontrol->value.enumerated.item[0] = mux;
-+	return 0;
-+}
-+
- static int aiu_codec_ctrl_mux_put_enum(struct snd_kcontrol *kcontrol,
- 				       struct snd_ctl_elem_value *ucontrol)
- {
-@@ -28,45 +74,51 @@ static int aiu_codec_ctrl_mux_put_enum(struct snd_kcontrol *kcontrol,
- 	struct snd_soc_dapm_context *dapm =
- 		snd_soc_dapm_kcontrol_dapm(kcontrol);
- 	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
--	unsigned int mux, changed;
-+	unsigned int mux, ctrl, more;
- 
- 	mux = snd_soc_enum_item_to_val(e, ucontrol->value.enumerated.item[0]);
--	changed = snd_soc_component_test_bits(component, e->reg,
--					      CTRL_DATA_SEL,
--					      FIELD_PREP(CTRL_DATA_SEL, mux));
- 
--	if (!changed)
--		return 0;
-+	if (mux == AIU_HDMI_CTRL_MUX_I2S) {
-+		ctrl = FIELD_PREP(AIU_HDMI_CLK_DATA_CTRL_DATA_SEL,
-+				  AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_I2S_DATA);
-+		more = AIU_CLK_CTRL_MORE_AMCLK;
-+	} else {
-+		ctrl = FIELD_PREP(AIU_HDMI_CLK_DATA_CTRL_DATA_SEL,
-+				  AIU_HDMI_CLK_DATA_CTRL_DATA_SEL_OUTPUT_ZERO);
-+		more = 0;
-+	}
-+
-+	if (mux == AIU_HDMI_CTRL_MUX_DISABLED) {
-+		ctrl |= FIELD_PREP(AIU_HDMI_CLK_DATA_CTRL_CLK_SEL,
-+				   AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_DISABLE);
-+	} else {
-+		ctrl |= FIELD_PREP(AIU_HDMI_CLK_DATA_CTRL_CLK_SEL,
-+				   AIU_HDMI_CLK_DATA_CTRL_CLK_SEL_AIU);
-+	}
- 
- 	/* Force disconnect of the mux while updating */
- 	snd_soc_dapm_mux_update_power(dapm, kcontrol, 0, NULL, NULL);
- 
--	/* Reset the source first */
--	snd_soc_component_update_bits(component, e->reg,
--				      CTRL_CLK_SEL |
--				      CTRL_DATA_SEL,
--				      FIELD_PREP(CTRL_CLK_SEL, 0) |
--				      FIELD_PREP(CTRL_DATA_SEL, 0));
-+	snd_soc_component_update_bits(component, AIU_HDMI_CLK_DATA_CTRL,
-+				      AIU_HDMI_CLK_DATA_CTRL_CLK_SEL |
-+				      AIU_HDMI_CLK_DATA_CTRL_DATA_SEL,
-+				      ctrl);
- 
--	/* Set the appropriate source */
--	snd_soc_component_update_bits(component, e->reg,
--				      CTRL_CLK_SEL |
--				      CTRL_DATA_SEL,
--				      FIELD_PREP(CTRL_CLK_SEL, mux) |
--				      FIELD_PREP(CTRL_DATA_SEL, mux));
-+	snd_soc_component_update_bits(component, AIU_CLK_CTRL_MORE,
-+				      AIU_CLK_CTRL_MORE_AMCLK,
-+				      more);
- 
- 	snd_soc_dapm_mux_update_power(dapm, kcontrol, mux, e, NULL);
- 
- 	return 1;
- }
- 
--static SOC_ENUM_SINGLE_DECL(aiu_hdmi_ctrl_mux_enum, AIU_HDMI_CLK_DATA_CTRL,
--			    CTRL_DATA_SEL_SHIFT,
--			    aiu_codec_ctrl_mux_texts);
-+static SOC_ENUM_SINGLE_VIRT_DECL(aiu_hdmi_ctrl_mux_enum,
-+				 aiu_codec_hdmi_ctrl_mux_texts);
- 
- static const struct snd_kcontrol_new aiu_hdmi_ctrl_mux =
- 	SOC_DAPM_ENUM_EXT("HDMI Source", aiu_hdmi_ctrl_mux_enum,
--			  snd_soc_dapm_get_enum_double,
-+			  aiu_codec_ctrl_mux_get_enum,
- 			  aiu_codec_ctrl_mux_put_enum);
- 
- static const struct snd_soc_dapm_widget aiu_hdmi_ctrl_widgets[] = {
-diff --git a/sound/soc/meson/aiu-encoder-i2s.c b/sound/soc/meson/aiu-encoder-i2s.c
-index 67729de41a73..88637deb2d7a 100644
---- a/sound/soc/meson/aiu-encoder-i2s.c
-+++ b/sound/soc/meson/aiu-encoder-i2s.c
-@@ -23,7 +23,6 @@
- #define AIU_CLK_CTRL_AOCLK_INVERT	BIT(6)
- #define AIU_CLK_CTRL_LRCLK_INVERT	BIT(7)
- #define AIU_CLK_CTRL_LRCLK_SKEW		GENMASK(9, 8)
--#define AIU_CLK_CTRL_MORE_HDMI_AMCLK	BIT(6)
- #define AIU_CLK_CTRL_MORE_I2S_DIV	GENMASK(5, 0)
- #define AIU_CODEC_DAC_LRCLK_CTRL_DIV	GENMASK(11, 0)
- 
-@@ -176,11 +175,6 @@ static int aiu_encoder_i2s_set_clocks(struct snd_soc_component *component,
- 	if (ret)
- 		return ret;
- 
--	/* Make sure amclk is used for HDMI i2s as well */
--	snd_soc_component_update_bits(component, AIU_CLK_CTRL_MORE,
--				      AIU_CLK_CTRL_MORE_HDMI_AMCLK,
--				      AIU_CLK_CTRL_MORE_HDMI_AMCLK);
--
- 	return 0;
- }
- 
--- 
-2.17.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.1-dt-bindings-arm-amlogic-add-Beelink-GT1-.patch

@@ -1,7 +1,7 @@
-From 1dfeab40b8ab4f6a0ba5cb8879fb1bf4508e420d Mon Sep 17 00:00:00 2001
+From b0afe58898244c7e9c1cf272ddffc25a7ce4da3b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 09:58:31 +0000
-Subject: [PATCH 24/75] FROMLIST(v1): dt-bindings: arm: amlogic: add Beelink
+Subject: [PATCH 14/74] FROMGIT(6.1): dt-bindings: arm: amlogic: add Beelink
  GT1 Ultimate binding
 
 Add the board binding for the Shenzen AZW (Beelink) GT1 Ultimate

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.1-arm64-dts-meson-add-support-for-Beelink-.patch

@@ -1,7 +1,7 @@
-From 8d3f924d7473a524f358fe75e0a0e8e2d6772f74 Mon Sep 17 00:00:00 2001
+From 7abfd3089fc12119f2e769a8843a638b23a3ad33 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 09:58:31 +0000
-Subject: [PATCH 25/75] FROMLIST(v1): arm64: dts: meson: add support for
+Subject: [PATCH 15/74] FROMGIT(6.1): arm64: dts: meson: add support for
  Beelink GT1-Ultimate
 
 The Beelink GT1-Ultimate is based on the Amlogic S912 (Q200)
@@ -23,8 +23,8 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
 ---
  arch/arm64/boot/dts/amlogic/Makefile          |  1 +
- .../dts/amlogic/meson-gxm-gt1-ultimate.dts    | 87 +++++++++++++++++++
+ .../dts/amlogic/meson-gxm-gt1-ultimate.dts    | 91 +++++++++++++++++++
- 2 files changed, 88 insertions(+)
+ 2 files changed, 92 insertions(+)
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
@@ -41,10 +41,10 @@ index 8773211df50e..641399fcbdd9 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts
 new file mode 100644
-index 000000000000..b9ed5974e388
+index 000000000000..2c267884cc16
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1-ultimate.dts
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,91 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) Christian Hewitt <christianshewitt@gmail.com>
@@ -111,6 +111,10 @@ index 000000000000..b9ed5974e388
 +	};
 +};
 +
++&ir {
++	linux,rc-map-name = "rc-beelink-gs1";
++};
++
 +&sd_emmc_a {
 +	brcmf: wifi@1 {
 +		reg = <1>;

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch

@@ -1,7 +1,7 @@
-From 3ede9d442c5dee6360d20b70c1c04a9263fdddc7 Mon Sep 17 00:00:00 2001
+From eb46b649b52b6d7654bcde757f598ef05c567d9c Mon Sep 17 00:00:00 2001
 From: David Heidelberg <david@ixit.cz>
 Date: Sat, 27 Nov 2021 07:23:35 +0000
-Subject: [PATCH 14/75] FROMLIST(v1): arm64: dts: meson: make dts use gpio-fan
+Subject: [PATCH 16/74] FROMLIST(v1): arm64: dts: meson: make dts use gpio-fan
  matrix instead of array
 
 No functional changes.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v3-Bluetooth-btrtl-Add-support-for-RTL8822C.patch

@@ -1,35 +0,0 @@
-From d3aede8de7bf4bc39ce608b60cc58c505447f915 Mon Sep 17 00:00:00 2001
-From: Vyacheslav Bocharov <adeep@lexina.in>
-Date: Sat, 15 Jan 2022 08:27:14 +0000
-Subject: [PATCH 16/75] FROMLIST(v3): Bluetooth: btrtl: Add support for
- RTL8822C hci_ver 0x08
-
-Add detection of RTL8822CS controller with hci_ver = 0x08
-
-Signed-off-by: Vyacheslav Bocharov <adeep@lexina.in>
----
- drivers/bluetooth/btrtl.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
-index 47c28fd8f006..64a9057571c4 100644
---- a/drivers/bluetooth/btrtl.c
-+++ b/drivers/bluetooth/btrtl.c
-@@ -166,6 +166,14 @@ static const struct id_table ic_id_table[] = {
- 	  .fw_name  = "rtl_bt/rtl8822cs_fw.bin",
- 	  .cfg_name = "rtl_bt/rtl8822cs_config" },
- 
-+	/* 8822C with UART interface */
-+	{ IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0x8, HCI_UART),
-+	  .config_needed = true,
-+	  .has_rom_version = true,
-+	  .has_msft_ext = true,
-+	  .fw_name  = "rtl_bt/rtl8822cs_fw.bin",
-+	  .cfg_name = "rtl_bt/rtl8822cs_config" },
-+
- 	/* 8822C with USB interface */
- 	{ IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB),
- 	  .config_needed = false,
--- 
-2.17.1
-

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

@@ -1,7 +1,7 @@
-From a8d9be01f3aac3c391d1f56a2223688684ed4de0 Mon Sep 17 00:00:00 2001
+From cfcd9349d43af6ff28d32744fc42999a7c2f435b 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 15/75] FROMLIST(v1): mmc: meson-gx: fix deferred probing
+Subject: [PATCH 17/74] 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
@@ -16,10 +16,10 @@ Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
-index 2f08d442e557..f2ff19ff8e9d 100644
+index fc462995cf94..a2aacbffc3bf 100644
 --- a/drivers/mmc/host/meson-gx-mmc.c
 +++ b/drivers/mmc/host/meson-gx-mmc.c
-@@ -1183,8 +1183,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
+@@ -1185,8 +1185,8 @@ static int meson_mmc_probe(struct platform_device *pdev)
  	}
  
  	host->irq = platform_get_irq(pdev, 0);

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

@@ -1,7 +1,7 @@
-From 5024785091994b52560799ca2c494ac941f6fe28 Mon Sep 17 00:00:00 2001
+From 6255d66379c51221d2de0f68d9d079201b660ad8 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 17/75] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan
+Subject: [PATCH 18/74] 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-0019-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch

@@ -1,7 +1,7 @@
-From 085cde0a7950bef819899c7f63b3696c4e42b7ce Mon Sep 17 00:00:00 2001
+From 3cde771cdbdc4facd78b499f2e1f885921575414 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:24:47 +0000
-Subject: [PATCH 18/75] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro
+Subject: [PATCH 19/74] 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-0020-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch

@@ -1,7 +1,7 @@
-From 5ce6063e6f1e8612605842e30192350744488797 Mon Sep 17 00:00:00 2001
+From 84a110aacca8291ffa9f9c18cb6077d216bb570d Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 20 Feb 2022 08:26:27 +0000
-Subject: [PATCH 19/75] FROMLIST(v5): docs: ABI: document tm1628 attribute
+Subject: [PATCH 20/74] 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-0021-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch

@@ -1,7 +1,7 @@
-From b3e7f5df92ee5f42ab3b91628df712a352a6d7e1 Mon Sep 17 00:00:00 2001
+From d235356b2ed4c68088bedb3c404480301ee18cf5 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:51:20 +0000
-Subject: [PATCH 20/75] FROMLIST(v5): auxdisplay: add support for Titanmec
+Subject: [PATCH 21/74] 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-0022-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch

@@ -1,7 +1,7 @@
-From 1d2b531b9e5bb804c258399ae549bf991b4e4666 Mon Sep 17 00:00:00 2001
+From 98d6496bf44a2ca690e48d5d8256e480cbca58ba Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:52:34 +0000
-Subject: [PATCH 21/75] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add
+Subject: [PATCH 22/74] 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-0023-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch

@@ -1,7 +1,7 @@
-From 3b60a3b877ff375eb8bc9308b06162021a3f3fa1 Mon Sep 17 00:00:00 2001
+From 60ea291e13380acf89704ec1728a4d425772c354 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Mon, 4 Apr 2022 18:53:32 +0000
-Subject: [PATCH 22/75] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
+Subject: [PATCH 23/74] FROMLIST(v5): MAINTAINERS: Add entry for tm1628
  auxdisplay driver
 
 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
@@ -10,10 +10,10 @@ Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 64379c699903..dcc7ca0105b1 100644
+index 08620b9a44fc..f86c54846fca 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -20187,6 +20187,13 @@ W:	http://sourceforge.net/projects/tlan/
+@@ -20182,6 +20182,13 @@ W:	http://sourceforge.net/projects/tlan/
  F:	Documentation/networking/device_drivers/ethernet/ti/tlan.rst
  F:	drivers/net/ethernet/ti/tlan.*
  

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch

@@ -1,7 +1,7 @@
-From 2271c207fa4aae84f394144bc9110efc1025a550 Mon Sep 17 00:00:00 2001
+From 7c886fb7d120a58a8d57db0f760d377e94edad4a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 23 Dec 2018 02:24:38 +0100
-Subject: [PATCH 28/75] WIP: ASoC: hdmi-codec: reorder channel allocation list
+Subject: [PATCH 24/74] WIP: 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-0025-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch

@@ -1,7 +1,7 @@
-From 9fcfbded7ec780193fbde939100b6ff06df2024e Mon Sep 17 00:00:00 2001
+From 908e95599cd5dfffafff6f8b5382aea9b3ae5a22 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 14 Jan 2021 17:43:02 +0100
-Subject: [PATCH 29/75] WIP: mmc: meson-gx-mmc: set core clock phase to 270
+Subject: [PATCH 25/74] WIP: mmc: meson-gx-mmc: set core clock phase to 270
  degrees for AXG compatible controllers
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
@@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
-index f2ff19ff8e9d..396fabce04ac 100644
+index a2aacbffc3bf..c16ac828b6f9 100644
 --- a/drivers/mmc/host/meson-gx-mmc.c
 +++ b/drivers/mmc/host/meson-gx-mmc.c
 @@ -38,6 +38,7 @@
@@ -38,7 +38,7 @@ index f2ff19ff8e9d..396fabce04ac 100644
  	clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, CLK_PHASE_0);
  	clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, CLK_PHASE_0);
  	writel(clk_reg, host->regs + SD_EMMC_CLOCK);
-@@ -1326,6 +1328,7 @@ static const struct meson_mmc_data meson_gx_data = {
+@@ -1328,6 +1330,7 @@ static const struct meson_mmc_data meson_gx_data = {
  	.rx_delay_mask	= CLK_V2_RX_DELAY_MASK,
  	.always_on	= CLK_V2_ALWAYS_ON,
  	.adjust		= SD_EMMC_ADJUST,
@@ -46,7 +46,7 @@ index f2ff19ff8e9d..396fabce04ac 100644
  };
  
  static const struct meson_mmc_data meson_axg_data = {
-@@ -1333,6 +1336,7 @@ static const struct meson_mmc_data meson_axg_data = {
+@@ -1335,6 +1338,7 @@ static const struct meson_mmc_data meson_axg_data = {
  	.rx_delay_mask	= CLK_V3_RX_DELAY_MASK,
  	.always_on	= CLK_V3_ALWAYS_ON,
  	.adjust		= SD_EMMC_V3_ADJUST,

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-RFT-arm64-dts-amlogic-enable-ethernet-reset.patch

@@ -1,45 +0,0 @@
-From e936402c4c053ada91a170a484865c8f8d9f397c Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 16 Jun 2022 11:03:49 +0200
-Subject: [PATCH 26/75] FROMLIST(RFT): arm64: dts: amlogic: enable ethernet
- reset
-
-Enable the ethernet reset to help solve the intilization issue
-seen on the Amlogic SoCs with the internal phy path.
-
-Suggested-by: Qi Duan <qi.duan@amlogic.com>
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
----
- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 ++
- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi        | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-index 2c56b216d6f9..6af4894856da 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
-@@ -181,6 +181,8 @@
- 				      "timing-adjustment";
- 			rx-fifo-depth = <4096>;
- 			tx-fifo-depth = <2048>;
-+			resets = <&reset RESET_ETHERNET>;
-+			reset-names = "stmmaceth";
- 			status = "disabled";
- 
- 			mdio0: mdio {
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-index c3ac531c4f84..57f2087c65b2 100644
---- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
-@@ -134,6 +134,8 @@
- 		 <&clkc CLKID_MPLL2>,
- 		 <&clkc CLKID_FCLK_DIV2>;
- 	clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
-+	resets = <&reset RESET_ETHERNET>;
-+	reset-names = "stmmaceth";
- 
- 	mdio0: mdio {
- 		#address-cells = <1>;
--- 
-2.17.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch

@@ -1,7 +1,7 @@
-From 23f083810d775e2a41e998551e64b3e4db19623d Mon Sep 17 00:00:00 2001
+From 85039c29cc87d4ca3199fa04dac4fead5efab1d2 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:50:01 +0000
-Subject: [PATCH 30/75] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi
+Subject: [PATCH 26/74] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi
 
 The P212 has a combined WiFi/BT module. The BT side is already enabled
 in the dtsi but the WiFi side is not. Let's enable the WiFi module.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-RFT-net-stmmac-do-not-poke-MAC_CTRL_REG-twi.patch

@@ -1,92 +0,0 @@
-From a4b987f6676cff06a193834f18f8c2cfe1a8e96d Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Thu, 30 Jun 2022 15:56:35 +0200
-Subject: [PATCH 27/75] FROMLIST(RFT): net: stmmac: do not poke MAC_CTRL_REG
- twice on link up
-
-For some reason, poking MAC_CTRL_REG a second time, even with the same
-value, causes problem on the dwmac 3.70a.
-
-This problem happens on all the Amlogic SoCs, on link up, when the RMII
-10/100 internal interface is used. The problem does not happen on boards
-using the external RGMII 10/100/1000 interface. Initially we suspected the
-PHY to be the problem but after a lot of testing, the problem seems to be
-coming from the MAC controller.
-
-> meson8b-dwmac c9410000.ethernet: IRQ eth_wake_irq not found
-> meson8b-dwmac c9410000.ethernet: IRQ eth_lpi not found
-> meson8b-dwmac c9410000.ethernet: PTP uses main clock
-> meson8b-dwmac c9410000.ethernet: User ID: 0x11, Synopsys ID: 0x37
-> meson8b-dwmac c9410000.ethernet: DWMAC1000
-> meson8b-dwmac c9410000.ethernet: DMA HW capability register supported
-> meson8b-dwmac c9410000.ethernet: RX Checksum Offload Engine supported
-> meson8b-dwmac c9410000.ethernet: COE Type 2
-> meson8b-dwmac c9410000.ethernet: TX Checksum insertion supported
-> meson8b-dwmac c9410000.ethernet: Wake-Up On Lan supported
-> meson8b-dwmac c9410000.ethernet: Normal descriptors
-> meson8b-dwmac c9410000.ethernet: Ring mode enabled
-> meson8b-dwmac c9410000.ethernet: Enable RX Mitigation via HW Watchdog Timer
-
-The problem is not systematic. Its occurence is very random from 1/50 to
-1/2. It is fairly easy to detect by setting the kernel to boot over NFS and
-possibly setting it to reboot automatically when reaching the prompt.
-
-When problem happens, the link is reported up by the PHY but no packet are
-actually going out. DHCP requests eventually times out and the kernel reset
-the interface. It may take several attempts but it will eventually work.
-
-> meson8b-dwmac ff3f0000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx
-> Sending DHCP requests ...... timed out!
-> meson8b-dwmac ff3f0000.ethernet eth0: Link is Down
-> IP-Config: Retrying forever (NFS root)...
-> meson8b-dwmac ff3f0000.ethernet eth0: PHY [0.1:08] driver [Meson G12A Internal PHY] (irq=POLL)
-> meson8b-dwmac ff3f0000.ethernet eth0: Register MEM_TYPE_PAGE_POOL RxQ-0
-> meson8b-dwmac ff3f0000.ethernet eth0: No Safety Features support found
-> meson8b-dwmac ff3f0000.ethernet eth0: PTP not supported by HW
-> meson8b-dwmac ff3f0000.ethernet eth0: configuring for phy/rmii link mode
-> meson8b-dwmac ff3f0000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx
-> Sending DHCP requests ...... timed out!
-> meson8b-dwmac ff3f0000.ethernet eth0: Link is Down
-> IP-Config: Retrying forever (NFS root)...
-> [...] 5 retries ...
-> IP-Config: Retrying forever (NFS root)...
-> meson8b-dwmac ff3f0000.ethernet eth0: PHY [0.1:08] driver [Meson G12A Internal PHY] (irq=POLL)
-> meson8b-dwmac ff3f0000.ethernet eth0: Register MEM_TYPE_PAGE_POOL RxQ-0
-> meson8b-dwmac ff3f0000.ethernet eth0: No Safety Features support found
-> meson8b-dwmac ff3f0000.ethernet eth0: PTP not supported by HW
-> meson8b-dwmac ff3f0000.ethernet eth0: configuring for phy/rmii link mode
-> meson8b-dwmac ff3f0000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx
-> Sending DHCP requests ., OK
-> IP-Config: Got DHCP answer from 10.1.1.1, my address is 10.1.3.229
-
-Of course the same problem happens when not using NFS and it fairly
-difficult for IoT products to detect this situation and recover.
-
-The call to stmmac_mac_set() should be no-op in our case, the bits it sets
-have already been set by an earlier call to stmmac_mac_set(). However
-removing this call solves the problem.
-
-Even weirder, keeping the call to stmmac_mac_set() but inserting a
-udelay(1) between writel() and stmmac_mac_set() solves the problem too.
-
-Suggested-by: Qi Duan <qi.duan@amlogic.com>
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
----
- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index c5f33630e771..863f7d114807 100644
---- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -1063,7 +1063,6 @@ static void stmmac_mac_link_up(struct phylink_config *config,
- 
- 	writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
- 
--	stmmac_mac_set(priv, priv->ioaddr, true);
- 	if (phy && priv->dma_cap.eee) {
- 		priv->eee_active = phy_init_eee(phy, 1) >= 0;
- 		priv->eee_enabled = stmmac_eee_init(priv);
--- 
-2.17.1
-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-WIP-arm64-dts-meson-move-pwm_ef-node-in-P212-dtsi.patch

@@ -1,7 +1,7 @@
-From 9c2d05725430d26850dc0c2f7be36fdb128c8bcb Mon Sep 17 00:00:00 2001
+From 69d57634a73b54e79fa9cdbe01c62f09ede03cff Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:56:12 +0000
-Subject: [PATCH 31/75] WIP: arm64: dts: meson: move pwm_ef node in P212 dtsi
+Subject: [PATCH 27/74] WIP: 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-0028-WIP-arm64-dts-meson-remove-WiFi-BT-nodes-from-Khadas.patch

@@ -1,7 +1,7 @@
-From d2239d46d002c83d0a8ccf03efd6faef52884752 Mon Sep 17 00:00:00 2001
+From a9257bfe0b4cd7fae58c40a8c46953c12e83d441 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 03:58:58 +0000
-Subject: [PATCH 32/75] WIP: arm64: dts: meson: remove WiFi/BT nodes from
+Subject: [PATCH 28/74] WIP: 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-0029-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch

@@ -1,7 +1,7 @@
-From 51735001adf8121f55da8387bca7f2d1400291ba Mon Sep 17 00:00:00 2001
+From 847e6f53e71ca3e9cf62b74952c5f0a9d76a3fbd Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:09:12 +0000
-Subject: [PATCH 33/75] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to
+Subject: [PATCH 29/74] 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-0030-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch

@@ -1,7 +1,7 @@
-From 4f1a2ef7b12bf107f7ec86e6bc238ad735f0b739 Mon Sep 17 00:00:00 2001
+From 7b741b0e48c129ffe051c1042ddb40564af46c23 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 06:45:06 +0000
-Subject: [PATCH 34/75] WIP: arm64: dts: meson: add UHS SDIO capabilities to
+Subject: [PATCH 30/74] 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-0031-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch

@@ -1,7 +1,7 @@
-From f04d73830d5f4585c096e2f7ebf23a379b1a9a9d Mon Sep 17 00:00:00 2001
+From 989e6f4e6b90680bde3d91e35999151ee56213c5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 18 Jan 2022 15:18:32 +0000
-Subject: [PATCH 35/75] WIP: arm64: dts: meson: remove SDIO node from Khadas
+Subject: [PATCH 31/74] 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-0032-WIP-arm64-dts-meson-add-audio-playback-to-S905X-P212.patch

@@ -1,7 +1,7 @@
-From 379e41866e2c38f515d947287781de995a60ffcb Mon Sep 17 00:00:00 2001
+From 5719d8af2251406e8b7cacc7bcf8a17bd7a32c3d Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 13 Jan 2022 04:30:44 +0000
-Subject: [PATCH 36/75] WIP: arm64: dts: meson: add audio playback to
+Subject: [PATCH 32/74] WIP: 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-0033-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch

@@ -1,7 +1,7 @@
-From cc56de97988993e74753e0b2b568831b0bc6ca89 Mon Sep 17 00:00:00 2001
+From c94c693b5167427aef0f13a2778220b61425fa8c Mon Sep 17 00:00:00 2001
 From: benjamin545 <benjamin545@gmail.com>
 Date: Thu, 15 Jul 2021 14:32:33 -0400
-Subject: [PATCH 37/75] WIP: drivers: meson: vdec: remove redundant if
+Subject: [PATCH 33/74] WIP: drivers: meson: vdec: remove redundant if
  statement
 
 checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch

@@ -1,7 +1,7 @@
-From 29ff8fc9a6da8b6b75136fe93f34c6c78edc052a Mon Sep 17 00:00:00 2001
+From b4a0f57401ded15819d353be5459b9e0d80f93f0 Mon Sep 17 00:00:00 2001
 From: benjamin545 <benjamin545@gmail.com>
 Date: Thu, 15 Jul 2021 16:32:39 -0400
-Subject: [PATCH 38/75] WIP: drivers: meson: vdec: improve mmu and fbc handling
+Subject: [PATCH 34/74] WIP: drivers: meson: vdec: improve mmu and fbc handling
  and add 10 bit handling
 
 ---

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch

@@ -1,7 +1,7 @@
-From b4969cee6f3775c460398f5df4878014dab3637a Mon Sep 17 00:00:00 2001
+From 47b920e43323b01d17b95025ca85840f66e9a9e2 Mon Sep 17 00:00:00 2001
 From: benjamin545 <benjamin545@gmail.com>
 Date: Thu, 15 Jul 2021 17:08:42 -0400
-Subject: [PATCH 39/75] WIP: drivers: meson: vdec: add HEVC decode codec
+Subject: [PATCH 35/74] WIP: drivers: meson: vdec: add HEVC decode codec
 
 ---
  drivers/staging/media/meson/vdec/Makefile     |    2 +-

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch

@@ -1,7 +1,7 @@
-From dd35e755154cb4ebdd064aeab61ef34bdd9eb8b9 Mon Sep 17 00:00:00 2001
+From a4c7ffb55438be12170ff45cf10597b5c352d877 Mon Sep 17 00:00:00 2001
 From: benjamin545 <benjamin545@gmail.com>
 Date: Mon, 2 Aug 2021 15:18:40 -0400
-Subject: [PATCH 40/75] WIP: drivers: meson: vdec: add handling to HEVC decoder
+Subject: [PATCH 36/74] WIP: drivers: meson: vdec: add handling to HEVC decoder
  to show frames when ready
 
 ..rather than when no longer referenced

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch

@@ -1,7 +1,7 @@
-From f597f34b48e106d1a5460fdee783cb93caf75e93 Mon Sep 17 00:00:00 2001
+From bfdbcbcaf8078650c9b56bdbd6cb482f8aa77218 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 21 Nov 2021 19:12:07 +0000
-Subject: [PATCH 41/75] WIP: drivers: meson: vdec: add HEVC support to GXBB
+Subject: [PATCH 37/74] WIP: drivers: meson: vdec: add HEVC support to GXBB
 
 It's not clear whether the GXL firmware is the same one used with GXBB
 but let's try it and see!

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-drivers-meson-vdec-check-if-parser-has-really-pa.patch

@@ -1,7 +1,7 @@
-From 4b1ea005ef5c543196a370f75e3dede2d2c10433 Mon Sep 17 00:00:00 2001
+From 7d274b9bd765913bb82c1e87a7af01df1c6c7c56 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Mon, 22 Nov 2021 09:15:21 +0000
-Subject: [PATCH 42/75] WIP: drivers: meson: vdec: check if parser has really
+Subject: [PATCH 38/74] WIP: drivers: meson: vdec: check if parser has really
  parser before marking input buffer as error
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-drm-meson-meson_vclk-fix-VIC-alternate-timings.patch

@@ -1,7 +1,7 @@
-From a3622464a8a8af4612bb1edef2106d26f3ca76bf Mon Sep 17 00:00:00 2001
+From 7842cc6f698e865aa64fd2ccd82cb394404d7d1b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 13 Feb 2022 08:53:39 +0000
-Subject: [PATCH 43/75] WIP: drm/meson/meson_vclk: fix VIC alternate timings
+Subject: [PATCH 39/74] WIP: drm/meson/meson_vclk: fix VIC alternate timings
 
 4K VP9 media with 59.94 fractional refresh rate refuses to play with
 the screen going blank (no sync) and the following error reported in

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-radxa-zero-add-support-for-the-u.patch

@@ -1,7 +1,7 @@
-From 2eecc79b343f1b6b0ab7fc639d5a4717a2137d85 Mon Sep 17 00:00:00 2001
+From e9ca4e424e99951968c1c29447b6c515c332c066 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 17 Aug 2021 16:16:43 +0000
-Subject: [PATCH 44/75] WIP: arm64: dts: meson: radxa-zero: add support for the
+Subject: [PATCH 40/74] WIP: arm64: dts: meson: radxa-zero: add support for the
  usb type-c controller
 
 Radxa Zero uses an FUSB302 type-c controller, so lets enable it.

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-dt-bindings-arm-amlogic-add-support-for-Radxa-Ze.patch

@@ -1,7 +1,7 @@
-From 49f84c62dd04f107b154d70360468da1313f098c Mon Sep 17 00:00:00 2001
+From db64192edc2fb334ae457511a0d62561f1991476 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 16 Feb 2022 07:27:07 +0000
-Subject: [PATCH 45/75] WIP: dt-bindings: arm: amlogic: add support for Radxa
+Subject: [PATCH 41/74] WIP: dt-bindings: arm: amlogic: add support for Radxa
  Zero2
 
 The Radxa Zero2 is a small form-factor SBC using the Amlogic

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-support-for-Radxa-Zero2.patch

@@ -1,7 +1,7 @@
-From 0930aa22785907d096568885592ab1783d8db5ed Mon Sep 17 00:00:00 2001
+From 8d0775bcc5e915f818d7f08f4fe14c6d397c2b54 Mon Sep 17 00:00:00 2001
 From: Yuntian Zhang <yt@radxa.com>
 Date: Fri, 14 Jan 2022 15:50:02 +0000
-Subject: [PATCH 46/75] WIP: arm64: dts: meson: add support for Radxa Zero2
+Subject: [PATCH 42/74] WIP: arm64: dts: meson: add support for Radxa Zero2
 
 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D
 chipset that ships in a number of eMMC configurations:

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

@@ -1,7 +1,7 @@
-From 938e81dc51978ce8fd4c6f81e30a6f38794d34c4 Mon Sep 17 00:00:00 2001
+From e7f431bb899f2b546b512c064479a64ef864ed8c Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:52:47 +0000
-Subject: [PATCH 47/75] WIP: arm64: dts: meson: add audio playback to p201
+Subject: [PATCH 43/74] WIP: arm64: dts: meson: add audio playback to p201
 
 Add initial audio support limited to HDMI i2s.
 

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

@@ -1,7 +1,7 @@
-From c56a9ebf22c4d6fcc1b2f5a485a7db12f669d977 Mon Sep 17 00:00:00 2001
+From b2dbcf59f52d0bc338f58ae8852fc5cdb34f00f9 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:56:15 +0000
-Subject: [PATCH 48/75] WIP: arm64: dts: meson: add audio playback to p200
+Subject: [PATCH 44/74] 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-0045-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch

@@ -1,7 +1,7 @@
-From c63b13fad7c2504e11afc54a0fe7f76e593757dc Mon Sep 17 00:00:00 2001
+From 8c92cbf0b9cc001ec4fdb94f1b594de9472af6e1 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 17 May 2020 05:00:55 +0000
-Subject: [PATCH 49/75] WIP: arm64: dts: meson: add audio playback to u200
+Subject: [PATCH 45/74] 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-0046-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch

@@ -1,7 +1,7 @@
-From 339cbb57fcb77463e639e0f01548c2b9a097641a Mon Sep 17 00:00:00 2001
+From 9da415f68e442b22b045fbffb9a8139f1a56b347 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 27 Nov 2021 13:50:06 +0000
-Subject: [PATCH 50/75] WIP: arm64: dts: meson: add Headphone output to Beelink
+Subject: [PATCH 46/74] 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-0047-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch

@@ -1,7 +1,7 @@
-From 90c49c4c83ca4717d4668477de7c7209ca92fa7a Mon Sep 17 00:00:00 2001
+From e30df0e8d6553f7b18846a5f3ae45b51bd1b18c7 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 29 Feb 2020 15:13:02 +0000
-Subject: [PATCH 51/75] WIP: dt-bindings: arm: amlogic: add support for the
+Subject: [PATCH 47/74] WIP: dt-bindings: arm: amlogic: add support for the
  Tanix TX5 Max
 
 The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference

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

@@ -1,7 +1,7 @@
-From dc861819f2d9be34349d66286e963aec87a22b1f Mon Sep 17 00:00:00 2001
+From b0c4805fbaa338fd29dbf3f9c9058e52102ee45f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 20 Oct 2019 04:06:59 +0000
-Subject: [PATCH 52/75] WIP: arm64: dts: meson: add support for the Tanix TX5
+Subject: [PATCH 48/74] WIP: arm64: dts: meson: add support for the Tanix TX5
  Max
 
 The Tanix TX5 Max is based on the Amlogic U200 reference design

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

@@ -1,7 +1,7 @@
-From b28698ed849823eac996f4614d2fd2f4f7aa0fe9 Mon Sep 17 00:00:00 2001
+From e9fae92ccb966cec93f7bdd40f51e0332262fe98 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 21 Oct 2019 03:58:06 +0000
-Subject: [PATCH 53/75] WIP: arm64: dts: meson: add multiple MeCool device
+Subject: [PATCH 49/74] WIP: arm64: dts: meson: add multiple MeCool device
  trees
 
 This adds initial device trees for a range of MeCool devices based on various

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

@@ -1,7 +1,7 @@
-From 3e330893dc4fbccdda31653198f11040c1ba72bb Mon Sep 17 00:00:00 2001
+From 4bcb86677ec4d4607aa1b680ea15f91753b9d81f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 11 Apr 2021 05:50:13 +0000
-Subject: [PATCH 54/75] WIP: dt-bindings: arm: amlogic: add support for Minix
+Subject: [PATCH 50/74] 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)

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

@@ -1,7 +1,7 @@
-From 747726fac2e6129166d1b005ea0cf431946073e5 Mon Sep 17 00:00:00 2001
+From e97be0fd665edfdaac208a2c1cfd0fdaf93e39bf Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 11 Apr 2021 05:52:14 +0000
-Subject: [PATCH 55/75] WIP: arm64: dts: meson: add initial device-tree for
+Subject: [PATCH 51/74] 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)

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

@@ -0,0 +1,28 @@
+From 39468dd4f4078c230d0fba9eba37ac59789eed97 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Fri, 19 Aug 2022 21:32:21 +0000
+Subject: [PATCH 52/74] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix
+ NEO-U1
+
+Add node aliases to prevent meson-vrtc from claiming /dev/rtc0
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts
+index 5343e90f9f34..5900ee92ca28 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts
+@@ -17,6 +17,7 @@
+ 
+ 	aliases {
+ 		rtc0 = &rtc;
++		rtc1 = &vrtc;
+ 	};
+ 
+ 	spdif_dit: audio-codec-0 {
+-- 
+2.17.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch

@@ -1,7 +1,7 @@
-From 47d9a20efa316bb67a90201b64bcacee1978f57c Mon Sep 17 00:00:00 2001
+From a46fcdcd5cd34ed67607a39a388265f2dc9784d2 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:33:47 +0000
-Subject: [PATCH 56/75] WIP: media: rc: add keymap for Beelink Mini MXIII
+Subject: [PATCH 53/74] WIP: media: rc: add keymap for Beelink Mini MXIII
  remote
 
 Add a keymap and bindings for the simple IR (NEC) remote used with

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

@@ -1,7 +1,7 @@
-From 0d9d25395b2dac3123c461b3fb074d1b15242a08 Mon Sep 17 00:00:00 2001
+From cf3d667f8b4248535cbaa18bb131c0a0a04ec482 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:28:50 +0000
-Subject: [PATCH 57/75] WIP: dt-bindings: arm: amlogic: add support for Beelink
+Subject: [PATCH 54/74] WIP: dt-bindings: arm: amlogic: add support for Beelink
  Mini MXIII
 
 The Beelink Mini MXIII is an Android STB based on the Amlogic P200

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

@@ -1,7 +1,7 @@
-From 0b37b12ae04300623080473dd70c6d348334a91b Mon Sep 17 00:00:00 2001
+From 3a82a58afc36c0f85c7531750d5f88aab745f888 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 8 Dec 2021 15:26:00 +0000
-Subject: [PATCH 58/75] WIP: arm64: dts: meson: add support for Beelink Mini
+Subject: [PATCH 55/74] WIP: arm64: dts: meson: add support for Beelink Mini
  MXIII
 
 This is a GXBB board that ships in two variants, one with

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

@@ -1,7 +1,7 @@
-From 1aa41701f51fc96026a071e7d86826a8def98fdc Mon Sep 17 00:00:00 2001
+From 27eec099ac7403c7815f9324d31551c8eac3fdcd Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:48:02 +0000
-Subject: [PATCH 59/75] WIP: media: rc: add keymap for MeCool M8S Pro W remote
+Subject: [PATCH 56/74] WIP: media: rc: add keymap for MeCool M8S Pro W remote
 
 Add a keymap and bindings for the simple IR (NEC) remote used with
 the MeCool M8S Pro W Android STB device.

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

@@ -1,7 +1,7 @@
-From 395569d003da2c5dc7bfa6f0e68c8c107f38804f Mon Sep 17 00:00:00 2001
+From bac190250a6f672a1c225ad794c77f143013d35c Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:15:36 +0000
-Subject: [PATCH 60/75] WIP: dt-bindings: arm: amlogic: add support for MeCool
+Subject: [PATCH 57/74] 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

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

@@ -1,7 +1,7 @@
-From 4e0cd6b3a6dfdb4f1def5d0aaec4353e39d17c1e Mon Sep 17 00:00:00 2001
+From ddea85baac5dd33e4356e7bac1bdcb24890ac74a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 16 Jan 2022 08:17:41 +0000
-Subject: [PATCH 61/75] WIP: arm64: dts: meson: add support for MeCool M8S Pro
+Subject: [PATCH 58/74] 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-0059-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch

@@ -1,7 +1,7 @@
-From 58a5c4f5091ae5b60572bc94c44990dfc87a3c74 Mon Sep 17 00:00:00 2001
+From 51a77e258b835915e775d5848f2b6a0d076231fa Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 02:40:20 +0000
-Subject: [PATCH 62/75] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
+Subject: [PATCH 59/74] WIP: dt-bindings: arm: amlogic: add Vero 4K binding
 
 Add the board binding for the OSMC Vero 4K STB device
 

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

@@ -1,7 +1,7 @@
-From 882a81445db68303152e438d180ffc327da0356e Mon Sep 17 00:00:00 2001
+From c9013d4ed7d488401cf8177da83b2cbdf7dfd064 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 19 Jan 2022 04:06:17 +0000
-Subject: [PATCH 63/75] WIP: arm64: dts: meson: add support for OSMC Vero 4K
+Subject: [PATCH 60/74] 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:

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

@@ -1,7 +1,7 @@
-From e7c81a491fddc677365072b9ec2e1471b8c2624a Mon Sep 17 00:00:00 2001
+From 6ead7feff9d085f1759a7c31056f11e72bd5717b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 12 Apr 2022 11:21:21 +0000
-Subject: [PATCH 64/75] WIP: arm64: dts: meson: add RTL8822CS bluetooth to
+Subject: [PATCH 61/74] WIP: arm64: dts: meson: add RTL8822CS bluetooth to
  X96-Air
 
 Add the uart_A/bluetooth node for the RTL8822CS chip.

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

@@ -1,7 +1,7 @@
-From 993785d866a5a02b2f11c5297e30c6aa58974772 Mon Sep 17 00:00:00 2001
+From 17f5f4abdd62b11fd06f11569bfb4154d55024af Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 10 Apr 2022 11:51:38 +0000
-Subject: [PATCH 65/75] WIP: media: rc: add keymap for Venz V10 remote
+Subject: [PATCH 62/74] 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-0063-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch

@@ -1,7 +1,7 @@
-From 81fb4bdffc4a7ec5dd27b812a4121b847144a78b Mon Sep 17 00:00:00 2001
+From 3ed9467e2c0ed331618a24e315eebdf86cdce594 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 9 Apr 2022 06:27:50 +0000
-Subject: [PATCH 66/75] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10
+Subject: [PATCH 63/74] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10
  bindings
 
 Add SOC bindings for S905L devices and the board binding for Venz V10.

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

@@ -1,7 +1,7 @@
-From 7b99ef9c0ea3512b4be276de3c82603615c23172 Mon Sep 17 00:00:00 2001
+From 897e7d04a77b8ef2e635dc00303e032932024bd8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 9 Apr 2022 06:21:58 +0000
-Subject: [PATCH 67/75] WIP: arm64: dts: meson: add support for Venz V10
+Subject: [PATCH 64/74] 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:

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

@@ -1,7 +1,7 @@
-From 610f5f3c5e3672311e8b79c816eeb56ed444baeb Mon Sep 17 00:00:00 2001
+From cdd4b20add81434bef961b7486eeb915d908c3f0 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:15:41 +0000
-Subject: [PATCH 68/75] WIP: dt-bindings: vendor-prefixes: add tbee prefix
+Subject: [PATCH 65/74] 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-0066-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch

@@ -1,7 +1,7 @@
-From b8965980734f8b8a86eb9cfd5064f81e1bb63c16 Mon Sep 17 00:00:00 2001
+From 9107c10347e27f2265c86b2df00ad7a7216d1626 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:05:11 +0000
-Subject: [PATCH 69/75] WIP: dt-bindings: arm: amlogic: add TBee Box binding
+Subject: [PATCH 66/74] WIP: dt-bindings: arm: amlogic: add TBee Box binding
 
 Add the board binding for the TBee Box.
 

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

@@ -1,7 +1,7 @@
-From 1e545fb2216f472162026d98933c543da92e609f Mon Sep 17 00:00:00 2001
+From 24cc8e727dd99df880ce05d8ece5e0ee6dc0cfa3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 05:23:12 +0000
-Subject: [PATCH 70/75] WIP: arm64: dts: meson: add support for TBee Box
+Subject: [PATCH 67/74] 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:

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

@@ -1,7 +1,7 @@
-From b97e2bd1db22d9300add5dc4f16b75c14dba65e5 Mon Sep 17 00:00:00 2001
+From 12b1ee5f81c28c88da3bb886e75ea62b0079f688 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 24 Jul 2022 08:50:28 +0000
-Subject: [PATCH 71/75] WIP: dt-bindings: arm: amlogic: add Beelink GT1 binding
+Subject: [PATCH 68/74] WIP: dt-bindings: arm: amlogic: add Beelink GT1 binding
 
 Add the board binding for the Shenzen AZW (Beelink) GT1 Android
 Set-Top Box device.

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

@@ -1,7 +1,7 @@
-From e7785dc64c6aa29f9e8b470b8eb7ad314293aca5 Mon Sep 17 00:00:00 2001
+From bbcb587f00ce1334ee9953703f2ea5af92cfc412 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 6 Jul 2022 10:01:03 +0000
-Subject: [PATCH 72/75] WIP: arm64: dts: meson: add support for Beelink GT1
+Subject: [PATCH 69/74] 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:
@@ -21,8 +21,8 @@ design with the following specifications:
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 ---
  arch/arm64/boot/dts/amlogic/Makefile          |  1 +
- arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts | 87 +++++++++++++++++++
+ arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts | 91 +++++++++++++++++++
- 2 files changed, 88 insertions(+)
+ 2 files changed, 92 insertions(+)
  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
@@ -39,10 +39,10 @@ index 3e216a8e3b2a..dc5167a86685 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts
 new file mode 100644
-index 000000000000..f2f92ea59f36
+index 000000000000..3c8d73599ce6
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,91 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) Christian Hewitt <christianshewitt@gmail.com>
@@ -109,6 +109,10 @@ index 000000000000..f2f92ea59f36
 +	};
 +};
 +
++&ir {
++	linux,rc-map-name = "rc-beelink-gs1";
++};
++
 +&sd_emmc_a {
 +	/* QCA9377 WiFi */
 +	wifi: wifi@1 {

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch

@@ -1,7 +1,7 @@
-From 2c06d13a3b7a44a38170eca2db44d2708abbeedc Mon Sep 17 00:00:00 2001
+From ccde841033875beb45eb21374ee8630bcc24ffc1 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 27 Jul 2022 10:27:10 +0000
-Subject: [PATCH 73/75] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek
+Subject: [PATCH 70/74] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek
  dtsi
 
 Add the vcc_5v regulator used by the audio DAC chip

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch

@@ -1,7 +1,7 @@
-From 5f0db7245963cbde5a256659c49c87fc75482a6b Mon Sep 17 00:00:00 2001
+From 45a6702f8645daf52033ed045ded4a16bceac3e8 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 27 Jul 2022 13:39:23 +0000
-Subject: [PATCH 74/75] WIP: arm64: dts: meson: add audio lineout to WeTek
+Subject: [PATCH 71/74] WIP: arm64: dts: meson: add audio lineout to WeTek
  Play2
 
 Add support for the ES7134LV headphone output on the WeTek Play2

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch

@@ -1,7 +1,7 @@
-From 83758d2401405407b9e714c76d4ae1e2dc4a66d2 Mon Sep 17 00:00:00 2001
+From 044610e97022f81fcfb6c5ce4963a84490787b8b Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 29 Jul 2022 08:29:20 +0000
-Subject: [PATCH 75/75] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek Hub
+Subject: [PATCH 72/74] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek Hub
 
 The original submission in commit d537d289de06 ("ARM64: dts: meson-gxbb:
 Add support for WeTek Hub and Play") shows cvbs output as disabled, but

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch

@@ -0,0 +1,34 @@
+From 835fd9b10c9d14641ee1899dd9ff475debdfe2cc Mon Sep 17 00:00:00 2001
+From: Romain Perier <romain.perier@collabora.com>
+Date: Sun, 14 Aug 2022 04:21:16 +0000
+Subject: [PATCH 73/74] WIP: ASoC: dt-bindings: add compatible for es8323-i2c
+
+Add a compatible for the everest,es8323 audio codec used with a number
+of Amlogic and Rockchip board devices.
+
+Signed-off-by: Romain Perier <romain.perier@collabora.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+Acked-by: Rob Herring <robh@kernel.org>
+---
+ Documentation/devicetree/bindings/sound/es8328.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/sound/es8328.txt b/Documentation/devicetree/bindings/sound/es8328.txt
+index 33fbf058c997..86b6d6e99732 100644
+--- a/Documentation/devicetree/bindings/sound/es8328.txt
++++ b/Documentation/devicetree/bindings/sound/es8328.txt
+@@ -4,7 +4,10 @@ This device supports both I2C and SPI.
+ 
+ Required properties:
+ 
+-  - compatible  : Should be "everest,es8328" or "everest,es8388"
++  - compatible  : Should be one of the following:
++	- "everest,es8323"
++	- "everest,es8328"
++	- "everest,es8388"
+   - DVDD-supply : Regulator providing digital core supply voltage 1.8 - 3.6V
+   - AVDD-supply : Regulator providing analog supply voltage 3.3V
+   - PVDD-supply : Regulator providing digital IO supply voltage 1.8 - 3.6V
+-- 
+2.17.1
+

projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-ASoC-codecs-add-support-for-ES8323.patch

@@ -0,0 +1,37 @@
+From 848df61d191682f1a5e9d66a225629607cfd43e3 Mon Sep 17 00:00:00 2001
+From: Romain Perier <romain.perier@collabora.com>
+Date: Sun, 14 Aug 2022 04:29:32 +0000
+Subject: [PATCH 74/74] WIP: ASoC: codecs: add support for ES8323
+
+The ES8323 is compatible with the existing ES8328 codec driver, so add
+compatibles allowing it to be used.
+
+Signed-off-by: Romain Perier <romain.perier@collabora.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ sound/soc/codecs/es8328-i2c.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sound/soc/codecs/es8328-i2c.c b/sound/soc/codecs/es8328-i2c.c
+index 68072e99fcc7..57c7de5cfa05 100644
+--- a/sound/soc/codecs/es8328-i2c.c
++++ b/sound/soc/codecs/es8328-i2c.c
+@@ -16,6 +16,7 @@
+ #include "es8328.h"
+ 
+ static const struct i2c_device_id es8328_id[] = {
++	{ "es8323", 0 },
+ 	{ "es8328", 0 },
+ 	{ "es8388", 0 },
+ 	{ }
+@@ -23,6 +24,7 @@ static const struct i2c_device_id es8328_id[] = {
+ MODULE_DEVICE_TABLE(i2c, es8328_id);
+ 
+ static const struct of_device_id es8328_of_match[] = {
++	{ .compatible = "everest,es8323", },
+ 	{ .compatible = "everest,es8328", },
+ 	{ .compatible = "everest,es8388", },
+ 	{ }
+-- 
+2.17.1
+