Merge pull request #5277 from chewitt/amlogic-upstream

Amlogic: bump kernel to 5.11.10 and update brcmfmac_sdio-firmware

packages/linux-firmware/brcmfmac_sdio-firmware/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="brcmfmac_sdio-firmware"
-PKG_VERSION="47c4aae498c935746b1e4a1fad87b0d9649ad947"
-PKG_SHA256="fee6192b6e5c1b46465faff4499189d12ce3568e40ed3909de821e4e3a9573cf"
+PKG_VERSION="8fb22389f6d6adae1a53f37d1eb21b51eb9fda99"
+PKG_SHA256="9ebfb6354ad3d025b903639d2499431624600e7344365f3a3eb3754affdb1255"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
 PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/${PKG_VERSION}.tar.gz"

packages/linux/package.mk

@@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}"
 
 case "${LINUX}" in
   amlogic)
-    PKG_VERSION="e073346387ab794b06409f0708bbc0aa6b99a4fb" # 5.11.3
-    PKG_SHA256="f60126313507c672d0d8b10064aa07f31d3bb358e1ee28ba1117451c79349f36"
+    PKG_VERSION="6cc049b8e0d05e1519d71afcf2d40d3aa5a48366" # 5.11.10
+    PKG_SHA256="d5f4a33af53ef0b22049366b2ae2c30a9bf5741dce7d1d2ed6e499c1d9d31c20"
     PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz"
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;

projects/Amlogic/linux/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.11.3 Kernel Configuration
+# Linux/arm64 5.11.10 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.2-2020.11 (arm-10.16)) 10.2.1 20201103"
 CONFIG_CC_IS_GCC=y

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

@@ -1,7 +1,7 @@
-From 8cb76f1b0c1d4bf9e314f7039086676397fdd6ae Mon Sep 17 00:00:00 2001
+From 30c07b172a2ecc6f97ba2a781568806ecd8c10f7 Mon Sep 17 00:00:00 2001
 From: chewitt <github@chrishewitt.net>
 Date: Sat, 13 Apr 2019 05:41:51 +0000
-Subject: [PATCH 01/78] HACK: set meson-gx cma pool to 896MB
+Subject: [PATCH 01/88] HACK: set meson-gx cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 

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

@@ -1,7 +1,7 @@
-From 177719611a14c837af8d04c772ed218c766d708d Mon Sep 17 00:00:00 2001
+From 931e76338cb9030643c0228166258a7448bee56d Mon Sep 17 00:00:00 2001
 From: chewitt <github@chrishewitt.net>
 Date: Wed, 14 Aug 2019 19:58:14 +0000
-Subject: [PATCH 02/78] HACK: set meson-g12 cma pool to 896MB
+Subject: [PATCH 02/88] HACK: set meson-g12 cma pool to 896MB
 
 This change sets the CMA pool to a larger 896MB! value for vdec use
 

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

@@ -1,7 +1,7 @@
-From 715aab31d33489dd6de9ebe6f2ccd3daef5a4512 Mon Sep 17 00:00:00 2001
+From 0b3ddc882dfbb2b05b2bee78525d692824efb765 Mon Sep 17 00:00:00 2001
 From: chewitt <github@chrishewitt.net>
 Date: Sat, 13 Apr 2019 05:45:18 +0000
-Subject: [PATCH 03/78] HACK: arm64: fix Kodi sysinfo CPU information
+Subject: [PATCH 03/88] HACK: arm64: fix Kodi sysinfo CPU information
 
 This allows the CPU information to show in the Kodi sysinfo screen, e.g.
 

projects/Amlogic/patches/linux/amlogic-0004-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch

@@ -1,7 +1,7 @@
-From 647a540eba9a95e654f7c11c430cca9aa651bd01 Mon Sep 17 00:00:00 2001
+From 75325878062f46b0236ccdb6140cde7b2f490794 Mon Sep 17 00:00:00 2001
 From: kszaq <kszaquitto@gmail.com>
 Date: Sat, 6 Jul 2019 07:54:44 +0000
-Subject: [PATCH 04/78] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
+Subject: [PATCH 04/88] HACK: arm64: dts: meson-gx: add ATF BL32 reserved
  memory region
 
 Vendor firmware/uboot has an additional reserved region for BL32 trusted

projects/Amlogic/patches/linux/amlogic-0005-HACK-drm-meson-add-YUV422-output-support.patch

@@ -1,7 +1,7 @@
-From d4bd6f62601948e7814cb60b1505f80c4fdbe317 Mon Sep 17 00:00:00 2001
+From 227da4272ca9ccecfbff90cd3e8678f0aee6e3ea Mon Sep 17 00:00:00 2001
 From: Dongjin Kim <tobetter@gmail.com>
 Date: Wed, 29 Jul 2020 04:05:03 +0900
-Subject: [PATCH 05/78] HACK: drm/meson: add YUV422 output support
+Subject: [PATCH 05/88] HACK: drm/meson: add YUV422 output support
 
 Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI
 controller. This incorrectly fixes the green-line on GX devices.

projects/Amlogic/patches/linux/amlogic-0006-HACK-mmc-core-always-re-init-sdcards-to-set-default-.patch

@@ -1,7 +1,7 @@
-From eabdf5af33387cd914e396e735cd53ef8fdf7216 Mon Sep 17 00:00:00 2001
+From 592630a4362674aaaa3791bf107e57dbe3d4f0cf Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 16 Apr 2020 08:31:55 +0000
-Subject: [PATCH 06/78] HACK: mmc: core: always re-init sdcards to set default
+Subject: [PATCH 06/88] HACK: mmc: core: always re-init sdcards to set default
  3.3v regulator ios
 
 sd-uhs-** in device-tree changes the voltage to 1.8v, so we need to ensure

projects/Amlogic/patches/linux/amlogic-0007-HACK-Revert-Bluetooth-Always-request-for-user-confir.patch

@@ -0,0 +1,50 @@
+From 9f7e0e762eb7e98293dc7c8bd00b4881e82ea68a Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.com>
+Date: Wed, 10 Mar 2021 10:57:20 +0000
+Subject: [PATCH 07/88] HACK: Revert "Bluetooth: Always request for user
+ confirmation for Just Works"
+
+This reverts commit 92516cd97fd4d8ad5b1421a0d51771044f453a5f.
+
+The commit "Bluetooth: Always request for user confirmation for Just
+Works" prevents BLE devices pairing in (at least) the Raspberry Pi OS
+GUI. After reverting it, pairing works again.
+
+If another solution to the problem is found then this reversion will
+be removed.
+
+See: https://github.com/raspberrypi/linux/issues/4139
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.com>
+Signed-off-by: Fang Yafen <yafen@iscas.ac.cn>
+Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
+---
+ net/bluetooth/smp.c | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
+index c659c464f7ca..05696317f302 100644
+--- a/net/bluetooth/smp.c
++++ b/net/bluetooth/smp.c
+@@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
+ 	    hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
+ 		smp->method = JUST_WORKS;
+ 
+-	/* If Just Works, Continue with Zero TK and ask user-space for
+-	 * confirmation */
++	/* If Just Works, Continue with Zero TK */
+ 	if (smp->method == JUST_WORKS) {
+-		ret = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
+-						hcon->type,
+-						hcon->dst_type,
+-						passkey, 1);
+-		if (ret)
+-			return ret;
+-		set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
++		set_bit(SMP_FLAG_TK_VALID, &smp->flags);
+ 		return 0;
+ 	}
+ 
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0008-FROMGIT-arm64-dts-meson-Fix-schema-warnings-for-pwm-.patch

@@ -1,7 +1,7 @@
-From 59b3820d37354b31cb4a6812b1c176e25dfaa0e6 Mon Sep 17 00:00:00 2001
+From 4a6c74f4230afce1b9ae525ce09ee8da3a222003 Mon Sep 17 00:00:00 2001
 From: Alexander Dahl <post@lespocky.de>
 Date: Mon, 11 Jan 2021 14:47:38 +0000
-Subject: [PATCH 07/78] FROMGIT: arm64: dts: meson: Fix schema warnings for
+Subject: [PATCH 08/88] FROMGIT: arm64: dts: meson: Fix schema warnings for
  pwm-leds
 
 The node names for devices using the pwm-leds driver follow a certain

projects/Amlogic/patches/linux/amlogic-0009-FROMGIT-arm64-dts-meson-vim3-whitespace-fixups.patch

@@ -1,7 +1,7 @@
-From f2ff04f09dd15b2243128c17f1192384cb5d6a83 Mon Sep 17 00:00:00 2001
+From 7e76e4b0d180e5fb56825c1763a219c88bd79f28 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Fri, 4 Dec 2020 14:48:41 +0100
-Subject: [PATCH 08/78] FROMGIT: arm64: dts: meson: vim3: whitespace fixups
+Subject: [PATCH 09/88] FROMGIT: arm64: dts: meson: vim3: whitespace fixups
 
 Spaces have been used to indent 2 nodes.
 Replace those with tabs and remove one extra newline

projects/Amlogic/patches/linux/amlogic-0010-FROMGIT-arm64-dts-meson-vim3-enable-hdmi-audio-loopb.patch

@@ -1,7 +1,7 @@
-From fdf605998fa39038f483af016c08d2fcca0f27b8 Mon Sep 17 00:00:00 2001
+From 8a50ed513979ecde63a49d0aaa71c302ac537980 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Fri, 4 Dec 2020 16:23:55 +0100
-Subject: [PATCH 09/78] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
+Subject: [PATCH 10/88] FROMGIT: arm64: dts: meson: vim3: enable hdmi audio
  loopback
 
 Enable audio capture frontends and a tdm decoder.

projects/Amlogic/patches/linux/amlogic-0011-FROMGIT-arm64-dts-meson-add-i2c3-rtc-nodes-and-rtc-a.patch

@@ -1,7 +1,7 @@
-From 3a17391487bab3d68738bf9077537a3f8d2c7f47 Mon Sep 17 00:00:00 2001
+From 0ac730a8509d4ad8ad800c6fb904c743a4721063 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 21 Dec 2020 12:06:25 +0000
-Subject: [PATCH 10/78] FROMGIT: arm64: dts: meson: add i2c3/rtc nodes and rtc
+Subject: [PATCH 11/88] FROMGIT: arm64: dts: meson: add i2c3/rtc nodes and rtc
  aliases to ODROID-N2 dtsi
 
 Enable the onboard pcf8563 rtc hardware on ODROID N2/N2+ boards via the

projects/Amlogic/patches/linux/amlogic-0012-FROMGIT-arm64-dts-meson-add-initial-Beelink-GS-King-.patch

@@ -1,7 +1,7 @@
-From 8b54edde0a895a619f8295f1dc5dd7ce01b5aa79 Mon Sep 17 00:00:00 2001
+From 63dd112ad3698275df592895cc46b4afc950186a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 12 Jun 2020 08:05:20 +0000
-Subject: [PATCH 11/78] FROMGIT: arm64: dts: meson: add initial Beelink
+Subject: [PATCH 12/88] FROMGIT: arm64: dts: meson: add initial Beelink
  GS-King-X device-tree
 
 The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference

projects/Amlogic/patches/linux/amlogic-0013-FROMGIT-arm64-dts-meson-shorten-audio-card-names-for.patch

@@ -1,7 +1,7 @@
-From bd15aa7673def445d35620db5b0516d4693c1519 Mon Sep 17 00:00:00 2001
+From a8a95cf3c9eb46bd3645e170500d18ecf4774eff Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 31 Dec 2020 15:54:34 +0000
-Subject: [PATCH 12/78] FROMGIT: arm64: dts: meson: shorten audio card names
+Subject: [PATCH 13/88] FROMGIT: arm64: dts: meson: shorten audio card names
  for alsa compatibility
 
 This patch shortens all audio card model names by dropping the SoC prefix

projects/Amlogic/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-sort-Amlogic-dtb-Makefile.patch

@@ -1,7 +1,7 @@
-From 7b6782b8bccfed066c2b55871f0276dd4e2ebc2a Mon Sep 17 00:00:00 2001
+From a3fd9e94d211ec9cda74584e5828e76d6496c279 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 19 Jan 2021 15:34:53 +0000
-Subject: [PATCH 13/78] FROMGIT: arm64: dts: meson: sort Amlogic dtb Makefile
+Subject: [PATCH 14/88] FROMGIT: arm64: dts: meson: sort Amlogic dtb Makefile
 
 Sort the Makefile before adding new SM1 devices.
 

projects/Amlogic/patches/linux/amlogic-0015-FROMGIT-arm64-dts-meson-convert-meson-sm1-odroid-c4-.patch

@@ -1,7 +1,7 @@
-From 5169e50955183bef65a3d2ad8331a7fae342a72b Mon Sep 17 00:00:00 2001
+From 8ae8a8444e462cca3927367af8ca36ab00dd5592 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 29 Jan 2021 02:10:14 +0000
-Subject: [PATCH 14/78] FROMGIT: arm64: dts: meson: convert meson-sm1-odroid-c4
+Subject: [PATCH 15/88] FROMGIT: arm64: dts: meson: convert meson-sm1-odroid-c4
  to dtsi
 
 Convert the ODRIOD-C4 dts to meson-sm1-odroid.dtsi and C4 board dts in

projects/Amlogic/patches/linux/amlogic-0016-FROMGIT-arm64-dts-meson-add-initial-device-tree-for-.patch

@@ -1,7 +1,7 @@
-From 4840ef5d5e91f556c3a0894b09f5799195cb4c14 Mon Sep 17 00:00:00 2001
+From dfd0471eb3cb255d376c901574768213183e8765 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 29 Jan 2021 02:12:43 +0000
-Subject: [PATCH 15/78] FROMGIT: arm64: dts: meson: add initial device-tree for
+Subject: [PATCH 16/88] FROMGIT: arm64: dts: meson: add initial device-tree for
  ODROID-HC4
 
 ODROID-HC4 is a derivative of the C4 with minor differences:

projects/Amlogic/patches/linux/amlogic-0017-FROMGIT-arm64-dts-meson-add-initial-device-tree-for-.patch

@@ -1,8 +1,8 @@
-From 17b4f3b62b670127702280a40bf772d958062fdc Mon Sep 17 00:00:00 2001
+From 08dba4427036ff0544670a4a2fd0127236a8abff Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 19 Jan 2021 12:57:11 +0000
-Subject: [PATCH 39/78] FROMLIST(v1): arm64: dts: meson: add initial
- device-tree for Minix NEO U9-H
+Subject: [PATCH 17/88] FROMGIT: arm64: dts: meson: add initial device-tree for
+ Minix NEO U9-H
 
 Minix NEO U9-H is based on the Amlogic Q200 reference board with an
 S912-H chip and the following specs:

projects/Amlogic/patches/linux/amlogic-0018-FROMGIT-dt-bindings-arm-amlogic-add-support-for-the-.patch

@@ -1,8 +1,8 @@
-From c606e2fab43277b72b7fea5bb733dbbaac5bffa6 Mon Sep 17 00:00:00 2001
+From 5735377a099b9eb5f9f0a36ebd43f0c429b8addf Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 29 Jan 2021 04:46:21 +0000
-Subject: [PATCH 38/78] FROMLIST(v1): dt-bindings: arm: amlogic: add support
- for the Minix NEO U9-H
+Subject: [PATCH 18/88] FROMGIT: dt-bindings: arm: amlogic: add support for the
+ Minix NEO U9-H
 
 The Minix NEO U9-H is a small form-factor Android STB based on the
 Amlogic Q200 reference board with an S912-H chip.
@@ -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 5f6769bf45bd..d24334e1e166 100644
+index 3341788d1096..860a456f7858 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
 @@ -120,6 +120,7 @@ properties:

projects/Amlogic/patches/linux/amlogic-0019-FROMGIT-dt-bindings-net-dwmac-meson-use-picoseconds-.patch

@@ -1,7 +1,7 @@
-From df8a56723a276060ed9fac39b15a3091470e80fe Mon Sep 17 00:00:00 2001
+From 3be6c1ed0ae21099b733ce16c709fad3061994ea Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 14 Nov 2020 17:37:09 +0100
-Subject: [PATCH 16/78] FROMGIT: dt-bindings: net: dwmac-meson: use picoseconds
+Subject: [PATCH 19/88] FROMGIT: dt-bindings: net: dwmac-meson: use picoseconds
  for the RGMII RX delay
 
 Amlogic Meson G12A, G12B and SM1 SoCs have a more advanced RGMII RX

projects/Amlogic/patches/linux/amlogic-0020-FROMGIT-dt-bindings-arm-amlogic-add-support-for-the-.patch

@@ -1,7 +1,7 @@
-From c5217e5933cc3042bcd3d55c5c36bdc1d792278c Mon Sep 17 00:00:00 2001
+From cf2108617180aa24416089735fa49bfba7dca5c7 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 12 Jun 2020 08:04:00 +0000
-Subject: [PATCH 17/78] FROMGIT: dt-bindings: arm: amlogic: add support for the
+Subject: [PATCH 20/88] FROMGIT: dt-bindings: arm: amlogic: add support for the
  Beelink GS-King-X
 
 The Shenzen AZW (Beelink) GS-King-X is based on the Amlogic W400 reference
@@ -15,10 +15,10 @@ Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 3341788d1096..6bef60ddda64 100644
+index 860a456f7858..dccfc048fb1c 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -151,6 +151,7 @@ properties:
+@@ -152,6 +152,7 @@ properties:
        - description: Boards with the Amlogic Meson G12B S922X SoC
          items:
            - enum:

projects/Amlogic/patches/linux/amlogic-0021-FROMGIT-dt-bindings-arm-amlogic-sort-SM1-bindings.patch

@@ -1,7 +1,7 @@
-From 14d9192e589d991dbf8812d97cc0cdc889b1bc4b Mon Sep 17 00:00:00 2001
+From 96bb0e73cb58befe53b8b3783d258f9db38cd70e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 19 Jan 2021 15:32:38 +0000
-Subject: [PATCH 18/78] FROMGIT: dt-bindings: arm: amlogic: sort SM1 bindings
+Subject: [PATCH 21/88] FROMGIT: dt-bindings: arm: amlogic: sort SM1 bindings
 
 Sort the bindings before adding new SM1 devices.
 
@@ -12,10 +12,10 @@ Acked-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
-index 6bef60ddda64..b21ba8ba23dd 100644
+index dccfc048fb1c..35995a1f97db 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -164,9 +164,9 @@ properties:
+@@ -165,9 +165,9 @@ properties:
        - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC
          items:
            - enum:

projects/Amlogic/patches/linux/amlogic-0022-FROMGIT-dt-bindings-arm-amlogic-add-ODROID-HC4-bindi.patch

@@ -1,7 +1,7 @@
-From cb50d337170dd7e0101c7b25752ea0346128f9a9 Mon Sep 17 00:00:00 2001
+From 281f759bb1ad6bad61f045c3b2a6f6ed1db16ed1 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 12 Dec 2020 05:44:14 +0000
-Subject: [PATCH 19/78] FROMGIT: dt-bindings: arm: amlogic: add ODROID-HC4
+Subject: [PATCH 22/88] FROMGIT: dt-bindings: arm: amlogic: add ODROID-HC4
  bindings
 
 Add the board bindings for the ODROID-HC4 device.
@@ -12,10 +12,10 @@ 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 b21ba8ba23dd..5f6769bf45bd 100644
+index 35995a1f97db..d24334e1e166 100644
 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml
 +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
-@@ -165,6 +165,7 @@ properties:
+@@ -166,6 +166,7 @@ properties:
          items:
            - enum:
                - hardkernel,odroid-c4

projects/Amlogic/patches/linux/amlogic-0023-FROMGIT-drm-panfrost-add-governor-data-with-pre-defi.patch

@@ -1,7 +1,7 @@
-From 6a741a15e6aae96d67e2699e6ae405a1f590a080 Mon Sep 17 00:00:00 2001
+From e093d955d72107cc92008e0813e5e2cc7015fd9f Mon Sep 17 00:00:00 2001
 From: Lukasz Luba <lukasz.luba@arm.com>
 Date: Sun, 24 Jan 2021 03:57:47 +0000
-Subject: [PATCH 20/78] FROMGIT: drm/panfrost: add governor data with
+Subject: [PATCH 23/88] FROMGIT: drm/panfrost: add governor data with
  pre-defined thresholds
 
 The simple_ondemand devfreq governor uses two thresholds to decide about

projects/Amlogic/patches/linux/amlogic-0024-FROMGIT-media-rc-add-keymap-for-minix-neo-remote.patch

@@ -1,8 +1,7 @@
-From 7269e66ec09d178a7ad7f3c418c92ea0d8183fc7 Mon Sep 17 00:00:00 2001
+From 07105df02a7e21818de0ad1bbb193827e36cfa90 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 19 Jan 2021 11:55:20 +0000
-Subject: [PATCH 37/78] FROMLIST(v1): media: rc: add keymap for minix-neo
- remote
+Subject: [PATCH 24/88] FROMGIT: media: rc: add keymap for minix-neo remote
 
 Add a keymap and bindings for the simple IR (NEC) remote used with
 Minix 'NEO' branded Android STB devices.
@@ -29,10 +28,10 @@ index 946441b4e1a5..cbffdd6a470d 100644
        - rc-msi-digivox-iii
        - rc-msi-tvanywhere
 diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
-index b252a1d2ebd6..b7f53f44c5c8 100644
+index cc6662e1903f..79c529340853 100644
 --- a/drivers/media/rc/keymaps/Makefile
 +++ b/drivers/media/rc/keymaps/Makefile
-@@ -70,6 +70,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
+@@ -69,6 +69,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
  			rc-medion-x10.o \
  			rc-medion-x10-digitainer.o \
  			rc-medion-x10-or2x.o \
@@ -102,10 +101,10 @@ index 000000000000..9165af548ff1
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
 diff --git a/include/media/rc-map.h b/include/media/rc-map.h
-index 999b750bc6b8..a6fca9cc761f 100644
+index 30f138ebab6f..6f8e2bbbc851 100644
 --- a/include/media/rc-map.h
 +++ b/include/media/rc-map.h
-@@ -273,6 +273,7 @@ struct rc_map *rc_map_get(const char *name);
+@@ -280,6 +280,7 @@ struct rc_map *rc_map_get(const char *name);
  #define RC_MAP_MEDION_X10                "rc-medion-x10"
  #define RC_MAP_MEDION_X10_DIGITAINER     "rc-medion-x10-digitainer"
  #define RC_MAP_MEDION_X10_OR2X           "rc-medion-x10-or2x"

projects/Amlogic/patches/linux/amlogic-0025-FROMGIT-net-stmmac-dwmac-meson8b-use-picoseconds-for.patch

@@ -1,7 +1,7 @@
-From 4405cbfa9694d95695f310db55a67e09c3f60da9 Mon Sep 17 00:00:00 2001
+From 8b1c1379a187759191e4b25bb777172eada963eb Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 14 Nov 2020 17:41:04 +0100
-Subject: [PATCH 21/78] FROMGIT: net: stmmac: dwmac-meson8b: use picoseconds
+Subject: [PATCH 25/88] FROMGIT: net: stmmac: dwmac-meson8b: use picoseconds
  for the RGMII RX delay
 
 Amlogic Meson G12A, G12B and SM1 SoCs have a more advanced RGMII RX

projects/Amlogic/patches/linux/amlogic-0026-FROMGIT-net-stmmac-dwmac-meson8b-move-RGMII-delays-i.patch

@@ -1,7 +1,7 @@
-From 781820af4b5ead6360c0c1963ad29777b7a6f269 Mon Sep 17 00:00:00 2001
+From 165518937eeef628d4848881bbd4e4f94fa3f863 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 14 Nov 2020 18:02:03 +0100
-Subject: [PATCH 22/78] FROMGIT: net: stmmac: dwmac-meson8b: move RGMII delays
+Subject: [PATCH 26/88] FROMGIT: net: stmmac: dwmac-meson8b: move RGMII delays
  into a separate function
 
 Newer SoCs starting with the Amlogic Meson G12A have more a precise

projects/Amlogic/patches/linux/amlogic-0027-FROMGIT-net-stmmac-dwmac-meson8b-add-support-for-the.patch

@@ -1,7 +1,7 @@
-From 8b9f0f9e6820ed2a945ec86eb9d26313dd0b7fe1 Mon Sep 17 00:00:00 2001
+From af5a137b69d3f9f88b89601abf8a2be3aec2c180 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 14 Nov 2020 19:41:11 +0100
-Subject: [PATCH 23/78] FROMGIT: net: stmmac: dwmac-meson8b: add support for
+Subject: [PATCH 27/88] FROMGIT: net: stmmac: dwmac-meson8b: add support for
  the RGMII RX delay on G12A
 
 Amlogic Meson G12A (and newer: G12B, SM1) SoCs have a more advanced RX

projects/Amlogic/patches/linux/amlogic-0028-FROMGIT-net-stmmac-dwmac-meson8b-fix-the-RX-delay-va.patch

@@ -1,7 +1,7 @@
-From fc3b4a9e8327f66560a43c3f1e1e9de2ad4e57b4 Mon Sep 17 00:00:00 2001
+From 9720f6152c85aabc9dbf9fcbce0ac4c19a6648aa Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 20 Jan 2021 02:57:45 +0000
-Subject: [PATCH 24/78] FROMGIT: net: stmmac: dwmac-meson8b: fix the RX delay
+Subject: [PATCH 28/88] FROMGIT: net: stmmac: dwmac-meson8b: fix the RX delay
  validation
 
 When has_prg_eth1_rgmii_rx_delay is true then we support RX delays

projects/Amlogic/patches/linux/amlogic-0029-FROMLIST-v1-drm-panfrost-fix-reference-leak-in-panfr.patch

@@ -1,7 +1,7 @@
-From 67de7e49a6fd09c8173d0f645d584b797f057e0f Mon Sep 17 00:00:00 2001
+From 569efb24817177301f4789a8b45df8d389df97a7 Mon Sep 17 00:00:00 2001
 From: Qinglang Miao <miaoqinglang@huawei.com>
 Date: Sat, 28 Nov 2020 16:10:04 +0000
-Subject: [PATCH 25/78] FROMLIST(v1): drm/panfrost: fix reference leak in
+Subject: [PATCH 29/88] FROMLIST(v1): drm/panfrost: fix reference leak in
  panfrost_job_hw_submit
 
 pm_runtime_get_sync will increment pm usage counter even it

projects/Amlogic/patches/linux/amlogic-0030-FROMLIST-v1-drm-panfrost-Use-delayed-timer-as-defaul.patch

@@ -1,7 +1,7 @@
-From 7e18480984ed499afc05e6e259d9c2208f337c44 Mon Sep 17 00:00:00 2001
+From 5360a4ad62c054ecc8c1eb0896f85ae2e4566275 Mon Sep 17 00:00:00 2001
 From: Lukasz Luba <lukasz.luba@arm.com>
 Date: Tue, 12 Jan 2021 02:49:18 +0000
-Subject: [PATCH 26/78] FROMLIST(v1): drm/panfrost: Use delayed timer as
+Subject: [PATCH 30/88] FROMLIST(v1): drm/panfrost: Use delayed timer as
  default in devfreq profile
 
 Devfreq framework supports 2 modes for monitoring devices.

projects/Amlogic/patches/linux/amlogic-0031-FROMLIST-v2-drm-panfrost-Clear-MMU-irqs-before-handl.patch

@@ -1,7 +1,7 @@
-From 1b3af6a91da8a8a77afb4048831d8b7b1eea07ba Mon Sep 17 00:00:00 2001
+From bf7b6026eb3bf452b4fad8c77efacd323f3ddd96 Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Thu, 4 Feb 2021 07:34:34 +0000
-Subject: [PATCH 27/78] FROMLIST(v2): drm/panfrost: Clear MMU irqs before
+Subject: [PATCH 31/88] FROMLIST(v2): drm/panfrost: Clear MMU irqs before
  handling the fault
 
 When a fault is handled it will unblock the GPU which will continue

projects/Amlogic/patches/linux/amlogic-0032-FROMLIST-v2-drm-panfrost-Don-t-try-to-map-pages-that.patch

@@ -1,7 +1,7 @@
-From 54bd9334981810e828a3b21bd3dd3f043497c3c2 Mon Sep 17 00:00:00 2001
+From cd56ab64a7743dc966a8c2406afedf0027784ee9 Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Thu, 4 Feb 2021 07:35:52 +0000
-Subject: [PATCH 28/78] FROMLIST(v2): drm/panfrost: Don't try to map pages that
+Subject: [PATCH 32/88] FROMLIST(v2): drm/panfrost: Don't try to map pages that
  are already mapped
 
 We allocate 2MB chunks at a time, so it might appear that a page fault

projects/Amlogic/patches/linux/amlogic-0033-FROMLIST-v2-drm-panfrost-Stay-in-the-threaded-MMU-IR.patch

@@ -1,7 +1,7 @@
-From de7001e0449dace7b635b715da03f268bda06550 Mon Sep 17 00:00:00 2001
+From 0cddc2b363c390a6c567b8c353bc7f9d4944dfe3 Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Thu, 4 Feb 2021 07:37:53 +0000
-Subject: [PATCH 29/78] FROMLIST(v2): drm/panfrost: Stay in the threaded MMU
+Subject: [PATCH 33/88] FROMLIST(v2): drm/panfrost: Stay in the threaded MMU
  IRQ handler until we've handled all IRQs
 
 Doing a hw-irq -> threaded-irq round-trip is counter-productive, stay

projects/Amlogic/patches/linux/amlogic-0034-FROMLIST-v2-drm-lima-add-governor-data-with-pre-defi.patch

@@ -1,7 +1,7 @@
-From 6052a5deef08c74bc98c82ec29561aa752a6720c Mon Sep 17 00:00:00 2001
+From 5413886e2d16195eceda3720c998422b04d8c336 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 24 Jan 2021 11:27:35 +0000
-Subject: [PATCH 30/78] FROMLIST(v2): drm/lima: add governor data with
+Subject: [PATCH 34/88] FROMLIST(v2): drm/lima: add governor data with
  pre-defined thresholds
 
 This patch adapts the panfrost pre-defined thresholds change [0] to the

projects/Amlogic/patches/linux/amlogic-0035-FROMLIST-v1-drm-lima-Use-delayed-timer-as-default-in.patch

@@ -1,7 +1,7 @@
-From a0042b05f655fb0242c2708023051212c1bb5cc2 Mon Sep 17 00:00:00 2001
+From e9d96f0ba2d250037f877b02792326c44ca6cfea Mon Sep 17 00:00:00 2001
 From: Lukasz Luba <lukasz.luba@arm.com>
 Date: Wed, 27 Jan 2021 11:36:36 +0000
-Subject: [PATCH 31/78] FROMLIST(v1): drm/lima: Use delayed timer as default in
+Subject: [PATCH 35/88] FROMLIST(v1): drm/lima: Use delayed timer as default in
  devfreq profile
 
 Devfreq framework supports 2 modes for monitoring devices.

projects/Amlogic/patches/linux/amlogic-0036-FROMLIST-v1-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch

@@ -1,7 +1,7 @@
-From cc28b30761d37398e52b7f02a37c5d972ba6e65e Mon Sep 17 00:00:00 2001
+From 09312f60d216525cc3f139575497e2c2775d7042 Mon Sep 17 00:00:00 2001
 From: Amjad Ouled-Ameur <aouledameur@baylibre.com>
 Date: Fri, 13 Nov 2020 07:45:15 +0000
-Subject: [PATCH 32/78] FROMLIST(v1): phy: amlogic: phy-meson-gxl-usb2: fix
+Subject: [PATCH 36/88] FROMLIST(v1): phy: amlogic: phy-meson-gxl-usb2: fix
  shared reset controller use
 
 Use reset_control_rearm() call if an error occurs in case

projects/Amlogic/patches/linux/amlogic-0037-FROMLIST-v1-usb-dwc3-meson-g12a-fix-shared-reset-con.patch

@@ -1,7 +1,7 @@
-From af1ff7e8b282d244d97b94e1313011078bff805c Mon Sep 17 00:00:00 2001
+From f2c61b02ed90ebab65ffde60d7349c53e1839dac Mon Sep 17 00:00:00 2001
 From: Amjad Ouled-Ameur <aouledameur@baylibre.com>
 Date: Fri, 13 Nov 2020 07:46:15 +0000
-Subject: [PATCH 33/78] FROMLIST(v1): usb: dwc3: meson-g12a: fix shared reset
+Subject: [PATCH 37/88] FROMLIST(v1): usb: dwc3: meson-g12a: fix shared reset
  control use
 
 reset_control_(de)assert() calls are called on a shared reset line when

projects/Amlogic/patches/linux/amlogic-0038-FROMLIST-v1-ASoC-meson-Use-managed-DMA-buffer-alloca.patch

@@ -1,7 +1,7 @@
-From 1b28be6588104b09471115cfbfd951709bf21084 Mon Sep 17 00:00:00 2001
+From ecd739d6b9c792b39f430c6972cf50cc03b4ee0e Mon Sep 17 00:00:00 2001
 From: Lars-Peter Clausen <lars@metafoo.de>
 Date: Mon, 21 Dec 2020 14:19:57 +0000
-Subject: [PATCH 34/78] FROMLIST(v1): ASoC: meson: Use managed DMA buffer
+Subject: [PATCH 38/88] FROMLIST(v1): ASoC: meson: Use managed DMA buffer
  allocation
 
 Using a managed buffer will pre-allocate the buffer using

projects/Amlogic/patches/linux/amlogic-0039-FROMLIST-v1-ASoC-constify-of_phandle_args-in-snd_soc.patch

@@ -1,7 +1,7 @@
-From e6d584c2cf5aae23408baab574dfc096c45573d4 Mon Sep 17 00:00:00 2001
+From 68243c7496fe3dbb51702617b2fb5be39ebda48c Mon Sep 17 00:00:00 2001
 From: Krzysztof Kozlowski <krzk@kernel.org>
 Date: Sun, 21 Feb 2021 16:27:16 +0000
-Subject: [PATCH 35/78] FROMLIST(v1): ASoC: constify of_phandle_args in
+Subject: [PATCH 39/88] FROMLIST(v1): ASoC: constify of_phandle_args in
  snd_soc_get_dai_name()
 
 The pointer to of_phandle_args passed to snd_soc_get_dai_name() and
@@ -120,7 +120,7 @@ index 87aa19ac4af3..393b6c2307e4 100644
  			  unsigned int component_id);
  
 diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
-index 8e5415c9234f..0af5afaa0ece 100644
+index cd4fb77e9d51..5efcbb6681e2 100644
 --- a/sound/soc/qcom/lpass-cpu.c
 +++ b/sound/soc/qcom/lpass-cpu.c
 @@ -340,7 +340,7 @@ int asoc_qcom_lpass_cpu_dai_probe(struct snd_soc_dai *dai)

projects/Amlogic/patches/linux/amlogic-0040-FROMLIST-v1-spi-nor-add-support-for-XT25F128B.patch

@@ -1,7 +1,7 @@
-From 28fd818e286b4d92042e2b3d408f9037b6ab21ce Mon Sep 17 00:00:00 2001
+From 3233168b0c100fd31f2b0b94cdadf7e5d4c1bdc8 Mon Sep 17 00:00:00 2001
 From: Andreas Rammhold <andreas@rammhold.de>
 Date: Thu, 28 Jan 2021 09:43:36 +0000
-Subject: [PATCH 36/78] FROMLIST(v1): spi-nor: add support for XT25F128B
+Subject: [PATCH 40/88] FROMLIST(v1): spi-nor: add support for XT25F128B
 
 This adds support for the XT25F128B as found on the RockPi4b SBC.
 

projects/Amlogic/patches/linux/amlogic-0041-FROMLIST-v1-drm-meson-add-shutdown-function-to-meson.patch

@@ -1,69 +0,0 @@
-From 19bbd3afcc008b3b428bf12f4e74f9166ffe7ea3 Mon Sep 17 00:00:00 2001
-From: Artem Lapkin <art@khadas.com>
-Date: Wed, 24 Feb 2021 12:12:53 +0000
-Subject: [PATCH 41/78] FROMLIST(v1): drm/meson: add shutdown function to
- meson_drv
-
-Problem: random stucks on reboot stage about 1/20 stuck/reboots
-// debug kernel log
-[    4.496660] reboot: kernel restart prepare CMD:(null)
-[    4.498114] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown begin
-[    4.503949] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown domain 0:VPU...
-...STUCK...
-
-Solution: add shutdown function to meson_drm driver
-// debug kernel log
-[    5.231896] reboot: kernel restart prepare CMD:(null)
-[    5.246135] [drm:meson_drv_shutdown]
-...
-[    5.259271] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown begin
-[    5.274688] meson_ee_pwrc c883c000.system-controller:power-controller: shutdown domain 0:VPU...
-[    5.338331] reboot: Restarting system
-[    5.358293] psci: PSCI_0_2_FN_SYSTEM_RESET reboot_mode:0 cmd:(null)
-bl31 reboot reason: 0xd
-bl31 reboot reason: 0x0
-system cmd  1.
-...REBOOT...
-
-Tested: on VIM1 VIM2 VIM3 VIM3L khadas sbcs - 1000+ successful reboots
-and Odroid boards, WeTek Play2 (GXBB)
-
-Tested-by: Christian Hewitt <christianshewitt@gmail.com>
-Signed-off-by: Artem Lapkin <art@khadas.com>
----
- drivers/gpu/drm/meson/meson_drv.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c
-index 42c5d3246cfc..ac3808e846ff 100644
---- a/drivers/gpu/drm/meson/meson_drv.c
-+++ b/drivers/gpu/drm/meson/meson_drv.c
-@@ -482,6 +482,17 @@ static int meson_probe_remote(struct platform_device *pdev,
- 	return count;
- }
- 
-+static void meson_drv_shutdown(struct platform_device *pdev)
-+{
-+	struct meson_drm *priv = dev_get_drvdata(&pdev->dev);
-+	struct drm_device *drm = priv->drm;
-+
-+	dev_warn(&pdev->dev, "%s", __func__);
-+	//drm_dev_unregister(drm);
-+	drm_kms_helper_poll_fini(drm);
-+	drm_atomic_helper_shutdown(drm);
-+}
-+
- static int meson_drv_probe(struct platform_device *pdev)
- {
- 	struct component_match *match = NULL;
-@@ -553,6 +564,7 @@ static const struct dev_pm_ops meson_drv_pm_ops = {
- 
- static struct platform_driver meson_drm_platform_driver = {
- 	.probe      = meson_drv_probe,
-+	.shutdown   = meson_drv_shutdown,
- 	.driver     = {
- 		.name	= "meson-drm",
- 		.of_match_table = dt_match,
--- 
-2.17.1
-

projects/Amlogic/patches/linux/amlogic-0041-FROMLIST-v2-arm64-dts-amlogic-assign-a-fixed-index-t.patch

@@ -1,7 +1,7 @@
-From 6d69b3667677eca2ecc200ae366e062a5d66806a Mon Sep 17 00:00:00 2001
+From ade673edcd545e29c4d262c9c2ddcc0efe17e835 Mon Sep 17 00:00:00 2001
 From: Alexander Stein <alexander.stein@mailbox.org>
 Date: Wed, 3 Feb 2021 17:03:42 +0000
-Subject: [PATCH 40/78] FROMLIST(v2): arm64: dts: amlogic: assign a fixed index
+Subject: [PATCH 41/88] FROMLIST(v2): arm64: dts: amlogic: assign a fixed index
  to mmc devices
 
 Recently introduced async probe on mmc devices can shuffle block IDs.

projects/Amlogic/patches/linux/amlogic-0042-FROMLIST-v1-dt-bindings-serial-amlogic-meson-uart-ad.patch

@@ -0,0 +1,35 @@
+From 81d454a24a2bdd4430e1d5638e503dccf0b98e80 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 15 Mar 2021 10:54:48 +0000
+Subject: [PATCH 42/88] FROMLIST(v1): dt-bindings: serial: amlogic, meson-uart:
+ add amlogic, uart-fifosize property
+
+On most of the Amlogic SoCs, the first UART controller in the "Everything-Else"
+power domain has 128bytes of RX & TX FIFO, so add an optional property to describe
+a different FIFO size from the other ports (64bytes).
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ .../devicetree/bindings/serial/amlogic,meson-uart.yaml      | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+index 75ebc9952a99..e0a742112783 100644
+--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
++++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+@@ -55,6 +55,12 @@ properties:
+       - const: pclk
+       - const: baud
+ 
++
++  amlogic,uart-fifosize:
++    description: The fifo size supported by the UART channel.
++    $ref: /schemas/types.yaml#/definitions/uint32
++    enum: [64, 128]
++
+ required:
+   - compatible
+   - reg
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0043-FROMLIST-v1-tty-serial-meson-retrieve-port-FIFO-size.patch

@@ -0,0 +1,47 @@
+From 8cf1d1a9aa05c5bc3b85d6a87e3097c1c0400766 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 15 Mar 2021 10:55:41 +0000
+Subject: [PATCH 43/88] FROMLIST(v1): tty: serial: meson: retrieve port FIFO
+ size from DT
+
+Now the DT bindings has a property to get the FIFO size for a particular port,
+retrieve it and use to setup the FIFO interrupts threshold.
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ drivers/tty/serial/meson_uart.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c
+index 69eeef9edfa5..7244b12aefab 100644
+--- a/drivers/tty/serial/meson_uart.c
++++ b/drivers/tty/serial/meson_uart.c
+@@ -717,6 +717,7 @@ static int meson_uart_probe(struct platform_device *pdev)
+ {
+ 	struct resource *res_mem, *res_irq;
+ 	struct uart_port *port;
++	u32 fifosize = 64; /* Default is 64, 128 for EE UART_0 */
+ 	int ret = 0;
+ 	int id = -1;
+ 
+@@ -743,6 +744,8 @@ static int meson_uart_probe(struct platform_device *pdev)
+ 	if (!res_irq)
+ 		return -ENODEV;
+ 
++	of_property_read_u32(pdev->dev.of_node, "amlogic,uart-fifosize", &fifosize);
++
+ 	if (meson_ports[pdev->id]) {
+ 		dev_err(&pdev->dev, "port %d already allocated\n", pdev->id);
+ 		return -EBUSY;
+@@ -772,7 +775,7 @@ static int meson_uart_probe(struct platform_device *pdev)
+ 	port->type = PORT_MESON;
+ 	port->x_char = 0;
+ 	port->ops = &meson_uart_ops;
+-	port->fifosize = 64;
++	port->fifosize = fifosize;
+ 
+ 	meson_ports[pdev->id] = port;
+ 	platform_set_drvdata(pdev, port);
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0044-FROMLIST-v1-arm64-dts-meson-set-128bytes-FIFO-size-o.patch

@@ -0,0 +1,55 @@
+From 8a409915a1e005100c11457e11a198ceb0b1e507 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <narmstrong@baylibre.com>
+Date: Mon, 15 Mar 2021 10:56:36 +0000
+Subject: [PATCH 44/88] FROMLIST(v1): arm64: dts: meson: set 128bytes FIFO size
+ on uart A
+
+The first UART controller in "Everything-Else" power domain, usually used
+for Bluetooth HCI has 128bytes FIFO depth.
+
+Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
+---
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 1 +
+ arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi         | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+index d945c84ab697..571383c12855 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+@@ -1872,6 +1872,7 @@
+ 				status = "disabled";
+ 				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
+ 				clock-names = "xtal", "pclk", "baud";
++				amlogic,uart-fifosize = <128>;
+ 			};
+ 		};
+ 
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index bd6e48e3c51a..48fa9961fd81 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -2317,6 +2317,7 @@
+ 				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;
+ 				clock-names = "xtal", "pclk", "baud";
+ 				status = "disabled";
++				amlogic,uart-fifosize = <128>;
+ 			};
+ 		};
+ 
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+index 14ff467c6be8..e58ebe3ba65c 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+@@ -307,6 +307,7 @@
+ 				reg = <0x0 0x84c0 0x0 0x18>;
+ 				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
+ 				status = "disabled";
++				amlogic,uart-fifosize = <128>;
+ 			};
+ 
+ 			uart_B: serial@84dc {
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0045-WIP-drm-panfrost-Make-sure-MMU-context-lifetime-is-n.patch

@@ -1,7 +1,7 @@
-From 5e8efea13b5e47555d76b994ff26693ad5bfbabe Mon Sep 17 00:00:00 2001
+From 07907f68a180df81c9d5e7e3cd88708048a694f0 Mon Sep 17 00:00:00 2001
 From: Boris Brezillon <boris.brezillon@collabora.com>
 Date: Tue, 4 Feb 2020 15:35:03 +0100
-Subject: [PATCH 42/78] WIP: drm/panfrost: Make sure MMU context lifetime is
+Subject: [PATCH 45/88] WIP: drm/panfrost: Make sure MMU context lifetime is
  not bound to panfrost_priv
 
 Jobs can be in-flight when the file descriptor is closed (either because

projects/Amlogic/patches/linux/amlogic-0046-WIP-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch

@@ -1,7 +1,7 @@
-From d4a390b8e4afb04886a5a7600d343f7b5c149ae8 Mon Sep 17 00:00:00 2001
+From 7d2c3c596ee8b4703a2d4ba2f9f513d38e032541 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:23 +0100
-Subject: [PATCH 43/78] WIP: arm64: meson: add Amlogic Meson GX PM Suspend
+Subject: [PATCH 46/88] WIP: 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/patches/linux/amlogic-0047-WIP-arm64-dts-meson-g12b-sync-with-aml-opps.patch

@@ -0,0 +1,138 @@
+From 49d25d19b35687df540c6c732c03206f7c9475bc Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Mon, 26 Oct 2020 10:36:48 +0100
+Subject: [PATCH 47/88] WIP: arm64: dts: meson: g12b: sync with aml opps
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12b-a311d.dtsi    | 24 +-----------
+ .../boot/dts/amlogic/meson-g12b-s922x.dtsi    | 39 +------------------
+ 2 files changed, 4 insertions(+), 59 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+index d61f43052a34..7d29756451a5 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+@@ -11,16 +11,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-100000000 {
+-			opp-hz = /bits/ 64 <100000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-250000000 {
+-			opp-hz = /bits/ 64 <250000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-500000000 {
+ 			opp-hz = /bits/ 64 <500000000>;
+ 			opp-microvolt = <731000>;
+@@ -58,12 +48,12 @@
+ 
+ 		opp-1704000000 {
+ 			opp-hz = /bits/ 64 <1704000000>;
+-			opp-microvolt = <951000>;
++			opp-microvolt = <960000>;
+ 		};
+ 
+ 		opp-1800000000 {
+ 			opp-hz = /bits/ 64 <1800000000>;
+-			opp-microvolt = <1001000>;
++			opp-microvolt = <1030000>;
+ 		};
+ 	};
+ 
+@@ -71,16 +61,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-100000000 {
+-			opp-hz = /bits/ 64 <100000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-250000000 {
+-			opp-hz = /bits/ 64 <250000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-500000000 {
+ 			opp-hz = /bits/ 64 <500000000>;
+ 			opp-microvolt = <731000>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+index 1e5d0ee5d541..ad4096be8db2 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+@@ -11,16 +11,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-100000000 {
+-			opp-hz = /bits/ 64 <100000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-250000000 {
+-			opp-hz = /bits/ 64 <250000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-500000000 {
+ 			opp-hz = /bits/ 64 <500000000>;
+ 			opp-microvolt = <731000>;
+@@ -61,31 +51,16 @@
+ 			opp-microvolt = <861000>;
+ 		};
+ 
+-		opp-1896000000 {
+-			opp-hz = /bits/ 64 <1896000000>;
++		opp-1800000000 {
++			opp-hz = /bits/ 64 <1800000000>;
+ 			opp-microvolt = <981000>;
+ 		};
+-
+-		opp-1992000000 {
+-			opp-hz = /bits/ 64 <1992000000>;
+-			opp-microvolt = <1001000>;
+-		};
+ 	};
+ 
+ 	cpub_opp_table_1: opp-table-1 {
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-100000000 {
+-			opp-hz = /bits/ 64 <100000000>;
+-			opp-microvolt = <751000>;
+-		};
+-
+-		opp-250000000 {
+-			opp-hz = /bits/ 64 <250000000>;
+-			opp-microvolt = <751000>;
+-		};
+-
+ 		opp-500000000 {
+ 			opp-hz = /bits/ 64 <500000000>;
+ 			opp-microvolt = <751000>;
+@@ -125,15 +100,5 @@
+ 			opp-hz = /bits/ 64 <1704000000>;
+ 			opp-microvolt = <891000>;
+ 		};
+-
+-		opp-1800000000 {
+-			opp-hz = /bits/ 64 <1800000000>;
+-			opp-microvolt = <981000>;
+-		};
+-
+-		opp-1908000000 {
+-			opp-hz = /bits/ 64 <1908000000>;
+-			opp-microvolt = <1022000>;
+-		};
+ 	};
+ };
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0048-WIP-arm64-dts-meson-g12-sm1-remove-opps-below-1GHz.patch

@@ -0,0 +1,132 @@
+From c6a298534815027cbcafe0a2015c5e4ca6a1ea53 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Fri, 4 Dec 2020 14:33:39 +0100
+Subject: [PATCH 48/88] WIP: arm64: dts: meson: g12/sm1: remove opps below 1GHz
+
+Various CPU stall and crash, often related to the CPU sys pll, have been
+reported on the odroid-n2, n2+ and vim3/3l. It still not entirely clear
+what the problem is. The problem only happens on some samples, not all,
+often after more than 24h running fine.
+
+Boards running fixed CPU frequency, like the one using the performance
+governor, appear unaffected. Doing more tests seems to show that problem
+appears only with the lower opps. Removing opps with a rate lower than 1GHz
+seems to solve/hide the problem
+
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+---
+ .../boot/dts/amlogic/meson-g12b-a311d.dtsi    | 20 -------------------
+ .../boot/dts/amlogic/meson-g12b-s922x.dtsi    | 20 -------------------
+ arch/arm64/boot/dts/amlogic/meson-sm1.dtsi    | 20 -------------------
+ 3 files changed, 60 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+index 7d29756451a5..4a8acff92ba5 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi
+@@ -11,16 +11,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-500000000 {
+-			opp-hz = /bits/ 64 <500000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-667000000 {
+-			opp-hz = /bits/ 64 <667000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-1000000000 {
+ 			opp-hz = /bits/ 64 <1000000000>;
+ 			opp-microvolt = <761000>;
+@@ -61,16 +51,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-500000000 {
+-			opp-hz = /bits/ 64 <500000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-667000000 {
+-			opp-hz = /bits/ 64 <667000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-1000000000 {
+ 			opp-hz = /bits/ 64 <1000000000>;
+ 			opp-microvolt = <731000>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+index ad4096be8db2..df7a2cd7265d 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi
+@@ -11,16 +11,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-500000000 {
+-			opp-hz = /bits/ 64 <500000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+-		opp-667000000 {
+-			opp-hz = /bits/ 64 <667000000>;
+-			opp-microvolt = <731000>;
+-		};
+-
+ 		opp-1000000000 {
+ 			opp-hz = /bits/ 64 <1000000000>;
+ 			opp-microvolt = <731000>;
+@@ -61,16 +51,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-500000000 {
+-			opp-hz = /bits/ 64 <500000000>;
+-			opp-microvolt = <751000>;
+-		};
+-
+-		opp-667000000 {
+-			opp-hz = /bits/ 64 <667000000>;
+-			opp-microvolt = <751000>;
+-		};
+-
+ 		opp-1000000000 {
+ 			opp-hz = /bits/ 64 <1000000000>;
+ 			opp-microvolt = <771000>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+index c309517abae3..defe0b8d4d27 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+@@ -95,26 +95,6 @@
+ 		compatible = "operating-points-v2";
+ 		opp-shared;
+ 
+-		opp-100000000 {
+-			opp-hz = /bits/ 64 <100000000>;
+-			opp-microvolt = <730000>;
+-		};
+-
+-		opp-250000000 {
+-			opp-hz = /bits/ 64 <250000000>;
+-			opp-microvolt = <730000>;
+-		};
+-
+-		opp-500000000 {
+-			opp-hz = /bits/ 64 <500000000>;
+-			opp-microvolt = <730000>;
+-		};
+-
+-		opp-667000000 {
+-			opp-hz = /bits/ 64 <666666666>;
+-			opp-microvolt = <750000>;
+-		};
+-
+ 		opp-1000000000 {
+ 			opp-hz = /bits/ 64 <1000000000>;
+ 			opp-microvolt = <770000>;
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-support-for-GX-PM-and-Virtua.patch

@@ -1,7 +1,7 @@
-From b6ce27b12f864072eb706b56ce4f32603e211f16 Mon Sep 17 00:00:00 2001
+From 97f099f7b4e954a67d4c2612211520c6778559da Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 3 Nov 2016 15:29:25 +0100
-Subject: [PATCH 44/78] WIP: arm64: dts: meson: add support for GX PM and
+Subject: [PATCH 49/88] WIP: arm64: dts: meson: add support for GX PM and
  Virtual RTC
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
@@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
-index 14ff467c6be8..2c7afe34112b 100644
+index e58ebe3ba65c..a717e93eea94 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
 @@ -221,6 +221,10 @@
@@ -24,7 +24,7 @@ index 14ff467c6be8..2c7afe34112b 100644
  	efuse: efuse {
  		compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse";
  		#address-cells = <1>;
-@@ -458,6 +462,11 @@
+@@ -459,6 +463,11 @@
  				};
  			};
  

projects/Amlogic/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-V.patch

@@ -1,7 +1,7 @@
-From 56e132abb2baa69aa26850ccf7f1a3621d60bcc1 Mon Sep 17 00:00:00 2001
+From 0036ea5b743d40190574fbd1d65ac19d37913050 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 21 Jan 2021 01:35:36 +0000
-Subject: [PATCH 45/78] WIP: arm64: dts: meson: add rtc/vrtc aliases to Khadas
+Subject: [PATCH 50/88] WIP: 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/patches/linux/amlogic-0051-WIP-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-NE.patch

@@ -1,7 +1,7 @@
-From a8fe715b1ca52a0afb6db5e1ec0ebbf4d97e202d Mon Sep 17 00:00:00 2001
+From 9a81dd203d2707526822ccdb79e58e5a13db5ac5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 1 Feb 2021 19:27:40 +0000
-Subject: [PATCH 46/78] WIP: arm64: dts: meson: add rtc/vrtc aliases to Minix
+Subject: [PATCH 51/88] WIP: 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/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-spifc-node-to-ODROID-HC4.patch

@@ -1,7 +1,7 @@
-From be376ae6fb6f8050c5a6bac76d7c0d63eb6b8cfb Mon Sep 17 00:00:00 2001
+From 5dc36db40e38ffb7eaae693f7a17dcb3c2980263 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Thu, 28 Jan 2021 17:15:22 +0000
-Subject: [PATCH 47/78] WIP: arm64: dts: meson: add spifc node to ODROID-HC4
+Subject: [PATCH 52/88] WIP: arm64: dts: meson: add spifc node to ODROID-HC4
 
 Add a node for the XT25F128B SPI-NOR flash to make it accessible
 from Linux.

projects/Amlogic/patches/linux/amlogic-0053-WIP-arm64-dts-meson-add-audio-playback-to-nexbox-a1.patch

@@ -1,7 +1,7 @@
-From bb9668cf2d5d550b95b427fe2e6f1ffd64dcc80e Mon Sep 17 00:00:00 2001
+From 2601a4d008a0e65f05b5750efc6014032da05864 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:23:05 +0000
-Subject: [PATCH 48/78] WIP: arm64: dts: meson: add audio playback to nexbox-a1
+Subject: [PATCH 53/88] WIP: arm64: dts: meson: add audio playback to nexbox-a1
 
 Add initial support is limited to HDMI i2s and SPDIF (LPCM).
 

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

@@ -1,7 +1,7 @@
-From 5792cee19793ab43c7fc9c5c04c5dddb8de5a5f8 Mon Sep 17 00:00:00 2001
+From ff0ee624fc64933c03a9132da00f450ae3558e22 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 07:52:47 +0000
-Subject: [PATCH 49/78] WIP: arm64: dts: meson: add audio playback to p201
+Subject: [PATCH 54/88] WIP: arm64: dts: meson: add audio playback to p201
 
 Add initial audio support limited to HDMI i2s.
 

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

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

projects/Amlogic/patches/linux/amlogic-0056-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch

@@ -1,7 +1,7 @@
-From e8c87f1399e34d67857e955542bdb14bd6939df6 Mon Sep 17 00:00:00 2001
+From 84482c9385e9eeb3420d308908eb78be7a3794c4 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 08:02:54 +0000
-Subject: [PATCH 51/78] WIP: arm64: dts: meson: add audio playback to
+Subject: [PATCH 56/88] WIP: arm64: dts: meson: add audio playback to
  p212-s905x dtsi
 
 Add initial audio support limited to HDMI i2s.

projects/Amlogic/patches/linux/amlogic-0057-WIP-arm64-dts-meson-add-audio-playback-to-rbox-pro.patch

@@ -1,7 +1,7 @@
-From 4ec2803abc56413983c880e88cd580fd30f23177 Mon Sep 17 00:00:00 2001
+From 2a59ec1861a0dae5694969e14cb42fe6f7991519 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Fri, 15 May 2020 08:13:00 +0000
-Subject: [PATCH 52/78] WIP: arm64: dts: meson: add audio playback to rbox-pro
+Subject: [PATCH 57/88] WIP: arm64: dts: meson: add audio playback to rbox-pro
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

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

@@ -1,7 +1,7 @@
-From e1cb25c4c9f92255af4c6face8052e660a939536 Mon Sep 17 00:00:00 2001
+From 67e838ec7820b19e5a359280fea47b016cb64d30 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 17 May 2020 05:00:55 +0000
-Subject: [PATCH 53/78] WIP: arm64: dts: meson: add audio playback to u200
+Subject: [PATCH 58/88] WIP: arm64: dts: meson: add audio playback to u200
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).
 

projects/Amlogic/patches/linux/amlogic-0059-WIP-arm64-dts-meson-add-audio-playback-to-vega-s95-d.patch

@@ -1,7 +1,7 @@
-From 0bbdd1a843c87f6a58234b822e6b39fc85fb6ab5 Mon Sep 17 00:00:00 2001
+From edb660df5a1b9dc560e98a2c877053698d375a80 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 16 May 2020 07:04:58 +0000
-Subject: [PATCH 54/78] WIP: arm64: dts: meson: add audio playback to vega-s95
+Subject: [PATCH 59/88] WIP: arm64: dts: meson: add audio playback to vega-s95
  dtsi
 
 Add initial support limited to HDMI i2s and SPDIF (LPCM).

projects/Amlogic/patches/linux/amlogic-0060-WIP-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch

@@ -1,7 +1,7 @@
-From b60fc3c2b547b2116b0f8324ed5db4bd8d06ccc4 Mon Sep 17 00:00:00 2001
+From 70abd18511ab50fc7c77b5a724dedbc10106320f Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Fri, 15 Feb 2019 14:21:27 +0100
-Subject: [PATCH 55/78] WIP: clk: meson: g12a: fix gp0 and hifi ranges
+Subject: [PATCH 60/88] WIP: clk: meson: g12a: fix gp0 and hifi ranges
 
 While some SoC samples are able to lock with a PLL factor of 55, others
 samples can't. ATM, a minimum of 60 appears to work on all the samples

projects/Amlogic/patches/linux/amlogic-0061-WIP-clk-meson-g12a-fix-hifi-pll-lock.patch

@@ -1,7 +1,7 @@
-From e7405d6e7e5e8eab9e3ac563046b0e5972f95767 Mon Sep 17 00:00:00 2001
+From c4b9d6d8feaf91a9b83285052ac7b4f45580ddb0 Mon Sep 17 00:00:00 2001
 From: Jerome Brunet <jbrunet@baylibre.com>
 Date: Tue, 14 Apr 2020 10:45:08 +0200
-Subject: [PATCH 56/78] WIP: clk: meson: g12a: fix hifi pll lock
+Subject: [PATCH 61/88] WIP: clk: meson: g12a: fix hifi pll lock
 
 The HIFI pll of the g12a sometimes takes a long time to report the lock in
 HIFI_PLL_CNTL0 bit 31. The would eventually be reported but the delay may

projects/Amlogic/patches/linux/amlogic-0061-arm64-dts-meson-add-sd-uhs-modes-to-ODROID-N2-N2.patch

@@ -1,33 +0,0 @@
-From 4394cdc8f1cb974a8cfbda25a1f43eb480024fe2 Mon Sep 17 00:00:00 2001
-From: Christian Hewitt <christianshewitt@gmail.com>
-Date: Sun, 21 Feb 2021 05:51:27 +0000
-Subject: [PATCH 61/78] arm64: dts: meson: add sd-uhs modes to ODROID-N2/N2+
-
-Increase max-frequency to 200000000 and add sd-uhs modes to the
-ODROID N2/N2+ common dtsi.
-
-Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index 58ce569b2ace..5c70935a583e 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-@@ -517,7 +517,11 @@
- 
- 	bus-width = <4>;
- 	cap-sd-highspeed;
--	max-frequency = <50000000>;
-+	max-frequency = <200000000>;
-+	sd-uhs-sdr12;
-+	sd-uhs-sdr25;
-+	sd-uhs-sdr50;
-+	sd-uhs-sdr104;
- 	disable-wp;
- 
- 	cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>;
--- 
-2.17.1
-

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

@@ -1,7 +1,7 @@
-From e34a71cfeea60066ed069b87ca34d6ec7c702ec0 Mon Sep 17 00:00:00 2001
+From 04c165c9794f2ad3b3d18fe3999fb305292cb1e6 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 23 Dec 2018 02:24:38 +0100
-Subject: [PATCH 57/78] WIP: ASoC: hdmi-codec: reorder channel allocation list
+Subject: [PATCH 62/88] WIP: ASoC: hdmi-codec: reorder channel allocation list
 
 Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx().
 

projects/Amlogic/patches/linux/amlogic-0063-WIP-ASoC-meson-aiu-encoder-spdif-implement-the-.mute.patch

@@ -1,7 +1,7 @@
-From f643523d186e62a40158d4b969c39c7e54351627 Mon Sep 17 00:00:00 2001
+From ecfecfa8d87e6ffc0958076467e82b4a26dcab98 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 23 Dec 2020 02:45:27 +0100
-Subject: [PATCH 58/78] WIP: ASoC: meson: aiu: encoder-spdif: implement the
+Subject: [PATCH 63/88] WIP: ASoC: meson: aiu: encoder-spdif: implement the
  .mute_stream callback
 
 Implement the .mute_stream callback based on code from the vendor

projects/Amlogic/patches/linux/amlogic-0064-WIP-ASoC-meson-aiu-encoder-i2s-implement-the-.mute_s.patch

@@ -1,7 +1,7 @@
-From 05065835844cb04697b86f82f950e9b1974f8875 Mon Sep 17 00:00:00 2001
+From 27a0b699cf76c8fc3e2ad354af85bfe3cb04bfc0 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Wed, 23 Dec 2020 02:46:54 +0100
-Subject: [PATCH 59/78] WIP: ASoC: meson: aiu: encoder-i2s: implement the
+Subject: [PATCH 64/88] WIP: ASoC: meson: aiu: encoder-i2s: implement the
  .mute_stream callback
 
 Implement the .mute_stream callback based on the code from the vendor

projects/Amlogic/patches/linux/amlogic-0065-WIP-ALSA-pcm-fix-ELD-constraints-for-some-compressed.patch

@@ -0,0 +1,91 @@
+From 56f9f701c98ffbb339f51cbfbaf653ee6fa52111 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 20 Mar 2021 08:32:12 +0000
+Subject: [PATCH 65/88] WIP: ALSA: pcm: fix ELD constraints for some compressed
+ audio formats
+
+The SADs of compressed formats like AC3 and DTS contain the channel
+and sample rate info of the audio data inside the compressed stream,
+but when building constraints we must use the rates and formats used
+to pass through the stream. eg 2ch 48kHz for AC3.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ sound/core/pcm_drm_eld.c | 38 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 35 insertions(+), 3 deletions(-)
+
+diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c
+index 4b5faae5d16e..e7ec7a8b9d42 100644
+--- a/sound/core/pcm_drm_eld.c
++++ b/sound/core/pcm_drm_eld.c
+@@ -6,6 +6,7 @@
+ #include <drm/drm_edid.h>
+ #include <sound/pcm.h>
+ #include <sound/pcm_drm_eld.h>
++#include <linux/hdmi.h>
+ 
+ static const unsigned int eld_rates[] = {
+ 	32000,
+@@ -17,9 +18,40 @@ static const unsigned int eld_rates[] = {
+ 	192000,
+ };
+ 
++static unsigned int sad_format(const u8 *sad)
++{
++	return (sad[0] & 0x78) >> 3;
++}
++
+ static unsigned int sad_max_channels(const u8 *sad)
+ {
+-	return 1 + (sad[0] & 7);
++	switch (sad_format(sad)) {
++	case HDMI_AUDIO_CODING_TYPE_AC3:
++	case HDMI_AUDIO_CODING_TYPE_DTS:
++	case HDMI_AUDIO_CODING_TYPE_EAC3:
++		return 2;
++	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
++	case HDMI_AUDIO_CODING_TYPE_MLP:
++		return 8;
++	default:
++		return 1 + (sad[0] & 7);
++	}
++}
++
++static unsigned int sad_rate_mask(const u8 *sad)
++{
++	switch (sad_format(sad)) {
++	case HDMI_AUDIO_CODING_TYPE_AC3:
++	case HDMI_AUDIO_CODING_TYPE_DTS:
++		return 0x07; // 32-48kHz
++	case HDMI_AUDIO_CODING_TYPE_EAC3:
++		return 0x7f; // 32-192kHz
++	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
++	case HDMI_AUDIO_CODING_TYPE_MLP:
++		return 0x60; // 176.4, 192kHz
++	default:
++		return sad[1] & 0x7f;
++	}
+ }
+ 
+ static int eld_limit_rates(struct snd_pcm_hw_params *params,
+@@ -42,7 +74,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params,
+ 			 * requested number of channels.
+ 			 */
+ 			if (c->min <= max_channels)
+-				rate_mask |= sad[1];
++				rate_mask |= sad_rate_mask(sad);
+ 		}
+ 	}
+ 
+@@ -70,7 +102,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params,
+ 				rate_mask |= BIT(i);
+ 
+ 		for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3)
+-			if (rate_mask & sad[1])
++			if (rate_mask & sad_rate_mask(sad))
+ 				t.max = max(t.max, sad_max_channels(sad));
+ 	}
+ 
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0066-WIP-ALSA-pcm-ignore-formats-not-supported-by-kodi-in.patch

@@ -0,0 +1,45 @@
+From 546929867bf75032dbfa1c94160c4eb417a5efe7 Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <hias@horus.com>
+Date: Sat, 20 Mar 2021 10:48:54 +0100
+Subject: [PATCH 66/88] WIP: ALSA: pcm: ignore formats not supported by kodi in
+ ELD constraints
+
+Only parse channel info and rates from the PCM SAD. All other SAD
+formats are mapped to basic audio (2ch, 32-48kHz).
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ sound/core/pcm_drm_eld.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c
+index e7ec7a8b9d42..81c1f684daa8 100644
+--- a/sound/core/pcm_drm_eld.c
++++ b/sound/core/pcm_drm_eld.c
+@@ -33,8 +33,10 @@ static unsigned int sad_max_channels(const u8 *sad)
+ 	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
+ 	case HDMI_AUDIO_CODING_TYPE_MLP:
+ 		return 8;
+-	default:
++	case HDMI_AUDIO_CODING_TYPE_PCM:
+ 		return 1 + (sad[0] & 7);
++	default:
++		return 2; // ignore, map to basic audio
+ 	}
+ }
+ 
+@@ -49,8 +51,10 @@ static unsigned int sad_rate_mask(const u8 *sad)
+ 	case HDMI_AUDIO_CODING_TYPE_DTS_HD:
+ 	case HDMI_AUDIO_CODING_TYPE_MLP:
+ 		return 0x60; // 176.4, 192kHz
+-	default:
++	case HDMI_AUDIO_CODING_TYPE_PCM:
+ 		return sad[1] & 0x7f;
++	default:
++		return 0x07; // ignore, map to basic audio
+ 	}
+ }
+ 
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0067-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch

@@ -1,7 +1,7 @@
-From ee135ee6fe801ae3ec8fe03e09013ee207fb2d83 Mon Sep 17 00:00:00 2001
+From 54b8e155e8fdb914751f1d8ed53f9edd66470008 Mon Sep 17 00:00:00 2001
 From: Neil Armstrong <narmstrong@baylibre.com>
 Date: Thu, 14 Jan 2021 17:43:02 +0100
-Subject: [PATCH 60/78] WIP: mmc: meson-gx-mmc: set core clock phase to 270
+Subject: [PATCH 67/88] WIP: mmc: meson-gx-mmc: set core clock phase to 270
  degres for AXG compatible controllers
 
 Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

projects/Amlogic/patches/linux/amlogic-0068-arm64-dts-meson-add-GPIO-line-names-to-ODROID-N2-N2.patch

@@ -1,7 +1,7 @@
-From 64b2e352216949aa790aaf86d138a40bcf2154ec Mon Sep 17 00:00:00 2001
+From 906edbb3c5bdb0d8977e0ffecc1a80ae1a82702a Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 21 Feb 2021 05:58:56 +0000
-Subject: [PATCH 62/78] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
+Subject: [PATCH 68/88] arm64: dts: meson: add GPIO line names to ODROID N2/N2+
 
 Add GPIO line-name identifiers to the ODROID N2/N2+ common dtsi.
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 45 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index 5c70935a583e..ac396067911d 100644
+index 58ce569b2ace..b9bee949b543 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 @@ -446,6 +446,51 @@

projects/Amlogic/patches/linux/amlogic-0069-arm64-dts-meson-add-saradc-node-to-ODROID-N2-N2.patch

@@ -1,7 +1,7 @@
-From da6d4e2729b28e2197f4e9ed6fd7c05aac607945 Mon Sep 17 00:00:00 2001
+From c7786a603428f55dc0cb590e04cdee0939aa708e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 21 Feb 2021 06:03:20 +0000
-Subject: [PATCH 63/78] arm64: dts: meson: add saradc node to ODROID N2/N2+
+Subject: [PATCH 69/88] arm64: dts: meson: add saradc node to ODROID N2/N2+
 
 Add the meson saradc node to the ODROID N2/N2+ common dtsi.
 
@@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index ac396067911d..f71d012e5460 100644
+index b9bee949b543..6b9f216d760c 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 @@ -553,6 +553,10 @@

projects/Amlogic/patches/linux/amlogic-0070-arm64-dts-meson-remove-extra-tab-from-ODROID-N2-N2-e.patch

@@ -1,7 +1,7 @@
-From 8e7c25e8abe4a81b3e1428fcac2a98c18736c67c Mon Sep 17 00:00:00 2001
+From dbd3e3f39e77bf63e6712e8f21ff6b47a710a117 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 21 Feb 2021 06:05:25 +0000
-Subject: [PATCH 64/78] arm64: dts: meson: remove extra tab from ODROID N2/N2+
+Subject: [PATCH 70/88] arm64: dts: meson: remove extra tab from ODROID N2/N2+
  ext_mdio node
 
 Remove an extra tab from the ext_mdio node in the ODROID N2/N2+ common
@@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
-index f71d012e5460..eeceab18a497 100644
+index 6b9f216d760c..4489715fc4f3 100644
 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
 @@ -410,7 +410,7 @@

projects/Amlogic/patches/linux/amlogic-0071-dt-bindings-arm-amlogic-add-Bananapi-BPI-M5-bindings.patch

@@ -1,7 +1,7 @@
-From 4bfe6f94f37ddf4c7c95d1e376228b9d70cd782e Mon Sep 17 00:00:00 2001
+From 6228426c54a777a499e7076fd0eaa3a65dfe33c7 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 27 Dec 2020 15:27:44 +0000
-Subject: [PATCH 65/78] dt-bindings: arm: amlogic: add Bananapi BPI-M5 bindings
+Subject: [PATCH 71/88] dt-bindings: arm: amlogic: add Bananapi BPI-M5 bindings
 
 Add the board bindings for the Sinovoip (Bananapi) BPI-M5 device.
 

projects/Amlogic/patches/linux/amlogic-0072-arm64-dts-meson-add-initial-device-tree-for-Bananapi.patch

@@ -1,7 +1,7 @@
-From 6754ee8562db43e03db01ba95f180a4ce1b72c64 Mon Sep 17 00:00:00 2001
+From d7bdfe46cd2513200112787ad200e69bbd24e907 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 27 Dec 2020 15:11:59 +0000
-Subject: [PATCH 66/78] arm64: dts: meson: add initial device-tree for Bananapi
+Subject: [PATCH 72/88] arm64: dts: meson: add initial device-tree for Bananapi
  BPI-M5
 
 The Bananapi Wiki links to Amlogic BSP kernel sources which show [0]

projects/Amlogic/patches/linux/amlogic-0073-arm64-dts-meson-add-common-SM1-ac2xx-dtsi.patch

@@ -1,7 +1,7 @@
-From be1367da3d53c261e77d20ebaea58e95d8f5443c Mon Sep 17 00:00:00 2001
+From a2e5abe104b6d593a1a0879b256a2c696acfac0e Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 24 Jun 2020 12:41:46 +0000
-Subject: [PATCH 67/78] arm64: dts: meson: add common SM1 ac2xx dtsi
+Subject: [PATCH 73/88] arm64: dts: meson: add common SM1 ac2xx dtsi
 
 Add a common dtsi for Android STB devices based on the Amlogic S905X3
 (AC213/AC214) and S905D3 (AC201/AC202) reference designs. The dtsi is

projects/Amlogic/patches/linux/amlogic-0074-dt-bindings-arm-amlogic-add-X96-AIR-bindings.patch

@@ -1,7 +1,7 @@
-From 12e312feabbe06e09dc7d83b2b9525269c86f37f Mon Sep 17 00:00:00 2001
+From 179925a3bc8a5ce03f3930b508c3103406998dd5 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 18 May 2020 23:23:40 +0000
-Subject: [PATCH 68/78] dt-bindings: arm: amlogic: add X96-AIR bindings
+Subject: [PATCH 74/88] dt-bindings: arm: amlogic: add X96-AIR bindings
 
 Add board bindings for the Amediatech X96-AIR STB which ships with
 model variants distiguished by Ethernet configuration: models using

projects/Amlogic/patches/linux/amlogic-0075-arm64-dts-meson-add-initial-device-trees-for-X96-AIR.patch

@@ -1,7 +1,7 @@
-From d57fdb6ecfbaf2453370d49b8a023028ee29c495 Mon Sep 17 00:00:00 2001
+From 90fb7b38afcfc6d1e5b134525e988781cd56adc3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 24 Jun 2020 15:04:10 +0000
-Subject: [PATCH 69/78] arm64: dts: meson: add initial device-trees for X96-AIR
+Subject: [PATCH 75/88] arm64: dts: meson: add initial device-trees for X96-AIR
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

projects/Amlogic/patches/linux/amlogic-0076-dt-bindings-arm-amlogic-add-A95XF3-AIR-bindings.patch

@@ -1,7 +1,7 @@
-From 96c672da3e46efd9e23d907d80a99bcba1d83b8f Mon Sep 17 00:00:00 2001
+From d3f8339a14bb50d961ea6abd4d391355d2b21858 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 29 Jun 2020 15:54:45 +0000
-Subject: [PATCH 70/78] dt-bindings: arm: amlogic: add A95XF3-AIR bindings
+Subject: [PATCH 76/88] dt-bindings: arm: amlogic: add A95XF3-AIR bindings
 
 Add board bindings for the CYX A95XF3-AIR set-top box  which ships
 with model variants distiguished by Ethernet configuration: models

projects/Amlogic/patches/linux/amlogic-0077-arm64-dts-meson-add-initial-device-trees-for-A95XF3-.patch

@@ -1,7 +1,7 @@
-From 8a25bbde77c708cde68faa0fe10b50a44f32cd54 Mon Sep 17 00:00:00 2001
+From fcb882d32ac78cf1c121a7cce2242cef327bd67f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Wed, 3 Jun 2020 18:03:22 +0000
-Subject: [PATCH 71/78] arm64: dts: meson: add initial device-trees for
+Subject: [PATCH 77/88] arm64: dts: meson: add initial device-trees for
  A95XF3-AIR
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8

projects/Amlogic/patches/linux/amlogic-0078-dt-bindings-vendor-prefixes-add-haochuangyi-prefix.patch

@@ -1,7 +1,7 @@
-From d42cc1b7e27de2e1ac98abe1ad0f1eea12c02a17 Mon Sep 17 00:00:00 2001
+From 506523142679a04de69412e08765538b398fa7e2 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 12 Jan 2021 17:24:07 +0000
-Subject: [PATCH 72/78] dt-bindings: vendor-prefixes: add haochuangyi prefix
+Subject: [PATCH 78/88] dt-bindings: vendor-prefixes: add haochuangyi prefix
 
 Shenzhen Haochuangyi Technology Co.,Ltd are a manufcaturer of Android
 Set-Top Box devices.

projects/Amlogic/patches/linux/amlogic-0079-dt-bindings-arm-amlogic-add-H96-Max-bindings.patch

@@ -1,7 +1,7 @@
-From 55f48f171a08b8378537139eefb4bc3c5952aea0 Mon Sep 17 00:00:00 2001
+From 50d360d344ebf97f7453b3ec1fae4053879ab33f Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 12 Jan 2021 17:25:33 +0000
-Subject: [PATCH 73/78] dt-bindings: arm: amlogic: add H96-Max bindings
+Subject: [PATCH 79/88] dt-bindings: arm: amlogic: add H96-Max bindings
 
 Add the board binding for the Haochuangyi H96-Max STB device.
 

projects/Amlogic/patches/linux/amlogic-0080-arm64-dts-meson-add-initial-device-tree-for-H96-Max.patch

@@ -1,7 +1,7 @@
-From b57ae2960233d81603dc62428f1e565691b274f4 Mon Sep 17 00:00:00 2001
+From a3fcc16aac001adb400a8576e280d3c1dc9b10a6 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 12 Jan 2021 17:26:42 +0000
-Subject: [PATCH 74/78] arm64: dts: meson: add initial device-tree for H96-Max
+Subject: [PATCH 80/88] arm64: dts: meson: add initial device-tree for H96-Max
 
 The Haochuangyi H96-Max is based on the Amlogic S905X3 reference
 design with the following specs:

projects/Amlogic/patches/linux/amlogic-0081-dt-bindings-arm-amlogic-add-support-for-the-Tanix-TX.patch

@@ -1,7 +1,7 @@
-From 51663ab279eade8c7828f9c3d45e26f4d5adbbfa Mon Sep 17 00:00:00 2001
+From 8af4f9a08f739fd9b832c13939b765211a166097 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sat, 29 Feb 2020 15:13:02 +0000
-Subject: [PATCH 75/78] dt-bindings: arm: amlogic: add support for the Tanix
+Subject: [PATCH 81/88] 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/patches/linux/amlogic-0082-arm64-dts-meson-add-support-for-the-Tanix-TX5-Max.patch

@@ -1,7 +1,7 @@
-From 32373d61748b44985d8fc3ae4f8248604b82ced1 Mon Sep 17 00:00:00 2001
+From fc88070f5e6cb37b9b0e30c13065a56333a16f1d Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Sun, 20 Oct 2019 04:06:59 +0000
-Subject: [PATCH 76/78] arm64: dts: meson: add support for the Tanix TX5 Max
+Subject: [PATCH 82/88] arm64: dts: meson: add support for the Tanix TX5 Max
 
 The Tanix TX5 Max is based on the Amlogic U200 reference design
 using the S905X2 chipset. Hardware specification:

projects/Amlogic/patches/linux/amlogic-0083-arm64-dts-meson-fixups-for-WeTek-common-dtsi.patch

@@ -1,7 +1,7 @@
-From 74ace7b5c101ee4925c52ff60f10620095aea22c Mon Sep 17 00:00:00 2001
+From cc7f9f99d5e29270dca4952502f2c661f4aa0ac0 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Tue, 29 Dec 2020 09:31:57 +0000
-Subject: [PATCH 78/78] arm64: dts: meson: fixups for WeTek common dtsi
+Subject: [PATCH 83/88] arm64: dts: meson: fixups for WeTek common dtsi
 
 Minor changes that result from work on mainline u-boot support, closer
 study of vendor 3.14 device-tree, and access to vendor schematics:

projects/Amlogic/patches/linux/amlogic-0084-media-rc-add-keymaps-for-mecool-kii-pro-kiii-pro-rem.patch

@@ -0,0 +1,258 @@
+From 903c0bd72155f8cf84b0bdcd6e129f6470a954e5 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Mon, 8 Mar 2021 02:51:01 +0000
+Subject: [PATCH 84/88] media: rc: add keymaps for mecool-kii-pro/kiii-pro
+ remotes
+
+Add keymaps and bindings for the simple IR (NEC) remotes used with
+the MeCool KII-Pro and MeCool KIII-Pro Android STB devices.
+
+Tested-by: Drazen Spio <drazsp@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ .../devicetree/bindings/media/rc.yaml         |  2 +
+ drivers/media/rc/keymaps/Makefile             |  2 +
+ drivers/media/rc/keymaps/rc-mecool-kii-pro.c  | 93 +++++++++++++++++++
+ drivers/media/rc/keymaps/rc-mecool-kiii-pro.c | 90 ++++++++++++++++++
+ include/media/rc-map.h                        |  2 +
+ 5 files changed, 189 insertions(+)
+ create mode 100644 drivers/media/rc/keymaps/rc-mecool-kii-pro.c
+ create mode 100644 drivers/media/rc/keymaps/rc-mecool-kiii-pro.c
+
+diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml
+index cbffdd6a470d..79c166a2cc1a 100644
+--- a/Documentation/devicetree/bindings/media/rc.yaml
++++ b/Documentation/devicetree/bindings/media/rc.yaml
+@@ -90,6 +90,8 @@ properties:
+       - rc-leadtek-y04g0051
+       - rc-lme2510
+       - rc-manli
++      - rc-mecool-kii-pro
++      - rc-mecool-kiii-pro
+       - rc-medion-x10
+       - rc-medion-x10-digitainer
+       - rc-medion-x10-or2x
+diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
+index 79c529340853..707148cb37f4 100644
+--- a/drivers/media/rc/keymaps/Makefile
++++ b/drivers/media/rc/keymaps/Makefile
+@@ -66,6 +66,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
+ 			rc-leadtek-y04g0051.o \
+ 			rc-lme2510.o \
+ 			rc-manli.o \
++			rc-mecool-kii-pro.o \
++			rc-mecool-kiii-pro.o \
+ 			rc-medion-x10.o \
+ 			rc-medion-x10-digitainer.o \
+ 			rc-medion-x10-or2x.o \
+diff --git a/drivers/media/rc/keymaps/rc-mecool-kii-pro.c b/drivers/media/rc/keymaps/rc-mecool-kii-pro.c
+new file mode 100644
+index 000000000000..08ffdd1352ce
+--- /dev/null
++++ b/drivers/media/rc/keymaps/rc-mecool-kii-pro.c
+@@ -0,0 +1,93 @@
++// SPDX-License-Identifier: GPL-2.0+
++//
++// Copyright (C) 2021 Christian Hewitt <christianshewitt@gmail.com>
++
++#include <media/rc-map.h>
++#include <linux/module.h>
++
++//
++// Keytable for the Mecool Kii Pro remote control
++//
++
++static struct rc_map_table mecool_kii_pro[] = {
++
++	{ 0x59, KEY_POWER },
++	{ 0x19, KEY_MUTE },
++
++	{ 0x42, KEY_RED },
++	{ 0x40, KEY_GREEN },
++	{ 0x00, KEY_YELLOW},
++	{ 0x03, KEY_BLUE },
++
++	{ 0x4a, KEY_REWIND },
++	{ 0x48, KEY_FORWARD },
++	{ 0x08, KEY_PREVIOUSSONG},
++	{ 0x0b, KEY_NEXTSONG},
++
++	{ 0x46, KEY_PLAYPAUSE },
++	{ 0x44, KEY_STOP },
++	{ 0x1f, KEY_FAVORITES},
++	{ 0x04, KEY_PVR },
++
++	{ 0x4d, KEY_EPG },
++	{ 0x02, KEY_INFO },
++	{ 0x09, KEY_SUBTITLE },
++	{ 0x01, KEY_LANGUAGE }, // AUDIO
++
++	{ 0x0d, KEY_HOME },
++	{ 0x11, KEY_TV },
++	{ 0x45, KEY_MENU },
++	{ 0x05, KEY_EXIT },
++
++	{ 0x5a, KEY_LEFT },
++	{ 0x1b, KEY_RIGHT },
++	{ 0x06, KEY_UP },
++	{ 0x16, KEY_DOWN },
++	{ 0x1a, KEY_OK },
++
++	{ 0x13, KEY_VOLUMEUP },
++	{ 0x17, KEY_VOLUMEDOWN },
++	{ 0x58, KEY_APPSELECT }, // APPS
++	{ 0x12, KEY_CONTEXT_MENU }, // MOUSE
++	{ 0x55, KEY_CHANNELUP }, // PAGE_UP
++	{ 0x15, KEY_CHANNELDOWN }, // PAGE_DOWN
++
++	{ 0x52, KEY_1 },
++	{ 0x50, KEY_2 },
++	{ 0x10, KEY_3 },
++	{ 0x56, KEY_4 },
++	{ 0x54, KEY_5 },
++	{ 0x14, KEY_6 },
++	{ 0x4e, KEY_7 },
++	{ 0x4c, KEY_8 },
++	{ 0x0c, KEY_9 },
++	{ 0x18, KEY_WWW },
++	{ 0x0f, KEY_0 },
++	{ 0x51, KEY_DELETE },
++
++};
++
++static struct rc_map_list mecool_kii_pro_map = {
++	.map = {
++		.scan     = mecool_kii_pro,
++		.size     = ARRAY_SIZE(mecool_kii_pro),
++		.rc_proto = RC_PROTO_NEC,
++		.name     = RC_MAP_MECOOL_KII_PRO,
++	}
++};
++
++static int __init init_rc_map_mecool_kii_pro(void)
++{
++	return rc_map_register(&mecool_kii_pro_map);
++}
++
++static void __exit exit_rc_map_mecool_kii_pro(void)
++{
++	rc_map_unregister(&mecool_kii_pro_map);
++}
++
++module_init(init_rc_map_mecool_kii_pro)
++module_exit(exit_rc_map_mecool_kii_pro)
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
+diff --git a/drivers/media/rc/keymaps/rc-mecool-kiii-pro.c b/drivers/media/rc/keymaps/rc-mecool-kiii-pro.c
+new file mode 100644
+index 000000000000..6a2a9c35ba3d
+--- /dev/null
++++ b/drivers/media/rc/keymaps/rc-mecool-kiii-pro.c
+@@ -0,0 +1,90 @@
++// SPDX-License-Identifier: GPL-2.0+
++//
++// Copyright (C) 2021 Christian Hewitt <christianshewitt@gmail.com>
++
++#include <media/rc-map.h>
++#include <linux/module.h>
++
++//
++// Keytable for the Mecool Kiii Pro remote control
++//
++
++static struct rc_map_table mecool_kiii_pro[] = {
++
++	{ 0x59, KEY_POWER },
++
++	{ 0x52, KEY_1 },
++	{ 0x50, KEY_2 },
++	{ 0x10, KEY_3 },
++	{ 0x56, KEY_4 },
++	{ 0x54, KEY_5 },
++	{ 0x14, KEY_6 },
++	{ 0x4e, KEY_7 },
++	{ 0x4c, KEY_8 },
++	{ 0x0c, KEY_9 },
++	{ 0x02, KEY_INFO },
++	{ 0x0f, KEY_0 },
++	{ 0x51, KEY_DELETE },
++	{ 0x1f, KEY_FAVORITES},
++	{ 0x09, KEY_SUBTITLE },
++	{ 0x01, KEY_LANGUAGE }, // AUDIO
++
++	{ 0x42, KEY_RED },
++	{ 0x40, KEY_GREEN },
++	{ 0x00, KEY_YELLOW},
++	{ 0x03, KEY_BLUE }, // RADIO
++
++	{ 0x0d, KEY_HOME },
++	{ 0x4d, KEY_EPG },
++	{ 0x45, KEY_MENU },
++	{ 0x05, KEY_EXIT },
++
++	{ 0x5a, KEY_LEFT },
++	{ 0x1b, KEY_RIGHT },
++	{ 0x06, KEY_UP },
++	{ 0x16, KEY_DOWN },
++	{ 0x1a, KEY_OK },
++
++	{ 0x13, KEY_VOLUMEUP },
++	{ 0x17, KEY_VOLUMEDOWN },
++	{ 0x19, KEY_MUTE },
++	{ 0x12, KEY_CONTEXT_MENU }, // MOUSE
++	{ 0x55, KEY_CHANNELUP }, // PAGE_UP
++	{ 0x15, KEY_CHANNELDOWN }, // PAGE_DOWN
++
++	{ 0x4a, KEY_REWIND },
++	{ 0x48, KEY_FORWARD },
++	{ 0x46, KEY_PLAYPAUSE },
++	{ 0x44, KEY_STOP },
++
++	{ 0x08, KEY_PREVIOUSSONG},
++	{ 0x0b, KEY_NEXTSONG},
++	{ 0x04, KEY_PVR },
++	{ 0x64, KEY_RECORD },
++
++};
++
++static struct rc_map_list mecool_kiii_pro_map = {
++	.map = {
++		.scan     = mecool_kiii_pro,
++		.size     = ARRAY_SIZE(mecool_kiii_pro),
++		.rc_proto = RC_PROTO_NEC,
++		.name     = RC_MAP_MECOOL_KIII_PRO,
++	}
++};
++
++static int __init init_rc_map_mecool_kiii_pro(void)
++{
++	return rc_map_register(&mecool_kiii_pro_map);
++}
++
++static void __exit exit_rc_map_mecool_kiii_pro(void)
++{
++	rc_map_unregister(&mecool_kiii_pro_map);
++}
++
++module_init(init_rc_map_mecool_kiii_pro)
++module_exit(exit_rc_map_mecool_kiii_pro)
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Christian Hewitt <christianshewitt@gmail.com");
+diff --git a/include/media/rc-map.h b/include/media/rc-map.h
+index 6f8e2bbbc851..916fcc62ecf9 100644
+--- a/include/media/rc-map.h
++++ b/include/media/rc-map.h
+@@ -277,6 +277,8 @@ struct rc_map *rc_map_get(const char *name);
+ #define RC_MAP_LEADTEK_Y04G0051          "rc-leadtek-y04g0051"
+ #define RC_MAP_LME2510                   "rc-lme2510"
+ #define RC_MAP_MANLI                     "rc-manli"
++#define RC_MAP_MECOOL_KII_PRO            "rc-mecool-kii-pro"
++#define RC_MAP_MECOOL_KIII_PRO           "rc-mecool-kiii-pro"
+ #define RC_MAP_MEDION_X10                "rc-medion-x10"
+ #define RC_MAP_MEDION_X10_DIGITAINER     "rc-medion-x10-digitainer"
+ #define RC_MAP_MEDION_X10_OR2X           "rc-medion-x10-or2x"
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0085-dt-bindings-arm-amlogic-add-MeCool-KII-KIII-Pro-bind.patch

@@ -0,0 +1,37 @@
+From 6d455a73dcfaadc4e58774c4cb0c3c139dd5f7fc Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 9 Mar 2021 05:04:10 +0000
+Subject: [PATCH 85/88] dt-bindings: arm: amlogic: add MeCool KII/KIII Pro
+ bindings
+
+Add the board bindings for the MeCool (Videostrong Technology Co., Ltd)
+KII-Pro (S905D) and KIII-Pro (S912) devices.
+
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index e8aec4b53553..f32b798d1a1c 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -109,6 +109,7 @@ properties:
+               - libretech,aml-s905d-pc
+               - phicomm,n1
+               - smartlabs,sml5442tw
++              - videostrong,gxl-kii-pro
+           - const: amlogic,s905d
+           - const: amlogic,meson-gxl
+ 
+@@ -123,6 +124,7 @@ properties:
+               - minix,neo-u9h
+               - nexbox,a1
+               - tronsmart,vega-s96
++              - videostrong,gxm-kiii-pro
+               - wetek,core2
+           - const: amlogic,s912
+           - const: amlogic,meson-gxm
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0086-arm64-dts-meson-add-initial-device-tree-for-MeCool-K.patch

@@ -0,0 +1,137 @@
+From a0eebfc1fee709f56a275643f878d34bc847823c Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 9 Mar 2021 06:19:20 +0000
+Subject: [PATCH 86/88] arm64: dts: meson: add initial device-tree for MeCool
+ KII Pro
+
+MeCool (Videostrong) KII Pro is based on the Amlogic P230 reference
+board with an S905D chip and the following specs:
+
+- 2GB DDR3 RAM
+- 16GB eMMC
+- 10/100 Base-T Ethernet
+- BCM4335 Wireless (802.11 b/g/n/ac, BT 4.0)
+- DVB-C/T/T2/S/S2 (AVL6862TA demod + R848 tuner)
+- HDMI 2.0a video
+- S/PDIF optical output
+- CVBS/Analogue output
+- 4x USB 2.0 ports
+- IR receiver
+- 1x Power button (with integrated blue LED)
+- 1x micro SD card slot
+
+Tested-by: Drazen Spio <drazsp@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |  1 +
+ .../meson-gxl-s905d-mecool-kii-pro.dts        | 86 +++++++++++++++++++
+ 2 files changed, 87 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index 7d8586c718a1..cdfb5573acbc 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
++++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -30,6 +30,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
++dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
+new file mode 100644
+index 000000000000..5ab5d3aa0646
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
+@@ -0,0 +1,86 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++
++/*
++ * Author: Christian Hewitt <christianshewitt@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "meson-gxl-s905d.dtsi"
++#include "meson-gx-p23x-q20x.dtsi"
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++
++/ {
++	compatible = "videostrong,gxl-kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
++	model = "MeCool KII Pro";
++
++	adc-keys {
++		compatible = "adc-keys";
++		io-channels = <&saradc 0>;
++		io-channel-names = "buttons";
++		keyup-threshold-microvolt = <1710000>;
++
++		button-function {
++			label = "Update";
++			linux,code = <KEY_VENDOR>;
++			press-threshold-microvolt = <10000>;
++		};
++	};
++
++	gpio-keys-polled {
++		compatible = "gpio-keys-polled";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		poll-interval = <100>;
++
++		button@0 {
++			label = "power";
++			linux,code = <KEY_POWER>;
++			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		blue {
++			color = <LED_COLOR_ID_BLUE>;
++			function = LED_FUNCTION_POWER;
++			gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
++			panic-indicator;
++		};
++	};
++};
++
++&ethmac {
++	phy-mode = "rmii";
++	phy-handle = <&internal_phy>;
++};
++
++&ir {
++	linux,rc-map-name = "rc-mecool-kii-pro";
++};
++
++&sd_emmc_a {
++	brcmf: wifi@1 {
++		reg = <1>;
++		compatible = "brcm,bcm4329-fmac";
++	};
++};
++
++&uart_A {
++	status = "okay";
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	bluetooth {
++		compatible = "brcm,bcm43438-bt";
++		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
++		max-speed = <2000000>;
++		clocks = <&wifi32k>;
++		clock-names = "lpo";
++	};
++};
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0087-arm64-dts-meson-add-initial-device-tree-for-MeCool-K.patch

@@ -0,0 +1,165 @@
+From 1683ff2960679c9d26baffdd5716eaae683c81b7 Mon Sep 17 00:00:00 2001
+From: Christian Hewitt <christianshewitt@gmail.com>
+Date: Tue, 9 Mar 2021 06:58:47 +0000
+Subject: [PATCH 87/88] arm64: dts: meson: add initial device-tree for MeCool
+ KIII Pro
+
+MeCool (Videostrong) KIII Pro is based on the Amlogic Q200 reference
+board with an S912 chip and the following specs:
+
+- 3GB DDR3 RAM
+- 16GB eMMC
+- 10/100/1000 Base-T Ethernet
+- BCM4335 Wireless (802.11 b/g/n/ac, BT 4.0)
+- DVB-C/T/T2/S/S2 (AVL6862TA demod + R912 tuner)
+- HDMI 2.0a video
+- S/PDIF optical output
+- CVBS/Analogue output
+- 4x USB 2.0 ports
+- IR receiver
+- 1x Power button (with integrated blue LED)
+- 1x Update/Reset button (underside)
+- 1x micro SD card slot
+
+Tested-by: Drazen Spio <drazsp@gmail.com>
+Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
+---
+ arch/arm64/boot/dts/amlogic/Makefile          |   1 +
+ .../dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 113 ++++++++++++++++++
+ 2 files changed, 114 insertions(+)
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
+
+diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
+index cdfb5573acbc..82265e80cbe2 100644
+--- a/arch/arm64/boot/dts/amlogic/Makefile
++++ b/arch/arm64/boot/dts/amlogic/Makefile
+@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
++dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
+new file mode 100644
+index 000000000000..0651756d7fb5
+--- /dev/null
++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
+@@ -0,0 +1,113 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++
++/*
++ * Author: Christian Hewitt <christianshewitt@gmail.com>
++ */
++
++/dts-v1/;
++
++#include "meson-gxm.dtsi"
++#include "meson-gx-p23x-q20x.dtsi"
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++
++/ {
++	compatible = "videostrong,gxm-kiii-pro", "amlogic,s912", "amlogic,meson-gxm";
++	model = "MeCool KIII Pro";
++
++	memory@0 {
++		device_type = "memory";
++		reg = <0x0 0x0 0x0 0xC0000000>;
++	};
++
++	adc-keys {
++		compatible = "adc-keys";
++		io-channels = <&saradc 0>;
++		io-channel-names = "buttons";
++		keyup-threshold-microvolt = <1710000>;
++
++		button-function {
++			label = "Update";
++			linux,code = <KEY_VENDOR>;
++			press-threshold-microvolt = <10000>;
++		};
++	};
++
++	gpio-keys-polled {
++		compatible = "gpio-keys-polled";
++		#address-cells = <1>;
++		#size-cells = <0>;
++		poll-interval = <100>;
++
++		button@0 {
++			label = "power";
++			linux,code = <KEY_POWER>;
++			gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		blue {
++			color = <LED_COLOR_ID_BLUE>;
++			function = LED_FUNCTION_POWER;
++			gpios = <&gpio GPIODV_24 GPIO_ACTIVE_HIGH>;
++			default-state = "on";
++			panic-indicator;
++		};
++	};
++};
++
++&ethmac {
++	pinctrl-0 = <&eth_pins>;
++	pinctrl-names = "default";
++
++	phy-handle = <&external_phy>;
++
++	amlogic,tx-delay-ns = <2>;
++
++	phy-mode = "rgmii";
++};
++
++&external_mdio {
++	external_phy: ethernet-phy@0 {
++		/* Realtek RTL8211F (0x001cc916) */
++		reg = <0>;
++		max-speed = <1000>;
++
++		reset-assert-us = <10000>;
++		reset-deassert-us = <80000>;
++		reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>;
++
++		interrupt-parent = <&gpio_intc>;
++		/* MAC_INTR on GPIOZ_15 */
++		interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
++	};
++};
++
++&ir {
++	linux,rc-map-name = "rc-mecool-kiii-pro";
++};
++
++&sd_emmc_a {
++	brcmf: wifi@1 {
++		reg = <1>;
++		compatible = "brcm,bcm4329-fmac";
++	};
++};
++
++&uart_A {
++	status = "okay";
++	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
++	pinctrl-names = "default";
++	uart-has-rtscts;
++
++	bluetooth {
++		compatible = "brcm,bcm43438-bt";
++		shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>;
++		max-speed = <2000000>;
++		clocks = <&wifi32k>;
++		clock-names = "lpo";
++	};
++};
+-- 
+2.17.1
+

projects/Amlogic/patches/linux/amlogic-0088-arm64-dts-meson-add-multiple-MeCool-device-trees.patch

@@ -1,7 +1,7 @@
-From 8d9cf6d03007568c751d4fac9ca1f83a3e54b534 Mon Sep 17 00:00:00 2001
+From 67b08c3ffacee708e8f2f08f8c42c7021c9cd6f3 Mon Sep 17 00:00:00 2001
 From: Christian Hewitt <christianshewitt@gmail.com>
 Date: Mon, 21 Oct 2019 03:58:06 +0000
-Subject: [PATCH 77/78] arm64: dts: meson: add multiple MeCool device trees
+Subject: [PATCH 88/88] arm64: dts: meson: add multiple MeCool device trees
 
 This adds initial device trees for a range of MeCool devices based on various
 Amlogic GXBB, GXL and GXM reference designs. The current purpose is to allow
@@ -10,25 +10,21 @@ prepares for the addition of DVB support in the future.
 
 Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
 ---
- arch/arm64/boot/dts/amlogic/Makefile          |  7 ++++
+ arch/arm64/boot/dts/amlogic/Makefile          |  5 +++
  .../dts/amlogic/meson-gxbb-mecool-ki-plus.dts | 34 +++++++++++++++++++
  .../dts/amlogic/meson-gxbb-mecool-kii-pro.dts | 34 +++++++++++++++++++
  .../meson-gxl-s905d-mecool-ki-plus.dts        | 21 ++++++++++++
  .../amlogic/meson-gxl-s905d-mecool-ki-pro.dts | 16 +++++++++
- .../meson-gxl-s905d-mecool-kii-pro.dts        | 16 +++++++++
  .../meson-gxl-s905d-mecool-m8s-plus.dts       | 16 +++++++++
- .../dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 21 ++++++++++++
- 8 files changed, 165 insertions(+)
+ 6 files changed, 126 insertions(+)
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
- create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index 7d8586c718a1..3e72b2ad3a2d 100644
+index 82265e80cbe2..3e72b2ad3a2d 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
 @@ -13,6 +13,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb
@@ -40,28 +36,20 @@ index 7d8586c718a1..3e72b2ad3a2d 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
-@@ -30,6 +32,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
+@@ -30,7 +32,10 @@ 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
 +dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-plus.dtb
 +dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-pro.dtb
-+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb
+ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb
 +dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-m8s-plus.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb
-@@ -39,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb
-+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxm-minix-neo-u9h.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
- dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
 new file mode 100644
-index 000000000000..0c27f7e67d5a
+index 000000000000..cb422633a8f9
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-ki-plus.dts
 @@ -0,0 +1,34 @@
@@ -74,7 +62,7 @@ index 000000000000..0c27f7e67d5a
 +#include "meson-gxbb-p201.dts"
 +
 +/ {
-+	compatible = "mecool,gxbb-ki-plus", "amlogic,meson-gxbb";
++	compatible = "videostrong,gxbb-ki-plus", "amlogic,meson-gxbb";
 +	model = "MeCool KI Plus";
 +
 +	clock: meson_clock {
@@ -101,7 +89,7 @@ index 000000000000..0c27f7e67d5a
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
 new file mode 100644
-index 000000000000..83bd0204b153
+index 000000000000..0dbcf0f7dbd9
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-mecool-kii-pro.dts
 @@ -0,0 +1,34 @@
@@ -114,7 +102,7 @@ index 000000000000..83bd0204b153
 +#include "meson-gxbb-p201.dts"
 +
 +/ {
-+	compatible = "mecool,gxbb-kii-pro", "amlogic,meson-gxbb";
++	compatible = "videostrong,gxbb-kii-pro", "amlogic,meson-gxbb";
 +	model = "MeCool KII Pro";
 +
 +	clock: meson_clock {
@@ -141,7 +129,7 @@ index 000000000000..83bd0204b153
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
 new file mode 100644
-index 000000000000..7369c4111c43
+index 000000000000..b4aed5d0dbdf
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-plus.dts
 @@ -0,0 +1,21 @@
@@ -154,7 +142,7 @@ index 000000000000..7369c4111c43
 +#include "meson-gxl-s905d-p231.dts"
 +
 +/ {
-+	compatible = "mecool,ki-plus", "amlogic,s905d", "amlogic,meson-gxl";
++	compatible = "videostrong,gxl-ki-plus", "amlogic,s905d", "amlogic,meson-gxl";
 +	model = "MeCool KI Plus";
 +
 +	memory@0 {
@@ -168,7 +156,7 @@ index 000000000000..7369c4111c43
 +};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
 new file mode 100644
-index 000000000000..65e1a738a563
+index 000000000000..af695620728c
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-ki-pro.dts
 @@ -0,0 +1,16 @@
@@ -181,38 +169,16 @@ index 000000000000..65e1a738a563
 +#include "meson-gxl-s905d-p230.dts"
 +
 +/ {
-+	compatible = "mecool,ki-pro", "amlogic,s905d", "amlogic,meson-gxl";
++	compatible = "videostrong,gxl-ki-pro", "amlogic,s905d", "amlogic,meson-gxl";
 +	model = "MeCool KI Pro";
 +};
 +
 +&ir {
 +	linux,rc-map-name = "rc-mecool-ki-pro";
 +};
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
-new file mode 100644
-index 000000000000..2605d6eb6ca5
---- /dev/null
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-kii-pro.dts
-@@ -0,0 +1,16 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+
-+/*
-+ * Author: Christian Hewitt <christianshewitt@gmail.com>
-+ */
-+
-+#include "meson-gxl-s905d-p231.dts"
-+
-+/ {
-+	compatible = "mecool,kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
-+	model = "MeCool KII Pro";
-+};
-+
-+&ir {
-+	linux,rc-map-name = "rc-mecool-kii-pro";
-+};
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
 new file mode 100644
-index 000000000000..ac9f4ad205ac
+index 000000000000..3ddcf59d2649
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts
 @@ -0,0 +1,16 @@
@@ -225,40 +191,13 @@ index 000000000000..ac9f4ad205ac
 +#include "meson-gxl-s905d-p231.dts"
 +
 +/ {
-+	compatible = "mecool,kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
++	compatible = "videostrong,gxl-kii-pro", "amlogic,s905d", "amlogic,meson-gxl";
 +	model = "MeCool M8S Plus";
 +};
 +
 +&ir {
 +	linux,rc-map-name = "rc-mecool-m8s-plus";
 +};
-diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
-new file mode 100644
-index 000000000000..ca0ac6bc52ad
---- /dev/null
-+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts
-@@ -0,0 +1,21 @@
-+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-+
-+/*
-+ * Author: Christian Hewitt <christianshewitt@gmail.com>
-+ */
-+
-+#include "meson-gxm-q200.dts"
-+
-+/ {
-+	compatible = "mecool,gxm-kiii-pro", "amlogic,s912", "amlogic,meson-gxm";
-+	model = "MeCool KIII Pro";
-+
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0x0 0x0 0x0 0xC0000000>;
-+	};
-+};
-+
-+&ir {
-+	linux,rc-map-name = "rc-mecool-kiii-pro";
-+};
 -- 
 2.17.1