diff --git a/packages/linux/package.mk b/packages/linux/package.mk index ce0aaf1582..71dc6b5136 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="7d54cb2c26dad1264ecca85992bfe8984df4b7b5" # 6.1.14 - PKG_SHA256="76f039741d61e06c740b846291e5017b97da7d3f91fb2f368230a161d46905a6" + PKG_VERSION="7163dc197f14f1360506d97814fef17a51673293" # 6.1.36 + PKG_SHA256="18f6a5e57cb2ca021e500680784e757c9985a63f6301f2bea32ea5ebee8edaf0" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 4a8da94498..74ebd01acc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From 6142085e9460414a2fc7f51f0a52afea5eaf0923 Mon Sep 17 00:00:00 2001 +From c5478965aad09d2ebc682438e5474f7606e06eb2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 001/119] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 001/120] LOCAL: set meson-gx cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index fa6cff4a2ebc..5ee7640fad06 100644 +index 80d86780cb6b..7f20b90e11da 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -58,7 +58,7 @@ secmon_reserved_bl32: secmon@5300000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch index 6c80208d35..e919d19953 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From c0df9052aeb8d47bc2a18e0873b20fb68b54321a Mon Sep 17 00:00:00 2001 +From f442bde4d5400279042a90b8af49e4631eac3133 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 002/119] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 002/120] LOCAL: set meson-g12 cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 894cea697550..8be0381cd419 100644 +index 131a8a5a9f5a..d2b6fa8034ea 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -116,7 +116,7 @@ secmon_reserved_bl32: secmon@5300000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch index 49e9890c83..b8437d85d4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From 980967e34f6463f7b8dc3d37e7a255abb4950dfc Mon Sep 17 00:00:00 2001 +From 79decc6d434e12c4bb2fc6c88073ab210bc8c8cb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 003/119] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 003/120] LOCAL: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index 2e0a3782aa..da89855fd1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,7 +1,7 @@ -From 6ef4c65b5e4796e163beb7241cdb0b5d2c7698de Mon Sep 17 00:00:00 2001 +From 4430a4f8e570fc70b2053fc4970758bc0976fda9 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 004/119] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 004/120] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend The Amlogic Meson GX SoCs uses a non-standard argument to the PSCI CPU_SUSPEND call to enter system suspend. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch index 8eead0cde1..3eade2ab65 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch @@ -1,7 +1,7 @@ -From 2712b6a5207c3bdff9612c9938ee0d97a683e007 Mon Sep 17 00:00:00 2001 +From dbe7af745c89a0824b90c8f0dcf9bb4cc0f48d4c Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 005/119] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 005/120] LOCAL: arm64: dts: meson: add support for GX PM and Virtual RTC Signed-off-by: Neil Armstrong @@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong 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 5ee7640fad06..b8e43b406cec 100644 +index 7f20b90e11da..f39de6ead2fb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -221,6 +221,10 @@ sm: secure-monitor { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 94fe062c67..91295503bf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 694b9b83d3442791ee6d6c01868d04357bc9b782 Mon Sep 17 00:00:00 2001 +From 08655d3530269d8c17410a6dc3fde69e9c23fe2f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 006/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 006/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index d4a8488c0c..f0717cab55 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 70d3c7b8d66da08a0deef1c99657ed822b7131b0 Mon Sep 17 00:00:00 2001 +From 35731fd9e4a198dbd96911828de0270f7f7fcfe9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 007/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 007/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 3f5512a399..1a1eab50af 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From a2df580982a2c364aa35da82aa66feddf2e56f36 Mon Sep 17 00:00:00 2001 +From 54396343f2c349acae2c8c31fd07719f3f71577f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 008/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 008/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch index ce68e41167..48beb80f41 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch @@ -1,7 +1,7 @@ -From 86032671e6f5efd8eac2ba503c50b10f538e2c52 Mon Sep 17 00:00:00 2001 +From 6f81de193a1d33648341c8d3a702a070dc71c133 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 009/119] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 +Subject: [PATCH 009/120] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 848e870e0d..f57591283e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -1,7 +1,7 @@ -From 95087f3fd82785ef72de4dc4ab3364a76ecbfdf4 Mon Sep 17 00:00:00 2001 +From 6101cde6d49a5d6c4ed4535131dbce78f3523eb9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 010/119] LOCAL: usb: hub: disable autosuspend for Genesys +Subject: [PATCH 010/120] LOCAL: usb: hub: disable autosuspend for Genesys Logic Hubs Disable autosuspend in Genesys Logic hubs to allow USB devices on the @@ -17,10 +17,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0aaaadb02cc6..1ca434aed00b 100644 +index 1abe43ddb75f..7889811e5516 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5800,7 +5800,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5799,7 +5799,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch index dcb7a837d3..b046c64bd3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch @@ -1,7 +1,7 @@ -From 9742de1efcdbf512e3ee5671e0b5d4b7b2dde9d1 Mon Sep 17 00:00:00 2001 +From 012c3d681e1370c701cc666027871817bfc0ec6d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Sep 2021 05:00:45 +0000 -Subject: [PATCH 011/119] LOCAL: of: partial revert of fdt.c changes +Subject: [PATCH 011/120] LOCAL: of: partial revert of fdt.c changes This resolves reports similar to the below which are present in dmesg since Linux 5.10; which are also causing crashes in some distros: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch index d443b7f661..6a8a2f3aac 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch @@ -1,7 +1,7 @@ -From ebc9244e10d017655e8df41d0f7f12da5a90fb9a Mon Sep 17 00:00:00 2001 +From 8f94ff5bdfe66ddbaafd35beb20b77fd3a1790f8 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Mon, 13 Feb 2023 10:32:09 +0100 -Subject: [PATCH 058/119] FROMLIST(v2): drm/meson/meson_venc: Relax the +Subject: [PATCH 012/120] FROMGIT(FIXES): drm/meson/meson_venc: Relax the supported mode checks Relax a bit the supported modes list by including also 480x1920 and diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch deleted file mode 100644 index f7cdca579b..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 04e35d23966417d7feea63379cfa97734e88882c Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 19 Jan 2023 05:03:53 +0000 -Subject: [PATCH 013/119] FROMGIT(6.3): arm64: dts: meson: remove CPU opps - below 1GHz for G12A boards - -Amlogic G12A devices experience CPU stalls and random board wedges when -the system idles and CPU cores clock down to lower opp points. Recent -vendor kernels include a change to remove 100-250MHz and other distro -sources also remove the 500/667MHz points. Unless all 100-667Mhz opps -are removed or the CPU governor forced to performance stalls are still -observed, so let's remove them to improve stability and uptime. - -Fixes: b190056fa9ee ("arm64: dts: meson-g12a: add cpus OPP table") -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -index fb0ab27d1f64..6eaceb717d61 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -@@ -57,26 +57,6 @@ cpu_opp_table: opp-table { - 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>; -- }; -- -- opp-667000000 { -- opp-hz = /bits/ 64 <666666666>; -- opp-microvolt = <731000>; -- }; -- - opp-1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt = <731000>; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch index 412ee8dbf7..d9742dba27 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch @@ -1,7 +1,7 @@ -From 933161dcf2708d0d8765f0134d6cf08f0634737f Mon Sep 17 00:00:00 2001 +From df013bc124b5814849cf5d4d97027432752d976d Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 4 Jan 2023 15:19:06 +0000 -Subject: [PATCH 012/119] FROMGIT(6.2): Revert "arm64: dts: +Subject: [PATCH 014/120] FROMGIT(6.2): Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0" This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930. @@ -17,10 +17,10 @@ Signed-off-by: Pierre-Olivier Mercier 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index e3486f60645a..a1f0c38ccadd 100644 +index 3d642d739c35..74088e7280fe 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -131,10 +131,6 @@ flash@0 { +@@ -139,10 +139,6 @@ flash@0 { }; &usb { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch index 457910fb04..1093f79244 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch @@ -1,7 +1,7 @@ -From dbc56924b4ef2ef4929dbbd3a71dd5f9c587cb56 Mon Sep 17 00:00:00 2001 +From bc574310bb7aad62c46aeee3a7e590df1f5ae0e7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:50:01 +0000 -Subject: [PATCH 014/119] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to +Subject: [PATCH 015/120] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to P212 dtsi The P212 has a combined WiFi/BT module. The BT side is already enabled diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch index cdfe5c9a29..cd9b564713 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch @@ -1,7 +1,7 @@ -From 734fe8a9758c83353f4e87d92217fe3f0c94a773 Mon Sep 17 00:00:00 2001 +From 127106564fbef4f111b65f556affddef25d73764 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:56:12 +0000 -Subject: [PATCH 015/119] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in +Subject: [PATCH 016/120] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in P212 dtsi Cosmetic-only change to alpha-sort the pwm_ef node. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch index fcd4482aca..bd0fddd8d9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch @@ -1,7 +1,7 @@ -From 687aa721901391c0d26b6f11b164963881cccde0 Mon Sep 17 00:00:00 2001 +From 0097b59b870692e148373b4fe171b227295d296b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:58:58 +0000 -Subject: [PATCH 016/119] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes +Subject: [PATCH 017/120] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch index 6fbb2ada58..6a18442973 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch @@ -1,7 +1,7 @@ -From 5b1f67e6014292c83505302f67d7f0d1ebd8a93f Mon Sep 17 00:00:00 2001 +From da97eaeea4e9583bee58cc05afc29462a7d42403 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 04:30:44 +0000 -Subject: [PATCH 017/119] FROMGIT(6.3): arm64: dts: meson: add audio playback +Subject: [PATCH 018/120] FROMGIT(6.3): arm64: dts: meson: add audio playback to S905X-P212 dts Add support for the HDMI and Analogue i2s audio outputs. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch index 34bb62d480..857e303195 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch @@ -1,7 +1,7 @@ -From 2650a26be4c5432a8263096f2a89a5d10d270154 Mon Sep 17 00:00:00 2001 +From 6dafa687717b7d33cdecbc0494cca51f5b754251 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:03:14 +0000 -Subject: [PATCH 018/119] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add +Subject: [PATCH 019/120] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add missing NNA reset Doesn't appear in the TRM I have, but it is used by the downstream diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch index 5a1daa1fc6..130cd2918d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 3d021e127ccda3f91708b37f14ad3ea1da299d1e Mon Sep 17 00:00:00 2001 +From 7327250ae9d136ee318b4f9d0537b965df324111 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:02 +0000 -Subject: [PATCH 019/119] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power +Subject: [PATCH 020/120] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power domain Add define for the NNA power domain for the NPU in the G12A. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch index 73eb4319c3..a2eb049521 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 0e9313ae8e525d1d811e35a778fc17cf590661f7 Mon Sep 17 00:00:00 2001 +From 17a33be46d9bf9f977855c631a6303c99abd002e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:51 +0000 -Subject: [PATCH 020/119] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power +Subject: [PATCH 021/120] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power domain for A311D Based on power initialization sequence in downstream driver. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch index f1b9875280..9b60cd58e9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch @@ -1,7 +1,7 @@ -From fe1c33c1c209927e3cf08485eba3498275dccc32 Mon Sep 17 00:00:00 2001 +From f34fad413355b9fb666b61cc9e8df7156bbbb7b6 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:05:46 +0000 -Subject: [PATCH 021/119] FROMGIT(6.3): arm64: dts: Add DT node for the +Subject: [PATCH 022/120] FROMGIT(6.3): arm64: dts: Add DT node for the VIPNano-QI on the A311D This "NPU" is very similar to the Vivante GPUs and Etnaviv works well @@ -15,7 +15,7 @@ Reviewed-by: Neil Armstrong 2 files changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 8be0381cd419..146610cbf05e 100644 +index d2b6fa8034ea..c90066823250 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,6 +11,7 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch index c32a7ac33d..fdae267884 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch @@ -1,7 +1,7 @@ -From 88b256191bb62756826193b5b8cce03f046bd946 Mon Sep 17 00:00:00 2001 +From 32817c57b6cc75595d60ea68ccc0c7c767d46898 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:01:47 +0000 -Subject: [PATCH 022/119] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip +Subject: [PATCH 023/120] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip feature struct We will use these for differentiating between GPUs and NPUs, as the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch index 556d3fe37f..e7fb624bf3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch @@ -1,7 +1,7 @@ -From 6bc70bd7f8321a13dab880378d239c813a6c74c1 Mon Sep 17 00:00:00 2001 +From b3155f8944de71787491aa1cedbf079939539de7 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:02:31 +0000 -Subject: [PATCH 023/119] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs +Subject: [PATCH 024/120] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs Userspace is still not making full use of the hardware, so we don't know yet if changes to the UAPI won't be needed. Warn about it. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch index 479a05c455..88f127be8f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch @@ -1,7 +1,7 @@ -From 726e813f6501345007ebca68891fd137945b8a88 Mon Sep 17 00:00:00 2001 +From 3e9c8855643486b4f793bd13fbfc759058524062 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:03:16 +0000 -Subject: [PATCH 024/119] FROMGIT(6.3): drm/etnaviv: add HWDB entry for +Subject: [PATCH 025/120] FROMGIT(6.3): drm/etnaviv: add HWDB entry for VIPNano-QI.7120.0055 This is a compute-only module marketed towards AI and vision diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch index 5286242275..e0a937863b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch @@ -1,7 +1,7 @@ -From b314d9f65e9d729c33229230c61a6d7ca05d67ab Mon Sep 17 00:00:00 2001 +From 2a3a6c002d0055ae280e94bdcff00088c60e56a6 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:04:00 +0000 -Subject: [PATCH 025/119] FROMGIT(6.3): arm64: dts: Fix NPU power domain +Subject: [PATCH 026/120] FROMGIT(6.3): arm64: dts: Fix NPU power domain references in Amlogic G12-based SoCs The power sequence is different between SoCs in that family, so get the @@ -15,7 +15,7 @@ Signed-off-by: Tomeu Vizoso 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 146610cbf05e..749d5b3e3554 100644 +index c90066823250..bb2e86073261 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,7 +11,6 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch index 9f181383d1..7a1dcc49e2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch @@ -1,7 +1,7 @@ -From feb3f7acd48af99a6a3cc3e247f1ee39dd8c0727 Mon Sep 17 00:00:00 2001 +From 3a1d65dcdcdd2201dacf97eb5394bec9f4677297 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:41:46 +0000 -Subject: [PATCH 026/119] FROMGIT(6.3): clk: meson: mpll: Switch from +Subject: [PATCH 027/120] FROMGIT(6.3): clk: meson: mpll: Switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch index af27f4ff86..c12bebe505 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch @@ -1,7 +1,7 @@ -From d446faa2fd433dcdddf9bb3c6903fb41f21cc7de Mon Sep 17 00:00:00 2001 +From 6239c914d58c0517ccc5f1386918da94c03c2508 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:42:41 +0000 -Subject: [PATCH 027/119] FROMGIT(6.3): clk: meson: dualdiv: switch from +Subject: [PATCH 028/120] FROMGIT(6.3): clk: meson: dualdiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch index 425850cd96..eb9be382a1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch @@ -1,7 +1,7 @@ -From b25c8b76c5c500741e1bae5be92f40af8302646f Mon Sep 17 00:00:00 2001 +From 450b9f39897989b1f1f9c1efe5a07417d7ef04cf Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:43:33 +0000 -Subject: [PATCH 028/119] FROMGIT(6.3): clk: meson: sclk-div: switch from +Subject: [PATCH 029/120] FROMGIT(6.3): clk: meson: sclk-div: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch deleted file mode 100644 index 7ea47d5817..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 827db0a8686d83ae15ba6a60c219c9ca7a91a599 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Tue, 24 Jan 2023 12:39:08 +0100 -Subject: [PATCH 030/119] FROMGIT(6.3): arm64: dts: amlogic: - meson-sm1-odroid-hc4: fix active fan thermal trip - -Add an active trip tied to the on-board fan cooling device, which is better -than describing it along the passive cooling maps. - -Fixes: 33b14f663df8 ("arm64: dts: meson: add initial device-tree for ODROID-HC4") -Reported-by: Ricardo Pardini -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index a1f0c38ccadd..74088e7280fe 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -76,9 +76,17 @@ sound { - }; - - &cpu_thermal { -+ trips { -+ cpu_active: cpu-active { -+ temperature = <60000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "active"; -+ }; -+ }; -+ - cooling-maps { - map { -- trip = <&cpu_passive>; -+ trip = <&cpu_active>; - cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch index ddf522e1d2..00df92b688 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch @@ -1,7 +1,7 @@ -From b3173d4cbebb7494013b2471869f61aa7c50523b Mon Sep 17 00:00:00 2001 +From 900d5cb13f3c1b7ced0586497190be1ed96a4742 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:44:26 +0000 -Subject: [PATCH 029/119] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from +Subject: [PATCH 030/120] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch index 547976d0d7..a17b89a83e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch @@ -1,7 +1,7 @@ -From 6a563c7bffe748e52a415383f4fb9d1fcbf1caaa Mon Sep 17 00:00:00 2001 +From 6e28630c533846d7c79bb388a1cc1e13650e45b6 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 27 Nov 2021 07:23:35 +0000 -Subject: [PATCH 031/119] FROMGIT(6.3): arm64: dts: meson: make dts use +Subject: [PATCH 031/120] FROMGIT(6.3): arm64: dts: meson: make dts use gpio-fan matrix instead of array No functional changes. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch index 0f10888bfd..7ca713a61e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch @@ -1,7 +1,7 @@ -From fe8bd6ed716a8dee218e13d39eec3bf6df05f055 Mon Sep 17 00:00:00 2001 +From 67e3334c533941ed976a3d6390c4553a0a4bf660 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:10:48 +0000 -Subject: [PATCH 034/119] FROMGIT(6.3): arm64: dts: meson: +Subject: [PATCH 032/120] FROMGIT(6.3): arm64: dts: meson: meson-sm1-bananapi-m5: convert to dtsi Convert the BPI-M5 dts into meson-sm1-bananapi.dtsi to support the @@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index e8a23861013f..34b3238ee0a0 100644 +index 38ebe98ba9c6..34b3238ee0a0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts @@ -6,10 +6,7 @@ @@ -34,13 +34,13 @@ index e8a23861013f..34b3238ee0a0 100644 compatible = "bananapi,bpi-m5", "amlogic,sm1"; model = "Banana Pi BPI-M5"; -- adc_keys { +- adc-keys { - compatible = "adc-keys"; - io-channels = <&saradc 2>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - -- key { +- button-sw3 { - label = "SW3"; - linux,code = ; - press-threshold-microvolt = <1700000>; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch deleted file mode 100644 index 2b84e435ce..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 24cdc899972f989681b564140e1ac677cd0dc12a Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 26 Jan 2023 12:20:19 +0000 -Subject: [PATCH 032/119] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow - usb otg mode - -Setting dr_mode to "host" prevents otg which can be useful on a board -with limited connectivity options. So don't force host mode. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index e3bb6df42ff3..cf0a9be83fc4 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -401,5 +401,4 @@ &uart_AO { - - &usb { - status = "okay"; -- dr_mode = "host"; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch deleted file mode 100644 index 3a8e200faa..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d4acc14701de1429557af4e427e4e85131f12802 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 26 Jan 2023 16:15:59 +0000 -Subject: [PATCH 033/119] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch - VDDIO_C pin to OPEN_DRAIN - -For proper warm (re)boot from SD card the BPI-M5 board requires TFLASH_VDD_EN -and VDDIO_C pins to be switched to high impedance mode. This can be achieved -using OPEN_DRAIN instead of ACTIVE_HIGH to leave the GPIO pins in input mode -and retain high state (pin has the pull-up). - -This change is inspired by meson-sm1-odroid.dtsi where OPEN_DRAIN has been -used to resolve similar problems with the Odroid C4 board (TF_IO in the C4 -dts is the equivalent regulator). - -Fixes 976e920183e4 ("arm64: dts: meson-sm1: add Banana PI BPI-M5 board dts") -Suggested-by: Neil Armstrong -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index cadba194b149..e8a23861013f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -@@ -123,7 +123,7 @@ vddio_c: regulator-vddio_c { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - -- enable-gpio = <&gpio_ao GPIOE_2 GPIO_ACTIVE_HIGH>; -+ enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>; - enable-active-high; - regulator-always-on; - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch new file mode 100644 index 0000000000..e93629e142 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -0,0 +1,28 @@ +From 654df5af5a8feddbb6407c100061a1412a5f8238 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 25 Jan 2023 09:28:27 +0000 +Subject: [PATCH 033/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support + for BananaPi M2-Pro + +BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset. + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index 9fda2436c618..d63f6b899f25 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -175,6 +175,7 @@ properties: + - enum: + - amediatech,x96-air + - amediatech,x96-air-gbit ++ - bananapi,bpi-m2-pro + - bananapi,bpi-m5 + - cyx,a95xf3-air + - cyx,a95xf3-air-gbit +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch index 854dd547a7..57cbcec449 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch @@ -1,7 +1,7 @@ -From 8a627052d2914e54417e93d22900d3546d116e3a Mon Sep 17 00:00:00 2001 +From 2c38c04f66a209ef843a74c47d5ad55049a45fee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:13:28 +0000 -Subject: [PATCH 036/119] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 034/120] FROMGIT(6.3): arm64: dts: meson: add support for BananaPi M2-Pro BPI-M2-PRO is based upon the BPI-M5 design except for a different diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch index 739bd2f779..54918f9aaa 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -1,28 +1,30 @@ -From 84ce435b0892826680ab99807b7e086c8b5569f5 Mon Sep 17 00:00:00 2001 +From b71a8761891cdca7af133b91aaef4f485e7542b3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Wed, 25 Jan 2023 09:28:27 +0000 -Subject: [PATCH 035/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support - for BananaPi M2-Pro +Date: Wed, 16 Feb 2022 07:27:07 +0000 +Subject: [PATCH 035/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support + for Radxa Zero2 -BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset. +The Radxa Zero2 is a small form-factor SBC using the Amlogic +A311D chip. Signed-off-by: Christian Hewitt +Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 9fda2436c618..d63f6b899f25 100644 +index d63f6b899f25..7ded40b309a4 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -175,6 +175,7 @@ properties: +@@ -154,6 +154,7 @@ properties: + items: - enum: - - amediatech,x96-air - - amediatech,x96-air-gbit -+ - bananapi,bpi-m2-pro - - bananapi,bpi-m5 - - cyx,a95xf3-air - - cyx,a95xf3-air-gbit + - khadas,vim3 ++ - radxa,zero2 + - const: amlogic,a311d + - const: amlogic,g12b + -- 2.34.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch index 13aa301c17..ebe526745e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch @@ -1,7 +1,7 @@ -From 158ba8f7ed4d4e6e774df5a400bdc63c70db384e Mon Sep 17 00:00:00 2001 +From 263e11fb9680d32705f0980569dc32a412818488 Mon Sep 17 00:00:00 2001 From: Yuntian Zhang Date: Fri, 14 Jan 2022 15:50:02 +0000 -Subject: [PATCH 038/119] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 036/120] FROMGIT(6.3): arm64: dts: meson: add support for Radxa Zero2 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch deleted file mode 100644 index bcff764519..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7fa5cf2ed6c65f2071fcf92d5e1ede56322154f6 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 16 Feb 2022 07:27:07 +0000 -Subject: [PATCH 037/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support - for Radxa Zero2 - -The Radxa Zero2 is a small form-factor SBC using the Amlogic -A311D chip. - -Signed-off-by: Christian Hewitt -Acked-by: Krzysztof Kozlowski ---- - Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index d63f6b899f25..7ded40b309a4 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -154,6 +154,7 @@ properties: - items: - - enum: - - khadas,vim3 -+ - radxa,zero2 - - const: amlogic,a311d - - const: amlogic,g12b - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch index 4753aa2dfa..e71914115b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch @@ -1,7 +1,7 @@ -From 29d379e87a02cecbe4213618c2a66d1a03768d02 Mon Sep 17 00:00:00 2001 +From be94b9629bc355647bda972f92e0887d3a94c17f Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:15 +0100 -Subject: [PATCH 039/119] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio +Subject: [PATCH 037/120] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio multiplexer Add documentation for the MDIO bus multiplexer found on the Amlogic GXL diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch index 1f235647b4..ce672e6d80 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch @@ -1,7 +1,7 @@ -From 3fa339d30ff897466809b54738aef7b0884f1b54 Mon Sep 17 00:00:00 2001 +From 7246aabe2dcaced67c24646712e930e931177c71 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:16 +0100 -Subject: [PATCH 040/119] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux +Subject: [PATCH 038/120] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux support Add support for the mdio mux and internal phy glue of the GXL SoC diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch index 6c1fd29a50..aff142305b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch @@ -1,7 +1,7 @@ -From 90b6d6340680523ec3b0390d182f058fe4cfd272 Mon Sep 17 00:00:00 2001 +From 3f94f73ae5c31ac0c009e2867a25077cd63df251 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 12 Feb 2023 22:43:32 +0100 -Subject: [PATCH 041/119] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd +Subject: [PATCH 039/120] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd MMC core only checks whether return value of .get_cd() equals zero. Therefore -ENOSYS and 1 are effectively the same and the function diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch index a19f5a050f..5c38ed15d2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch @@ -1,7 +1,7 @@ -From c0fa86921daa596b83cd24ca6ee9d832d3f62f55 Mon Sep 17 00:00:00 2001 +From 5142ba301edc43cc70ca708aafa84cf1b2b32feb Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Thu, 15 Jul 2021 14:32:33 -0400 -Subject: [PATCH 050/119] FROMLIST(v1): media: meson: vdec: remove redundant if +Subject: [PATCH 040/120] FROMGIT(6.4): media: meson: vdec: remove redundant if statement Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch index fe57dbe615..ceae1dd7e4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch @@ -1,7 +1,7 @@ -From a504e22a654a64c4920b96446f74c5d007140329 Mon Sep 17 00:00:00 2001 +From 1b5d94d6c98f76a33fcc98f09a9e2c414cb6c4ee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Feb 2023 08:53:39 +0000 -Subject: [PATCH 054/119] FROMLIST(v2): dt-bindings: media: rc: add rc-dreambox +Subject: [PATCH 041/120] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox binding Add a binding for the rc-dreambox remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch index ad134a3602..61e20e146c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch @@ -1,7 +1,7 @@ -From d978b4f1de65c75d27f09e370054946b600eb091 Mon Sep 17 00:00:00 2001 +From c86408e487a66dc5664c3002da54478eb103228c Mon Sep 17 00:00:00 2001 From: Emanuel Strobel Date: Mon, 5 Apr 2021 17:57:57 +0000 -Subject: [PATCH 055/119] FROMLIST(v2): media: rc: add common keymap for +Subject: [PATCH 042/120] FROMGIT(6.4): media: rc: add common keymap for Dreambox RC10/RC0 and RC20/RC-BT remotes Add a common keymap for the RC10/RC0 and RC20/RC-BT remotes used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch deleted file mode 100644 index d707628951..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ec6df411382a6b218aed3dc3f3247c88d6f533da Mon Sep 17 00:00:00 2001 -From: Sergey Shtylyov -Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 042/119] FROMLIST(v1): mmc: meson-gx: fix deferred probing - -The driver overrides the error codes and IRQ0 returned by platform_get_irq() -to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe -permanently instead of the deferred probing. Switch to propagating the error -codes upstream. IRQ0 is no longer returned by platform_get_irq(), so we now -can safely ignore it... - -Fixes: cbcaac6d7dd2 ("mmc: meson-gx-mmc: Fix platform_get_irq's error checking") -Signed-off-by: Sergey Shtylyov -Reviewed-by: Martin Blumenstingl ---- - drivers/mmc/host/meson-gx-mmc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index a1051a853f91..ab504c938448 100644 ---- a/drivers/mmc/host/meson-gx-mmc.c -+++ b/drivers/mmc/host/meson-gx-mmc.c -@@ -1219,8 +1219,8 @@ static int meson_mmc_probe(struct platform_device *pdev) - } - - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto free_host; - } - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch index b6abab4e97..e4caef3849 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch @@ -1,7 +1,7 @@ -From 89bf0cf980d400a58d5fb12f0cb23af6c00e0415 Mon Sep 17 00:00:00 2001 +From b2ab233ef1556f2e210c6fe88ea7fca11b52092c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Feb 2023 06:42:20 +0000 -Subject: [PATCH 056/119] FROMLIST(v2): dt-bindings: media: rc: add +Subject: [PATCH 043/120] FROMGIT(6.4): dt-bindings: media: rc: add rc-beelink-mxiii Add a binding for the rc-beelink-mxiii remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch index c887828deb..fc1bbe58f1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch @@ -1,7 +1,7 @@ -From 39794f188cf5778a6b84517d95c50e830d9d89ba Mon Sep 17 00:00:00 2001 +From 428bfd6a70cdf2dba7e39568e2cb5a3c283c0bb6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:33:47 +0000 -Subject: [PATCH 057/119] FROMLIST(v2): media: rc: add Beelink Mini MXIII +Subject: [PATCH 044/120] FROMGIT(6.4): media: rc: add Beelink Mini MXIII keymap Add a keymap for the simple IR (NEC) remote used with the Beelink diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch similarity index 80% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch index 68348724b4..350fb64cb4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch @@ -1,7 +1,7 @@ -From 5ecde6b3e72b51715d366c5f2a63b4161aab4ac8 Mon Sep 17 00:00:00 2001 +From 5c659c53668a1a8dbe101959142bb9e468a7cd87 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:16:12 +0000 -Subject: [PATCH 059/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: sort +Subject: [PATCH 045/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Alpha-sort the nodes, move the default line in the LED node to where it's @@ -11,14 +11,14 @@ Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong --- - .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 32 ++++++++----------- - 1 file changed, 14 insertions(+), 18 deletions(-) + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 31 ++++++++----------- + 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 6d8cc00fedc7..9bfdb54d912a 100644 +index 5f2d4317ecfb..73ad0f5110f3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -6,21 +6,22 @@ +@@ -6,10 +6,10 @@ /dts-v1/; #include "meson-gxbb-p20x.dtsi" @@ -30,11 +30,9 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; - - leds { +@@ -18,9 +18,9 @@ leds { compatible = "gpio-leds"; -+ - status { + led { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = ; @@ -43,13 +41,13 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 }; }; -@@ -34,24 +35,8 @@ button-reset { +@@ -34,24 +34,8 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - --}; -- + }; + - - -&uart_A { @@ -61,14 +59,14 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 - bluetooth { - compatible = "brcm,bcm4335a0"; - }; - }; - +-}; +- - - ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; -@@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { +@@ -78,3 +62,14 @@ eth_phy0: ethernet-phy@0 { &ir { linux,rc-map-name = "rc-videostrong-kii-pro"; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch index d8fbda54a8..d6c8baa2f7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch @@ -1,7 +1,7 @@ -From 8e6a3584cedb7b625d698b08781ab96f7f515a9d Mon Sep 17 00:00:00 2001 +From eb1e3d228629c1946aef18c7337c5bc0e2694610 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:21:08 +0000 -Subject: [PATCH 060/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: +Subject: [PATCH 046/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Add missing content to the bluetooth node to align it with the content @@ -15,10 +15,10 @@ Reviewed-by: Neil Armstrong 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 9bfdb54d912a..435ae2aa404e 100644 +index 73ad0f5110f3..a800e8955c4a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -72,5 +72,10 @@ &uart_A { +@@ -71,5 +71,10 @@ &uart_A { bluetooth { compatible = "brcm,bcm4335a0"; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch index ed55affc7c..e5a299280d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch @@ -1,7 +1,7 @@ -From 26e09e684c37965401d31cacdc5f03912b84121b Mon Sep 17 00:00:00 2001 +From 52fdf527ce95b5c7347cde0f0105b3003a834ac8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:29:00 +0000 -Subject: [PATCH 061/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: add +Subject: [PATCH 047/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add initial audio support Add initial support for HDMI and S/PDIF audio output. @@ -14,7 +14,7 @@ Reviewed-by: Neil Armstrong 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 435ae2aa404e..a09340e9f73a 100644 +index a800e8955c4a..e238f1f10124 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -9,11 +9,19 @@ @@ -36,8 +36,8 @@ index 435ae2aa404e..a09340e9f73a 100644 + leds { compatible = "gpio-leds"; - -@@ -35,6 +43,58 @@ button-reset { + led { +@@ -34,6 +42,58 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch new file mode 100644 index 0000000000..38984711ac --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch @@ -0,0 +1,39 @@ +From dafb23b2d7961125dc39553fa6b2ffb1b892a8b5 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Fri, 3 Mar 2023 18:37:57 +0100 +Subject: [PATCH 048/120] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the + boards with the BPI-CM4 connected + +The BPI-CM4 module with an Amlogic A311D SoC is a module compatible +with the Raspberry Pi CM4 specifications. + +Document the boards using this module, by specifying the BananaPi CM4 +compatible in addition to the baseboard compatible. + +Signed-off-by: Neil Armstrong +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index 7ded40b309a4..94f68e7c85ed 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -158,6 +158,14 @@ properties: + - const: amlogic,a311d + - const: amlogic,g12b + ++ - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC ++ items: ++ - enum: ++ - bananapi,bpi-cm4io ++ - const: bananapi,bpi-cm4 ++ - const: amlogic,a311d ++ - const: amlogic,g12b ++ + - description: Boards with the Amlogic Meson G12B S922X SoC + items: + - enum: +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch new file mode 100644 index 0000000000..d5f4230f94 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch @@ -0,0 +1,610 @@ +From b76cd699a611d0fb168b6204489b8f2e41311b6b Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Sat, 4 Mar 2023 07:14:17 +0000 +Subject: [PATCH 049/120] FROMGIT(6.4): arm64: dts: amlogic: Add initial + support for BPI-CM4 module with BPI-CM4IO baseboard + +Add support for both the BananaPi BPI-CM4 module and the BananaPi +baseboard which is comnpatible with the RaspberryPi CM4IO baseboard. + +The BananaPi BPI-CM4 module follows the CM4 specifications at [1], +but with a single HDMI port and a since DSI output. + +The current CM4IO baseboard DT should work fine on the Raspberry CM4 +baseboard and other derivatives baseboards, but proper DT should +be written for other baseboards. + +The split is done so it's easy to describe a new CM4 baseboard, enabling +only the necessary HW used on the baseboard. + +[1] https://datasheets.raspberrypi.com/cm4io/cm4io-datasheet.pdf + +Signed-off-by: Neil Armstrong +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++ + .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 ++++++++++++++++++ + 3 files changed, 554 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index 5d5ec22a469e..f5845e565efb 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +new file mode 100644 +index 000000000000..1b0c3881c6a1 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +@@ -0,0 +1,165 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-bananapi-cm4.dtsi" ++#include ++#include ++#include ++ ++/ { ++ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module"; ++ ++ aliases { ++ ethernet0 = ðmac; ++ i2c0 = &i2c1; ++ i2c1 = &i2c3; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1710000>; ++ ++ button-function { ++ label = "Function"; ++ linux,code = ; ++ press-threshold-microvolt = <10000>; ++ }; ++ }; ++ ++ hdmi_connector: hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-CM4IO"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-4 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&cecb_AO { ++ status = "okay"; ++}; ++ ++ðmac { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++/* CSI port */ ++&i2c1 { ++ status = "okay"; ++}; ++ ++/* DSI port for touchscreen */ ++&i2c3 { ++ status = "okay"; ++}; ++ ++/* miniPCIe port with USB + SIM slot */ ++&pcie { ++ status = "okay"; ++}; ++ ++&sd_emmc_b { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++/* Peripheral Only USB-C port */ ++&usb { ++ dr_mode = "peripheral"; ++ ++ status = "okay"; ++}; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +new file mode 100644 +index 000000000000..dc0988c82694 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +@@ -0,0 +1,388 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++#include "meson-g12b-a311d.dtsi" ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ rtc1 = &vrtc; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ dc_in: regulator-dc-in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vddio_c: regulator-vddio-c { ++ compatible = "regulator-gpio"; ++ regulator-name = "VDDIO_C"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ ++ enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ ++ gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>; ++ gpios-states = <1>; ++ ++ states = <1800000 0>, ++ <3300000 1>; ++ }; ++ ++ vddao_1v8: regulator-vddao-1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_3v3: regulator-vddao-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ /* ++ * MP8756GD DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ /* ++ * SY8120B1ABC DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu100 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu101 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu102 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu103 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++/* Ethernet to be enabled in baseboard DT */ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++/* HDMI to be enabled in baseboard DT */ ++&hdmi_tx { ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&dc_in>; ++}; ++ ++/* "Camera" I2C bus */ ++&i2c1 { ++ pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* Main I2C bus */ ++&i2c2 { ++ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* "ID" I2C bus */ ++&i2c3 { ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pcie { ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++ ++ status = "okay"; ++}; ++ ++&pwm_ef { ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ ++ status = "okay"; ++}; ++ ++&saradc { ++ vref-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++/* on-module SDIO WiFi */ ++&sd_emmc_a { ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_3v3>; ++ ++ status = "okay"; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card to be enabled in baseboard DT */ ++&sd_emmc_b { ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* on-module eMMC */ ++&sd_emmc_c { ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++/* on-module UART BT */ ++&uart_A { ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&uart_AO { ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&usb { ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index 4254f9ceb6..729ee90649 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From 76869c873dc2fc0bb999a7f078a981b3cca8d79b Mon Sep 17 00:00:00 2001 +From 022946dc830b928d2361e87501c7fca8505d6910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Feb 2022 08:23:12 +0000 -Subject: [PATCH 043/119] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 051/120] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan Micro Electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index b244aa4f4e..8ffb8d24a7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From ea68b39d92eb6daeae900078a8d5fb884aa2aedb Mon Sep 17 00:00:00 2001 +From 94060333363a0241442deb5b993655188901840d Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 044/119] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan +Subject: [PATCH 052/120] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro Electronics TM1628 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 18a21689c2..ac8922c5be 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 9b520e8a8d6edbd7da36baed8a221f4abe110633 Mon Sep 17 00:00:00 2001 +From a53c2bef9b9f389914eb410e73b02b5099266708 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 045/119] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 053/120] FROMLIST(v5): docs: ABI: document tm1628 attribute display-text Document the attribute for reading / writing the text to be displayed on diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index 9de21f49c1..9cbc375b8c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 1f2f8f35ca011bbc72ef1292b1927aa002a34811 Mon Sep 17 00:00:00 2001 +From e64e545d0880e5617042ae8d28e60a455a689a78 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 046/119] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 054/120] FROMLIST(v5): auxdisplay: add support for Titanmec TM1628 7 segment display controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index b838f677b6..f00d6cb89a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From a8d66974c12c82d16e132e6bdbaf8bd309e2e8e0 Mon Sep 17 00:00:00 2001 +From 136c5d1f6275026217be5741df24816a3875e7a4 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 047/119] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: +Subject: [PATCH 055/120] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add support for the 7 segment display This patch adds support for the 7 segment display of the device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index d41ab379bf..44cec1ff07 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From 61450e18700a00f6fbf4194f2afa3238687c8044 Mon Sep 17 00:00:00 2001 +From fbc5936b6016a740768dcd2ac99be9691750e649 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 048/119] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 056/120] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index 1fbe5b5f8c..6162c22d72 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 24048a5997adb905190d42eb60c3b73118d860b1 Mon Sep 17 00:00:00 2001 +From fdcff6282a2fcb2afb2751c33f22ea245002b068 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 049/119] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 057/120] FROMLIST(v1): ASoC: hdmi-codec: reorder channel allocation list Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index c73b811bcb..ec0760fd70 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From 93eacecf63e1c2f0fe5abcaed4a78c2bebd24560 Mon Sep 17 00:00:00 2001 +From 89e62d3e8515a1f51b415b255b7200bdf8f1209d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 051/119] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 058/120] FROMLIST(v1): media: meson: vdec: esparser: check parsing state with hardware write pointer Also check the hardware write pointer to check if ES Parser has stalled. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index 46401fd8bb..be628e9038 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From 7c7cfd0c00e1037fc0226393ee509169893756f0 Mon Sep 17 00:00:00 2001 +From 88671c6347d92c258d84e6448d2f0590ed8766d4 Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 052/119] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 059/120] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index 304c3b6e06..b2f16add62 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 5033662952d289300d6ee76c17913abe3e5de47e Mon Sep 17 00:00:00 2001 +From bc74e7054ac07e488d17c25f7c30660fcff5fb4d Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 053/119] FROMLIST(v2): media: meson: vdec: add HEVC decode +Subject: [PATCH 060/120] FROMLIST(v2): media: meson: vdec: add HEVC decode codec Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch index 4434345693..a7a0d6be40 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch @@ -1,7 +1,7 @@ -From 4df952eb87fb849535fa3ce7b9b8c86e9c3d7e1a Mon Sep 17 00:00:00 2001 +From f9e1f4f9ae2a9390cc8bde8742f4454acc29ff0f Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:41:53 +0100 -Subject: [PATCH 062/119] FROMLIST(v2): dt-bindings: serial: +Subject: [PATCH 061/120] FROMLIST(v2): dt-bindings: serial: amlogic,meson-uart: Add compatible string for G12A Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch index 5d629e989f..1b9f041712 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch @@ -1,7 +1,7 @@ -From a795fe52d97a8792a94d8c1109f68984c89ed527 Mon Sep 17 00:00:00 2001 +From 6784e19cbe62900c5524fe8e2b5b6216f7fb2ae5 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:44:16 +0100 -Subject: [PATCH 063/119] FROMLIST(v2): tty: serial: meson: Add a new +Subject: [PATCH 062/120] FROMLIST(v2): tty: serial: meson: Add a new compatible string for the G12A SoC Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch index 9b5e43ada0..15a86382d4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch @@ -1,7 +1,7 @@ -From 0e9c49a97b49745c4de3ec41bd9f3eaf6755d71a Mon Sep 17 00:00:00 2001 +From 9bf0bf029cc3ddea57cab66ea49db0d69048ee99 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:47:16 +0100 -Subject: [PATCH 064/119] FROMLIST(v2): arm64: dts: meson-g12-common: Use the +Subject: [PATCH 063/120] FROMLIST(v2): arm64: dts: meson-g12-common: Use the G12A UART compatible string Switch meson-12-common.dtsi to use the Meson G12A specific UART @@ -18,7 +18,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 749d5b3e3554..977bfc1f1701 100644 +index bb2e86073261..ec78283d9a9e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2040,7 +2040,8 @@ pwm_AO_cd: pwm@2000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch index 9afb11be22..c24a8cc6a5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch @@ -1,7 +1,7 @@ -From f589d7cc58e31e96f58b80e516945e5f701b62a1 Mon Sep 17 00:00:00 2001 +From 866fcbd4b9f8e1f3502ab857a23a7a19f2d0ba9e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 065/119] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 064/120] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index 95d3de2bd5..73b8de0d2d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From 76d5200e280b14a0f50556b7b50371c13455dddc Mon Sep 17 00:00:00 2001 +From 705f27c026178c3cc9af1142fcbea2f686e034a5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 066/119] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 065/120] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to 100MHz Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index c866bac829..b9f1ed186d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From f1eb8cf980881ab603ec1fd257e5801d3b412032 Mon Sep 17 00:00:00 2001 +From fb0a50ba250cb8b6c328e32b5132f29a7ada0488 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 067/119] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 066/120] WIP: arm64: dts: meson: add UHS SDIO capabilities to p212/p23x/q20x Add UHS capabilities to the SDIO node to enable 100MHz speeds. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index 2fb631850a..45d7263372 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From bebad1696209039640521ca5649548d106d32eeb Mon Sep 17 00:00:00 2001 +From dac1058a8890451e943cd3dd82a04b23436928b2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 068/119] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 067/120] WIP: arm64: dts: meson: remove SDIO node from Khadas VIM1 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch index 81a2eac702..8bae5f8cde 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch @@ -1,7 +1,7 @@ -From 855a21c63c2b82230248a9bab6ba2865518a7bd5 Mon Sep 17 00:00:00 2001 +From 8aadc1cc8f6f3ff75b071c935e2f885fd735ba81 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 069/119] WIP: arm64: dts: meson: add audio playback to p201 +Subject: [PATCH 068/120] WIP: arm64: dts: meson: add audio playback to p201 Add initial audio support limited to HDMI i2s. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch index 4e85de3848..abc4c8e28e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch @@ -1,7 +1,7 @@ -From c6e8181b98c57349768ad232ee3557ce9b606c06 Mon Sep 17 00:00:00 2001 +From a44b679ac6004a5a9a3c28ed744e597df0c840b5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 070/119] WIP: arm64: dts: meson: add audio playback to p200 +Subject: [PATCH 069/120] WIP: arm64: dts: meson: add audio playback to p200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch index fc076d059c..297bf71efb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch @@ -1,7 +1,7 @@ -From fff41879355aba35bc6c674ca32a4f90408e7f98 Mon Sep 17 00:00:00 2001 +From 76dfcdd0088bbc374551c52759be7223f8752074 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 071/119] WIP: arm64: dts: meson: add audio playback to u200 +Subject: [PATCH 070/120] WIP: arm64: dts: meson: add audio playback to u200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch index 47805f64ac..41b746fcde 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch @@ -1,7 +1,7 @@ -From 6e49e1d60237acf467191c490b5fecb8536f7536 Mon Sep 17 00:00:00 2001 +From c60ca77b02dd6904ffbd5418138a5880a822b460 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Nov 2021 13:50:06 +0000 -Subject: [PATCH 072/119] WIP: arm64: dts: meson: add Headphone output to +Subject: [PATCH 071/120] WIP: arm64: dts: meson: add Headphone output to Beelink GT-King Add support for the Headphone audio DAC built-in to the S922X chip. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch index 54431d96c3..3d0af16ff5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch @@ -1,7 +1,7 @@ -From 959c3000813126592068fc508428b3dd8a2f7445 Mon Sep 17 00:00:00 2001 +From d7ec2bf4d082d383dd2f3a77cbf46bb10261ea59 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 29 Feb 2020 15:13:02 +0000 -Subject: [PATCH 073/119] WIP: dt-bindings: arm: amlogic: add support for the +Subject: [PATCH 072/120] WIP: dt-bindings: arm: amlogic: add support for the Tanix TX5 Max The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 7ded40b309a4..940fda576809 100644 +index 94f68e7c85ed..845a5eb56ff3 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -146,6 +146,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch index 3016540fdd..02eb33fa99 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch @@ -1,7 +1,7 @@ -From 616ee1bf2dd2072b2a52f04917f32e2ad4b75d66 Mon Sep 17 00:00:00 2001 +From e842f0a1b8d3454ac9a166c992986fe9bc5af99f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 20 Oct 2019 04:06:59 +0000 -Subject: [PATCH 074/119] WIP: arm64: dts: meson: add support for the Tanix TX5 +Subject: [PATCH 073/120] WIP: arm64: dts: meson: add support for the Tanix TX5 Max The Tanix TX5 Max is based on the Amlogic U200 reference design @@ -26,7 +26,7 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 5d5ec22a469e..a69bd3a4769f 100644 +index f5845e565efb..5897fd0f594b 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch index ebcc7fcc33..45f883e3e3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch @@ -1,7 +1,7 @@ -From 986b38291ffc617c93f8fa37cb88cc7ccdc91957 Mon Sep 17 00:00:00 2001 +From 98656236664654dc5163a60522ed69d7e3f99823 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 21 Oct 2019 03:58:06 +0000 -Subject: [PATCH 075/119] WIP: arm64: dts: meson: add multiple MeCool device +Subject: [PATCH 074/120] WIP: arm64: dts: meson: add multiple MeCool device trees This adds initial device trees for a range of MeCool devices based on various @@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index a69bd3a4769f..791c6ff9f121 100644 +index 5897fd0f594b..be7cc188706a 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -19,6 +19,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb +@@ -20,6 +20,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb @@ -37,7 +37,7 @@ index a69bd3a4769f..791c6ff9f121 100644 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb -@@ -32,12 +34,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb +@@ -33,12 +35,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch index 08c3d02cf9..d7fa0ed79b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch @@ -1,7 +1,7 @@ -From cb6409dbc874089f3e7a75013f999ec02f9f5be5 Mon Sep 17 00:00:00 2001 +From 821b974dba480063ad5c60d83bd28441ba164f7c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:50:13 +0000 -Subject: [PATCH 076/119] WIP: dt-bindings: arm: amlogic: add support for Minix +Subject: [PATCH 075/120] WIP: dt-bindings: arm: amlogic: add support for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 940fda576809..dfdf6c42ea47 100644 +index 845a5eb56ff3..657af6e662ea 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -58,6 +58,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch index 6d7d1d5df2..9ce8b79988 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch @@ -1,7 +1,7 @@ -From cc383de661125823c2bea1f074e897dc648d314a Mon Sep 17 00:00:00 2001 +From d498d3a2fbd330d5f85f75b0f752351fe6745d53 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:52:14 +0000 -Subject: [PATCH 077/119] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 076/120] WIP: arm64: dts: meson: add initial device-tree for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) @@ -30,10 +30,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 791c6ff9f121..f5f17f2f0fc2 100644 +index be7cc188706a..c310be848a62 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb +@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-ki-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-kii-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 564b6d9530..3165dd11b5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From 50050fbec8c02222eeb219ec3495caff13560297 Mon Sep 17 00:00:00 2001 +From e262438bbff7de98affac0b45496fc1e96cab49e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 19 Aug 2022 21:32:21 +0000 -Subject: [PATCH 078/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 077/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO-U1 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch index e1a8f12952..37c6674cad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch @@ -1,7 +1,7 @@ -From 54ce89d3f4d99631678c0a0819a9ce6b212dfba3 Mon Sep 17 00:00:00 2001 +From 13fcb2cd934993bf97d27f11db35f2a478d173b4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:28:50 +0000 -Subject: [PATCH 079/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 078/120] WIP: dt-bindings: arm: amlogic: add support for Beelink Mini MXIII The Beelink Mini MXIII is an Android STB based on the Amlogic P200 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index dfdf6c42ea47..70cb580f8b7e 100644 +index 657af6e662ea..a0ea076b7b4d 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -56,6 +56,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch index 177ec6e3af..8ce3bb7e0c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch @@ -1,7 +1,7 @@ -From d2ffa2383dec0ec5fd736258b910f68ae7e27a30 Mon Sep 17 00:00:00 2001 +From 7202d36700ce8a77703bcc0d1ee1b0ba1346927a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:26:00 +0000 -Subject: [PATCH 080/119] WIP: arm64: dts: meson: add support for Beelink Mini +Subject: [PATCH 079/120] WIP: arm64: dts: meson: add support for Beelink Mini MXIII This is a GXBB board that ships in two variants, one with @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-beelink-mini-mxiii.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index f5f17f2f0fc2..b7d7cb46b70a 100644 +index c310be848a62..f27222c9d292 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb +@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch index a94058ec75..322c78ffb6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch @@ -1,7 +1,7 @@ -From 3099de0850d5d012648f6addbd236341b43bf842 Mon Sep 17 00:00:00 2001 +From 895414b87c0d4e345c304d48bd39cdf1b3408e81 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:48:02 +0000 -Subject: [PATCH 081/119] WIP: media: rc: add keymap for MeCool M8S Pro W +Subject: [PATCH 080/120] WIP: media: rc: add keymap for MeCool M8S Pro W remote Add a keymap and bindings for the simple IR (NEC) remote used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch index 97f2ccbb3b..1bbd9749f6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch @@ -1,7 +1,7 @@ -From 08d9f3f5a18a2b8ed87285ed50f298fff7634aa6 Mon Sep 17 00:00:00 2001 +From f16b6edb5e3e984a4dab17906af225280ff6d543 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:15:36 +0000 -Subject: [PATCH 082/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 081/120] WIP: dt-bindings: arm: amlogic: add support for MeCool M8S Pro W The MeCool M8S Pro W is an Android STB based on the Amlogic P281 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 70cb580f8b7e..f9d6a8f82d01 100644 +index a0ea076b7b4d..70706c8d5ed8 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -89,6 +89,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch index 88d95a00a1..1bede5f714 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch @@ -1,7 +1,7 @@ -From c8111a7e93aee04ee7d1c7c87ef5b552f043f309 Mon Sep 17 00:00:00 2001 +From 8dbd84116d2dd92367fe327292e71104c84f5b0c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:17:41 +0000 -Subject: [PATCH 083/119] WIP: arm64: dts: meson: add support for MeCool M8S +Subject: [PATCH 082/120] WIP: arm64: dts: meson: add support for MeCool M8S Pro W MeCool M8S Pro W is an Android STB based on the Amlogic P281 (GXL) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch index 4af6b029de..0b9a74d026 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch @@ -1,7 +1,7 @@ -From 04494107d4738b516d6a4302d9e7db7ae77e6d52 Mon Sep 17 00:00:00 2001 +From 98ae62b3a7453b7210a56a97b0d78d5772f5d797 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 02:40:20 +0000 -Subject: [PATCH 084/119] WIP: dt-bindings: arm: amlogic: add Vero 4K binding +Subject: [PATCH 083/120] WIP: dt-bindings: arm: amlogic: add Vero 4K binding Add the board binding for the OSMC Vero 4K STB device @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index f9d6a8f82d01..abf58071d4fa 100644 +index 70706c8d5ed8..63a2093cb626 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -102,6 +102,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch index 58731d5487..8bdeaf5220 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch @@ -1,7 +1,7 @@ -From 09a3ea93b7a533fbd8f5aabbeb78124958df968e Mon Sep 17 00:00:00 2001 +From 3cf39f2b0406b2d6c9eaf85e1e8e920448357ba1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 04:06:17 +0000 -Subject: [PATCH 085/119] WIP: arm64: dts: meson: add support for OSMC Vero 4K +Subject: [PATCH 084/120] WIP: arm64: dts: meson: add support for OSMC Vero 4K The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference design with the following specifications: @@ -28,10 +28,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index b7d7cb46b70a..1680f7f6dbd6 100644 +index f27222c9d292..2c4c83cc0a04 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch new file mode 100644 index 0000000000..9f92a3a7e2 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch @@ -0,0 +1,62 @@ +From 98494cbc35117a83cff5e0c23d200243bdff4f43 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 12 Apr 2022 11:21:21 +0000 +Subject: [PATCH 085/120] WIP: arm64: dts: meson: sm1-x96-air: add RTL8822CS + WiFi and Bluetooth support + +Add support for the RTL8822CS WiFi and BT module on the board. + +Signed-off-by: Christian Hewitt +--- + .../dts/amlogic/meson-sm1-x96-air-gbit.dts | 24 +++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +index 7e1a74046ba5..9217db5bdcea 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +@@ -13,6 +13,10 @@ / { + compatible = "amediatech,x96-air-gbit", "amlogic,sm1"; + model = "Shenzhen Amediatech Technology Co., Ltd X96 Air"; + ++ aliases { ++ serial2 = &uart_A; ++ }; ++ + sound { + compatible = "amlogic,axg-sound-card"; + model = "X96-AIR"; +@@ -120,6 +124,12 @@ &ir { + linux,rc-map-name = "rc-x96max"; + }; + ++&sd_emmc_a { ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ + &tdmif_b { + status = "okay"; + }; +@@ -131,3 +141,17 @@ &tdmout_b { + &tohdmitx { + status = "okay"; + }; ++ ++&uart_A { ++ status = "okay"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch deleted file mode 100644 index 48d0f74cfb..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9447b13173e07289f13d43e48c63aa9ffe551a0d Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 12 Apr 2022 11:21:21 +0000 -Subject: [PATCH 086/119] WIP: arm64: dts: meson: add RTL8822CS bluetooth to - X96-Air - -Add the uart_A/bluetooth node for the RTL8822CS chip. - -Signed-off-by: Christian Hewitt ---- - .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -index 7e1a74046ba5..66e53c25bfb4 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -@@ -131,3 +131,16 @@ &tdmout_b { - &tohdmitx { - status = "okay"; - }; -+ -+&uart_A { -+ status = "okay"; -+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "realtek,rtl8822cs-bt"; -+ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; -+ host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; -+ }; -+}; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch index 94370c2989..f25987d739 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch @@ -1,7 +1,7 @@ -From ec3fd95f8147ceccc0da3647128f42caf5c7f8eb Mon Sep 17 00:00:00 2001 +From bbb4c8b01cf73f2e600b1d67b742d515e1f2e6d1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 10 Apr 2022 11:51:38 +0000 -Subject: [PATCH 087/119] WIP: media: rc: add keymap for Venz V10 remote +Subject: [PATCH 086/120] WIP: media: rc: add keymap for Venz V10 remote Add a keymap and bindings for the IR (NEC) remote used with the Venz V10 Android STB device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch index 5294cc3e7e..d8eea145c9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch @@ -1,7 +1,7 @@ -From 1d7ef8f872d93d1444ddc324830a7f0b895cc7f0 Mon Sep 17 00:00:00 2001 +From 45cee9708bfc6c1418d3a23513ea7af22bf56bd7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:27:50 +0000 -Subject: [PATCH 088/119] WIP: dt-bindings: arm: amlogic: add S905L and Venz +Subject: [PATCH 087/120] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10 bindings Add SOC bindings for S905L devices and the board binding for Venz V10. @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index abf58071d4fa..fa02463f1e58 100644 +index 63a2093cb626..5ff3e7f43a51 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -83,6 +83,13 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch index 12ef714a7f..a5ba97b33b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch @@ -1,7 +1,7 @@ -From c4efd114a22c073b877b7659322774fffabe49a2 Mon Sep 17 00:00:00 2001 +From 5cd1412e6bb2a6e445b6e6e8bb35c3f2e74bbf4f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:21:58 +0000 -Subject: [PATCH 089/119] WIP: arm64: dts: meson: add support for Venz V10 +Subject: [PATCH 088/120] WIP: arm64: dts: meson: add support for Venz V10 The Venz V10 is an Android STB based on the Amlogic P212 (GXL) reference design with an S905L chip and the following specs: @@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905l-venz-v10.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 1680f7f6dbd6..fbeea2278187 100644 +index 2c4c83cc0a04..81e8195509b4 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb +@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch index d4df484173..9cf01f7aa4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch @@ -1,7 +1,7 @@ -From a2dac2285a5381e7265efbe188c9ba4ba499dedf Mon Sep 17 00:00:00 2001 +From de812cac86ea6d25dbe3d0e0862f762749519be4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:15:41 +0000 -Subject: [PATCH 090/119] WIP: dt-bindings: vendor-prefixes: add tbee prefix +Subject: [PATCH 089/120] WIP: dt-bindings: vendor-prefixes: add tbee prefix QUIDBox, Lda. are the Portuguese manufacturer of 'TBee' branded Android Set-Top Box devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch index e83afab5d0..94bfbe7bc1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch @@ -1,7 +1,7 @@ -From 94dde8907583a3ea8c9de74c6f8ca5be8d9b81df Mon Sep 17 00:00:00 2001 +From 74edd1397576e08df2de0fb5944ddbd85d47172b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:05:11 +0000 -Subject: [PATCH 091/119] WIP: dt-bindings: arm: amlogic: add TBee Box binding +Subject: [PATCH 090/120] WIP: dt-bindings: arm: amlogic: add TBee Box binding Add the board binding for the TBee Box. @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index fa02463f1e58..ba803d8d6eb2 100644 +index 5ff3e7f43a51..9e410dc8d0c5 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -110,6 +110,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch index 687af9a940..bbfe362055 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch @@ -1,7 +1,7 @@ -From 56aaccf3ceb9988ae456dd2212e701acad5f3f68 Mon Sep 17 00:00:00 2001 +From c2965f88c61c79d8cb6378b3c5f7849c7e5fa487 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:23:12 +0000 -Subject: [PATCH 092/119] WIP: arm64: dts: meson: add support for TBee Box +Subject: [PATCH 091/120] WIP: arm64: dts: meson: add support for TBee Box The TBee Box is an Android STB based on the Amlogic P212 (GXL) reference design with an S905X chip and the following specs: @@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-tbee.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index fbeea2278187..281a72ca8918 100644 +index 81e8195509b4..48459c7f8f1e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch index 431d034537..f3ed825f29 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch @@ -1,7 +1,7 @@ -From b794a923fd9340a46ad7f537e3926449975014fb Mon Sep 17 00:00:00 2001 +From 9d8461e4e3f8f54ba7b3a9ced9eb627d4f03376e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 24 Jul 2022 08:50:28 +0000 -Subject: [PATCH 093/119] WIP: dt-bindings: arm: amlogic: add Beelink GT1 +Subject: [PATCH 092/120] WIP: dt-bindings: arm: amlogic: add Beelink GT1 binding Add the board binding for the Shenzen AZW (Beelink) GT1 Android @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index ba803d8d6eb2..5844cb31efab 100644 +index 9e410dc8d0c5..658702b68afe 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -132,6 +132,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch index cec57c12a0..33c358eb49 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ -From 80b5d49ebfd2ab56d74441e7a22ce252fd4b686f Mon Sep 17 00:00:00 2001 +From 265a4f2df88d969f26edc1303bc0f6b1527d54d1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 10:01:03 +0000 -Subject: [PATCH 094/119] WIP: arm64: dts: meson: add support for Beelink GT1 +Subject: [PATCH 093/120] WIP: arm64: dts: meson: add support for Beelink GT1 The Beelink GT1 is based on the Amlogic S912 (Q200) reference design with the following specifications: @@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 281a72ca8918..3fad85258de2 100644 +index 48459c7f8f1e..187c83c4c61e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb +@@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch index d4ddee2f47..55dcf40a00 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch @@ -1,7 +1,7 @@ -From 312fbdaeaf73b1ebd300e550a3152a5713db2711 Mon Sep 17 00:00:00 2001 +From 2652e86837fdb21477d62ef1645e463da9139536 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 10:27:10 +0000 -Subject: [PATCH 095/119] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek +Subject: [PATCH 094/120] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek dtsi Add the vcc_5v regulator used by the audio DAC chip diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch index 54c6aab3c2..1b691325b9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch @@ -1,7 +1,7 @@ -From 64b085618158efcc560162027a6773b89fdacfdd Mon Sep 17 00:00:00 2001 +From 80342953ec8e2d955dfa2abfa522d0b165e6d1be Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 13:39:23 +0000 -Subject: [PATCH 096/119] WIP: arm64: dts: meson: add audio lineout to WeTek +Subject: [PATCH 095/120] WIP: arm64: dts: meson: add audio lineout to WeTek Play2 Add support for the ES7134LV headphone output on the WeTek Play2 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch index 09f69da405..ebd509d719 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch @@ -1,7 +1,7 @@ -From a45aab44a99949e25796854294e41bf46b72dc7b Mon Sep 17 00:00:00 2001 +From 6c308ef81cfef32b67d12c4f3ab19cc71c19d41e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 29 Jul 2022 08:29:20 +0000 -Subject: [PATCH 097/119] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek +Subject: [PATCH 096/120] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek Hub The original submission in commit d537d289de06 ("ARM64: dts: meson-gxbb: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch index 6f39ca75ee..ca3dc15b80 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch @@ -1,7 +1,7 @@ -From 563b593d2d94d5ede23ea0e70ed9987cb42f0d3b Mon Sep 17 00:00:00 2001 +From b10501e41c8bede399b8465a9f02de357726f940 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:21:16 +0000 -Subject: [PATCH 098/119] WIP: ASoC: dt-bindings: add compatible for es8323-i2c +Subject: [PATCH 097/120] WIP: ASoC: dt-bindings: add compatible for es8323-i2c Add a compatible for the everest,es8323 audio codec used with a number of Amlogic and Rockchip board devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch index 3a4f85e9c3..e3c0af35f0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch @@ -1,7 +1,7 @@ -From 480488c15b69618860e48b9c85905faa65e94360 Mon Sep 17 00:00:00 2001 +From a1c69fc092755a59b25b7a90be3c97796bc77dc7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:29:32 +0000 -Subject: [PATCH 099/119] WIP: ASoC: codecs: add support for ES8323 +Subject: [PATCH 098/120] WIP: ASoC: codecs: add support for ES8323 The ES8323 is compatible with the existing ES8328 codec driver, so add compatibles allowing it to be used. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch index 100c685b9d..20098fd1a3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch @@ -1,7 +1,7 @@ -From 1368afbd892487bc554ef3e1480be404f393d28c Mon Sep 17 00:00:00 2001 +From eefcf6ac4648114ce7c0d818ee0a2c32508d09f6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:47:52 +0000 -Subject: [PATCH 100/119] WIP: dt-bindings: add dream vendor prefix +Subject: [PATCH 099/120] WIP: dt-bindings: add dream vendor prefix Add vendor prefix for Dream Property GmbH diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch index ebd86eeb19..2fd6803bf6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch @@ -1,7 +1,7 @@ -From 782af7674db11452db57dc9eb06da4b88b85b1e4 Mon Sep 17 00:00:00 2001 +From 04dd3e0b7c2b58a169dbfc93dca5e16b1eac18da Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:48:34 +0000 -Subject: [PATCH 101/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 100/120] WIP: dt-bindings: arm: amlogic: add support for Dreambox One/Two The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 5844cb31efab..b8b2899ad83b 100644 +index 658702b68afe..b7ade343feaf 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -178,6 +178,8 @@ properties: +@@ -186,6 +186,8 @@ properties: - azw,gsking-x - azw,gtking - azw,gtking-pro diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch index 459027c0c4..57d7399c37 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch @@ -1,7 +1,7 @@ -From dbbff2493c4e7bc8d5428eac685fad04f0aabba0 Mon Sep 17 00:00:00 2001 +From 98ea0ea77819bebf2f5cfdb07020edabdd5cfbb0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:51:20 +0000 -Subject: [PATCH 102/119] WIP: arm64: dts: meson: add initial device-trees for +Subject: [PATCH 101/120] WIP: arm64: dts: meson: add initial device-trees for Dreambox One/Two Dreambox One and Dreambox Two are based on the Amlogic W400 reference @@ -40,13 +40,13 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3fad85258de2..f06a1337b29d 100644 +index 187c83c4c61e..bc50ca8b0e79 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -10,6 +10,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-tanix-tx5max.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb +@@ -11,6 +11,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch index c71cc0254b..01f72411a6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch @@ -1,7 +1,7 @@ -From 5c3b005aaad70692a8ac2891b402a636ec3cc9e9 Mon Sep 17 00:00:00 2001 +From 740b7806615c9781caa1f40e390b6075764bb85e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 04:27:45 +0000 -Subject: [PATCH 103/119] WIP: dt-bindings: arm: amlogic: add support for Ugoos +Subject: [PATCH 102/120] WIP: dt-bindings: arm: amlogic: add support for Ugoos AM6 plus The AM6 plus is a revised version of the AM6 Android box based @@ -14,10 +14,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index b8b2899ad83b..cc0f1ac5f678 100644 +index b7ade343feaf..a1ec954a8b8b 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -184,6 +184,7 @@ properties: +@@ -192,6 +192,7 @@ properties: - hardkernel,odroid-n2-plus - khadas,vim3 - ugoos,am6 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch index 638d2aa102..6e0ff777a7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch @@ -1,7 +1,7 @@ -From 8abd9cdf2ae1a222828a031510ca49c103f336c5 Mon Sep 17 00:00:00 2001 +From 65a60781fde14e49a5dd4c422cc909b61542cc50 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 05:29:31 +0000 -Subject: [PATCH 104/119] WIP: arm64: dts: meson: add support for Ugoos AM6 +Subject: [PATCH 103/120] WIP: arm64: dts: meson: add support for Ugoos AM6 Plus The Ugoos AM6 Plus is based on the Amlogic W400 (G12B) reference design @@ -31,10 +31,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index f06a1337b29d..494f8aaa8060 100644 +index bc50ca8b0e79..615b1c496a34 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch index 25fd737a56..8dd3d818cf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch @@ -1,8 +1,8 @@ -From a2439693661c617b58d9d7934ac082bd42e8ddb2 Mon Sep 17 00:00:00 2001 +From ebe052f07c62ef9836b8fbdd6a4a56c70d55587e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 24 Jan 2023 16:57:20 +0000 -Subject: [PATCH 105/119] arm64: dts: meson: add support for MeCool M8S Pro - Plus +Subject: [PATCH 104/120] WIP: arm64: dts: meson: add support for MeCool M8S + Pro Plus This is an S905X device based on the P212 reference design, but with an S908CS WiFi/BT module that is not currently supported. @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-mecool-m8s-pro-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 494f8aaa8060..3f1b3e2f30f5 100644 +index 615b1c496a34..43ffbe9e359e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb +@@ -54,6 +54,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch index 668efa3731..7d834a5756 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch @@ -1,7 +1,7 @@ -From 1a1fc49b6127ecf2d16be31ab83ec734da497b7e Mon Sep 17 00:00:00 2001 +From 84eeb2347773a89ae03b936c4ba36267b6dcb28f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 106/119] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan +Subject: [PATCH 105/120] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan support The A311D on Zero2 needs active cooling and the board includes a header to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch index 6f776f587e..ff5e0cfa2a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch @@ -1,7 +1,7 @@ -From e6e55db69f4283d40937256d93edfa837f905f33 Mon Sep 17 00:00:00 2001 +From d9dd54c8b2d2f7ec05e42392205a67b20dba4e83 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 09:59:58 +0000 -Subject: [PATCH 107/119] WIP: dt-bindings: arm: amlogic: add support for Tanix +Subject: [PATCH 106/120] WIP: dt-bindings: arm: amlogic: add support for Tanix TX9 Pro The Oranth Tanix TX9 Pro is an Android STB using the Amlogic S912 chip @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index cc0f1ac5f678..e76691082298 100644 +index a1ec954a8b8b..dea5d15da404 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -139,6 +139,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch index 08c248d479..e2fa019954 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch @@ -1,7 +1,7 @@ -From c8038bf4bbae704a49cd2844bc2e5648d99696b0 Mon Sep 17 00:00:00 2001 +From 551f6b28a561c121f00222c0f101c75dfad93d4b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:01:14 +0000 -Subject: [PATCH 108/119] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 107/120] WIP: arm64: dts: meson: add initial device-tree for Tanix TX9 Pro Oranth Tanix TX9 Pro is based on the Amlogic Q200 reference design with @@ -27,10 +27,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-tx9-pro.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3f1b3e2f30f5..6a71a170b6f3 100644 +index 43ffbe9e359e..8b4155e0140c 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb +@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch index 2f6f718b63..9128e8ebca 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch @@ -1,7 +1,7 @@ -From ef5c2fa82e569cbcb8fb53b742343f4272f638ed Mon Sep 17 00:00:00 2001 +From 0b2aaaf3f86a0b904b45cb7ef30ae5804a2b95b9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:11:39 +0000 -Subject: [PATCH 109/119] WIP: arm64: dts: meson: add 7-segment display to +Subject: [PATCH 108/120] WIP: arm64: dts: meson: add 7-segment display to Tanix TX9 Pro Add support for the 7-segment VFD display of the device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch index 1fa503d1e1..522a52e986 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch @@ -1,7 +1,7 @@ -From 4bf607534e312de06cfdc61cf3a5c2e2baa36a97 Mon Sep 17 00:00:00 2001 +From dbcc56c1a71911850208663846c93f80307eb455 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 12 Feb 2023 10:45:54 +0000 -Subject: [PATCH 110/119] WIP: net: phy: add support for Maxio MAE0621A +Subject: [PATCH 109/120] WIP: net: phy: add support for Maxio MAE0621A Maxio MAE0621A is the external PHY found in some Amlogic set-top box devices based on the S905D chipset. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch index 64c021ad46..09dfe7290a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch @@ -1,7 +1,7 @@ -From f24ebb12d59f441e4061046fcd85befb9b07ff23 Mon Sep 17 00:00:00 2001 +From ecd545158c8a7a097246012838dc9e06cb616c53 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:38:16 +0000 -Subject: [PATCH 111/119] WIP: dt-bindings: add sunvell vendor prefix +Subject: [PATCH 110/120] WIP: dt-bindings: add sunvell vendor prefix Add vendor prefix for Shenzhen Sunvell Electronics Co., Ltd diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch index fa0d4f30ef..16f76f5e0f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch @@ -1,7 +1,7 @@ -From 175c7bc4e08922b3be0b2940efe07f877ddcf03e Mon Sep 17 00:00:00 2001 +From 60054b9f599a0bfca817da045fd8d0458395fd0b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 18:36:56 +0000 -Subject: [PATCH 112/119] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus +Subject: [PATCH 111/120] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus Add a binding for the rc-sunvell-t95z-plus remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch index 76d0c57865..7c8c861018 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From dfed8817abde00a9877d53d02b21871a05da1054 Mon Sep 17 00:00:00 2001 +From 2e8380078a0b306ba9f71dcfca1f8c5ccf0152f0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 19:03:10 +0000 -Subject: [PATCH 113/119] WIP: media: rc: add keymap for Sunvell T95Z Plus +Subject: [PATCH 112/120] WIP: media: rc: add keymap for Sunvell T95Z Plus Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch index a9b95d5f35..1dbe59bf0c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch @@ -1,7 +1,7 @@ -From 5ba3816e2167b21386eb376d5aa283a754cc62b2 Mon Sep 17 00:00:00 2001 +From 3cba9548f0cd3d983ffa349516afdb0adf4a62ee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:41:09 +0000 -Subject: [PATCH 114/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 113/120] WIP: dt-bindings: arm: amlogic: add support for Sunvell T95Z Plus Sunvell T95Z Plus is an Android STB based on the Amlogic Q200 reference @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index e76691082298..e7d2624cbbb6 100644 +index dea5d15da404..800ecbc6efa6 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -140,6 +140,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch index ca69473a09..d6e1d66a89 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch @@ -1,7 +1,7 @@ -From d4d794feea10af19360d8781aeaf6996d52e2978 Mon Sep 17 00:00:00 2001 +From 44e39b9ad7a1094d7cfd788481a219138cf34336 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:46:39 +0000 -Subject: [PATCH 115/119] WIP: arm64: dts: meson: add support for Sunvell T95Z +Subject: [PATCH 114/120] WIP: arm64: dts: meson: add support for Sunvell T95Z Plus Sunvell T95Z Pluz is based on the Amlogic Q200 reference design with @@ -27,10 +27,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 6a71a170b6f3..3897fb9a9207 100644 +index 8b4155e0140c..8ce0c8697c94 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb +@@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-tx9-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch index 192b8f0970..92d5cb56a4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From 776e7979362127c2fcc55fe178da02192f852ae5 Mon Sep 17 00:00:00 2001 +From 573181cefb8ff2013dd1f1d796d681ea99ac579a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 13:11:14 +0000 -Subject: [PATCH 116/119] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z +Subject: [PATCH 115/120] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z Plus making guesses at the config.. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch index 65c56feb1c..83898d15b7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch @@ -1,10 +1,10 @@ -From 526525ab3720040b9982cabbc8ba9d1cc9c6538f Mon Sep 17 00:00:00 2001 +From eab9517d3b0b48c6b62442f5c8c0edcc2e3e95e2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 19:25:18 +0000 -Subject: [PATCH 118/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 116/120] WIP: dt-bindings: arm: amlogic: add support for BananaPi M2S variants -BananaPi M2S ships in two variants with Amlogic S922X or A311D chips +BananaPi M2S ships in two variants with Amlogic S922X or A311D chips. Signed-off-by: Christian Hewitt --- @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index e7d2624cbbb6..bc4f2a2422db 100644 +index 800ecbc6efa6..fb93a6e51061 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -169,6 +169,7 @@ properties: @@ -23,7 +23,7 @@ index e7d2624cbbb6..bc4f2a2422db 100644 - khadas,vim3 - radxa,zero2 - const: amlogic,a311d -@@ -180,8 +181,10 @@ properties: +@@ -188,8 +189,10 @@ properties: - azw,gsking-x - azw,gtking - azw,gtking-pro diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch index 264fcb00c9..02b73f5e25 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch @@ -1,7 +1,7 @@ -From d0680b65d58938cc23d9b3a38de228444904fe32 Mon Sep 17 00:00:00 2001 +From 612b811375ca47c232e4edba77ef886f1597d55b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 09:22:24 +0000 -Subject: [PATCH 119/119] WIP: arm64: dts: meson: add support for BananaPi M2S +Subject: [PATCH 117/120] WIP: arm64: dts: meson: add support for BananaPi M2S variants BananaPi M2S ships in Amlogic S922X and A311D variants with the @@ -34,16 +34,16 @@ both board variants. Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/amlogic/Makefile | 2 + - .../amlogic/meson-g12b-a311d-bananapi-m2s.dts | 18 + - .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 554 ++++++++++++++++++ + .../amlogic/meson-g12b-a311d-bananapi-m2s.dts | 37 ++ + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 521 ++++++++++++++++++ .../amlogic/meson-g12b-s922x-bananapi-m2s.dts | 14 + - 4 files changed, 588 insertions(+) + 4 files changed, 574 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3897fb9a9207..43a78de9ddb7 100644 +index 8ce0c8697c94..172355a2afb0 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb @@ -52,9 +52,9 @@ index 3897fb9a9207..43a78de9ddb7 100644 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb -@@ -18,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +@@ -19,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb @@ -64,10 +64,10 @@ index 3897fb9a9207..43a78de9ddb7 100644 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6-plus.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts new file mode 100644 -index 000000000000..6c4f02c3a349 +index 000000000000..ac6f7ae1d103 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts -@@ -0,0 +1,18 @@ +@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2023 Christian Hewitt @@ -81,6 +81,25 @@ index 000000000000..6c4f02c3a349 +/ { + compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b"; + model = "BananaPi M2S"; ++ ++ aliases { ++ i2c0 = &i2c1; ++ i2c1 = &i2c3; ++ }; ++}; ++ ++/* Camera (CSI) bus */ ++&i2c1 { ++ status = "okay"; ++ pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* Display (DSI) bus */ ++&i2c3 { ++ status = "okay"; ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; +}; + +&npu { @@ -88,10 +107,10 @@ index 000000000000..6c4f02c3a349 +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi new file mode 100644 -index 000000000000..2698d718c9a5 +index 000000000000..d02b50a0f7a8 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -@@ -0,0 +1,554 @@ +@@ -0,0 +1,521 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS @@ -107,8 +126,8 @@ index 000000000000..2698d718c9a5 +/ { + aliases { + serial0 = &uart_AO; -+ serial2 = &uart_A; + ethernet0 = ðmac; ++ rtc1 = &vrtc; + }; + + chosen { @@ -124,12 +143,12 @@ index 000000000000..2698d718c9a5 + compatible = "adc-keys"; + io-channels = <&saradc 2>; + io-channel-names = "buttons"; -+ keyup-threshold-microvolt = <1800000>; ++ keyup-threshold-microvolt = <1710000>; + + button-function { + label = "RST"; + linux,code = ; -+ press-threshold-microvolt = <40000>; ++ press-threshold-microvolt = <10000>; + }; + }; + @@ -161,18 +180,18 @@ index 000000000000..2698d718c9a5 + leds { + compatible = "gpio-leds"; + -+ green { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; -+ }; -+ + blue { + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; ++ ++ green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; ++ }; + }; + + sdio_pwrseq: sdio-pwrseq { @@ -189,7 +208,7 @@ index 000000000000..2698d718c9a5 + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; + -+ dc_in: regulator-dc_in { ++ dc_in: regulator-dc-in { + compatible = "regulator-fixed"; + regulator-name = "DC_IN"; + regulator-min-microvolt = <5000000>; @@ -197,7 +216,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vcc_5v: regulator-vcc_5v { ++ vcc_5v: regulator-vcc-5v { + compatible = "regulator-fixed"; + regulator-name = "VCC_5V"; + regulator-min-microvolt = <5000000>; @@ -208,7 +227,7 @@ index 000000000000..2698d718c9a5 + enable-active-high; + }; + -+ vcc_3v3: regulator-vcc_3v3 { ++ vcc_3v3: regulator-vcc-3v3 { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <3300000>; @@ -217,7 +236,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vcc_1v8: regulator-vcc_1v8 { ++ vcc_1v8: regulator-vcc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "VCC_1V8"; + regulator-min-microvolt = <1800000>; @@ -226,7 +245,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vddao_1v8: regulator-vddao_1v8 { ++ vddao_1v8: regulator-vddao-1v8 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO1V8"; + regulator-min-microvolt = <1800000>; @@ -259,7 +278,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vsys_3v3: regulator-vsys_3v3 { ++ vsys_3v3: regulator-vsys-3v3 { + compatible = "regulator-fixed"; + regulator-name = "VSYS_3V3"; + regulator-min-microvolt = <3300000>; @@ -268,7 +287,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ emmc_1v8: regulator-emmc_1v8 { ++ emmc_1v8: regulator-emmc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "EMMC_AO1V8"; + regulator-min-microvolt = <1800000>; @@ -277,7 +296,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ usb_pwr: regulator-usb_pwr { ++ usb_pwr: regulator-usb-pwr { + compatible = "regulator-fixed"; + regulator-name = "USB_PWR"; + regulator-min-microvolt = <5000000>; @@ -291,16 +310,11 @@ index 000000000000..2698d718c9a5 + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M2S"; -+ audio-aux-devs = <&tdmin_a>, <&tdmout_a>; -+ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", -+ "TDMOUT_A IN 1", "FRDDR_B OUT 0", -+ "TDMOUT_A IN 2", "FRDDR_C OUT 0", -+ "TDM_A Playback", "TDMOUT_A OUT", -+ "TDMIN_A IN 0", "TDM_A Capture", -+ "TDMIN_A IN 3", "TDM_A Loopback", -+ "TODDR_A IN 0", "TDMIN_A OUT", -+ "TODDR_B IN 0", "TDMIN_A OUT", -+ "TODDR_C IN 0", "TDMIN_A OUT"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; + + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, @@ -322,21 +336,9 @@ index 000000000000..2698d718c9a5 + sound-dai = <&frddr_c>; + }; + -+ dai-link-3 { -+ sound-dai = <&toddr_a>; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&toddr_b>; -+ }; -+ -+ dai-link-5 { -+ sound-dai = <&toddr_c>; -+ }; -+ + /* 8ch hdmi interface */ -+ dai-link-6 { -+ sound-dai = <&tdmif_a>; ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + dai-tdm-slot-tx-mask-1 = <1 1>; @@ -345,12 +347,12 @@ index 000000000000..2698d718c9a5 + mclk-fs = <256>; + + codec { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* hdmi glue */ -+ dai-link-7 { ++ dai-link-4 { + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; + + codec { @@ -368,13 +370,6 @@ index 000000000000..2698d718c9a5 + status = "okay"; +}; + -+&cec_AO { -+ pinctrl-0 = <&cec_ao_a_h_pins>; -+ pinctrl-names = "default"; -+ status = "disabled"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; @@ -474,6 +469,13 @@ index 000000000000..2698d718c9a5 + }; +}; + ++/* Main i2c bus */ ++&i2c2 { ++ status = "okay"; ++ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>; ++ pinctrl-names = "default"; ++}; ++ +&pcie { + status = "okay"; + reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; @@ -579,27 +581,11 @@ index 000000000000..2698d718c9a5 + vqmmc-supply = <&emmc_1v8>; +}; + -+&tdmif_a { ++&tdmif_b { + status = "okay"; +}; + -+&tdmin_a { -+ status = "okay"; -+}; -+ -+&tdmout_a { -+ status = "okay"; -+}; -+ -+&toddr_a { -+ status = "okay"; -+}; -+ -+&toddr_b { -+ status = "okay"; -+}; -+ -+&toddr_c { ++&tdmout_b { + status = "okay"; +}; + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch similarity index 70% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch index fab85e2447..695ab4f782 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -1,24 +1,25 @@ -From d1e24180eafd58f9d4fb07bfeb92ac4d7e506f34 Mon Sep 17 00:00:00 2001 +From 295d65e7123908556d5fb78683c256459b9be871 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Feb 2023 08:28:00 +0000 -Subject: [PATCH 117/119] WIP: arm64: dts: meson: p23x-q20x: fix usb init - +Subject: [PATCH 118/120] WIP: arm64: dts: meson: p23x-q20x: fix usb init - don't force otg -Forcing OTG in the p23x-q20x dtsi causes USB problems on some boards: +Forcing OTG in the p23x-q20x dtsi causes USB problems on multiple boards: [ 1.246056] dwc2 c9100000.usb: supply vusb_d not found, using dummy regulator [ 1.246442] dwc2 c9100000.usb: supply vusb_a not found, using dummy regulator [ 1.258386] dwc2 c9100000.usb: dwc2_core_reset: HANG! Soft Reset timeout GRSTCTL_CSFTRST [ 1.258404] dwc2: probe of c9100000.usb failed with error -16 -Using device mode results in working USB ports: +Using 'peripheral' mode clears the error but still leaves boards without working +USB ports. Using 'host' mode results in working USB ports: [ 1.760353] dwc2 c9100000.usb: supply vusb_d not found, using dummy regulator [ 1.760706] dwc2 c9100000.usb: supply vusb_a not found, using dummy regulator [ 1.761307] dwc2 c9100000.usb: EPs: 7, dedicated fifos, 712 entries in SPRAM -Define 'peripheral' dr_mode as a safe default for all GXL/GXM boards -that consume the common dtsi. +Define 'host' dr_mode as a safer default for all GXL/GXM boards that +consume the common dtsi. Signed-off-by: Christian Hewitt --- @@ -26,7 +27,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index b0d008fc5f7a..fcfc81dc08b6 100644 +index b0d008fc5f7a..025cefd6939a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -324,5 +324,5 @@ &uart_AO { @@ -34,7 +35,7 @@ index b0d008fc5f7a..fcfc81dc08b6 100644 &usb { status = "okay"; - dr_mode = "otg"; -+ dr_mode = "peripheral"; ++ dr_mode = "host"; }; -- 2.34.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch new file mode 100644 index 0000000000..ce8909e8c0 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch @@ -0,0 +1,99 @@ +From 43a534f7b59e2364221f972df637f5cc8e8ab153 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 7 Mar 2023 13:17:16 +0000 +Subject: [PATCH 119/120] WIP: arm64: dts: meson: add WiFi/BT support to + BananaPi M5 + +The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe +the board but mark the sd_mmc_a and uart_A nodes disabled so they can +be enabled via overlay or fdtput when the baord is connected. + +Signed-off-by: Christian Hewitt +--- + .../dts/amlogic/meson-sm1-bananapi-m5.dts | 59 +++++++++++++++++++ + 1 file changed, 59 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +index 34b3238ee0a0..0b434572a789 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +@@ -25,6 +25,20 @@ cvbs_connector_in: endpoint { + }; + }; + ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++ + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M5"; +@@ -173,6 +187,36 @@ &frddr_c { + status = "okay"; + }; + ++/* SDIO */ ++&sd_emmc_a { ++ /* enable if WiFi/BT board connected */ ++ status = "disabled"; ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ + &tdmif_b { + status = "okay"; + }; +@@ -220,3 +264,18 @@ &toddr_b { + &toddr_c { + status = "okay"; + }; ++ ++&uart_A { ++ /* enable if WiFi/BT board connected */ ++ status = "disabled"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch new file mode 100644 index 0000000000..ed6a7374c3 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -0,0 +1,29 @@ +From df325d11ba5958c576be5594b3fd08d934d4139f Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 14 Mar 2023 01:13:15 +0000 +Subject: [PATCH 120/120] WIP: media: meson: vdec: fix memory leak of + 'new_frame' + +Reported-by: kernel test robot +Reported-by: Dan Carpenter +Link: https://lore.kernel.org/r/202303120441.YFGHDOya-lkp@intel.com/ +Signed-off-by: Christian Hewitt +--- + drivers/staging/media/meson/vdec/codec_hevc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c +index fcaaa1ad50b8..b0d8623c3c7d 100644 +--- a/drivers/staging/media/meson/vdec/codec_hevc.c ++++ b/drivers/staging/media/meson/vdec/codec_hevc.c +@@ -731,6 +731,7 @@ codec_hevc_prepare_new_frame(struct amvdec_session *sess) + vbuf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx); + if (!vbuf) { + dev_err(sess->core->dev, "No dst buffer available\n"); ++ kfree(new_frame); + return NULL; + } + +-- +2.34.1 + diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index b9759631e0..3122a3c071 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.14 Kernel Configuration +# Linux/arm64 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1224,7 +1224,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # Classification # # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set @@ -4383,8 +4382,6 @@ CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set CONFIG_DRM_MESON=y CONFIG_DRM_MESON_DW_HDMI=y # CONFIG_DRM_ARCPGU is not set @@ -6586,7 +6583,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y diff --git a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-001.patch b/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-001.patch deleted file mode 100644 index d3ecee3b5e..0000000000 --- a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-001.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5da6d4bdf0ce603d48415dcbc657e56a050a8d24 Mon Sep 17 00:00:00 2001 -From: John Cox -Date: Wed, 11 Jan 2023 16:30:37 +0000 -Subject: [PATCH] v4l2_m2m_dec: Fix initial pkt send if no extradata - ---- - libavcodec/v4l2_m2m_dec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index b58657021c..d540d00bdd 100644 ---- a/libavcodec/v4l2_m2m_dec.c -+++ b/libavcodec/v4l2_m2m_dec.c -@@ -240,7 +240,7 @@ copy_extradata(AVCodecContext * const avctx, - else - len = src_len < 0 ? AVERROR(EINVAL) : src_len; - -- // Zero length is OK but we swant to stop - -ve is error val -+ // Zero length is OK but we want to stop - -ve is error val - if (len <= 0) - return len; - -@@ -533,7 +533,7 @@ static int try_enqueue_src(AVCodecContext * const avctx, V4L2m2mContext * const - - if (s->extdata_sent) - ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, NULL, 0); -- else if (s->extdata_data) -+ else - ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, s->extdata_data, s->extdata_size); - - if (ret == AVERROR(EAGAIN)) { diff --git a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-002.patch b/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-002.patch deleted file mode 100644 index e1de77c269..0000000000 --- a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-002.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 89a5440ab5110d5460c4919865016e66b9dfbc48 Mon Sep 17 00:00:00 2001 -From: John Cox -Date: Wed, 11 Jan 2023 18:34:04 +0000 -Subject: [PATCH] Make capture timeout long once we've started getting frames - ---- - libavcodec/v4l2_m2m.h | 1 + - libavcodec/v4l2_m2m_dec.c | 10 ++++++++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h -index 058cec5033..87f81febd2 100644 ---- a/libavcodec/v4l2_m2m.h -+++ b/libavcodec/v4l2_m2m.h -@@ -88,6 +88,7 @@ typedef struct V4L2m2mContext { - - /* null frame/packet received */ - int draining; -+ int running; - AVPacket buf_pkt; - - /* Reference to self; only valid while codec is active. */ -diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index d540d00bdd..6078811404 100644 ---- a/libavcodec/v4l2_m2m_dec.c -+++ b/libavcodec/v4l2_m2m_dec.c -@@ -622,7 +622,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) - const int t = - src_rv == NQ_Q_FULL ? -1 : - src_rv == NQ_DRAINING ? 300 : -- prefer_dq ? 5 : 0; -+ prefer_dq ? (s->running ? 100 : 5) : 0; - - // Dequeue frame will unref any previous contents of frame - // if it returns success so we don't need an explicit unref -@@ -639,6 +639,11 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) - } - } - -+ if (s->running != (dst_rv == 0) && prefer_dq) { -+ s->running = (dst_rv == 0); -+ av_log(avctx, AV_LOG_VERBOSE, "%s running\n", s->running ? "Start" : "Stop"); -+ } -+ - if (dst_rv == 0) - set_best_effort_pts(avctx, &s->pts_stat, frame); - -@@ -1006,7 +1011,8 @@ static void v4l2_decode_flush(AVCodecContext *avctx) - - // resend extradata - s->extdata_sent = 0; -- // clear EOS status vars -+ // clear status vars -+ s->running = 0; - s->draining = 0; - output->done = 0; - capture->done = 0; diff --git a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-003.patch b/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-003.patch deleted file mode 100644 index 8f5844c284..0000000000 --- a/projects/Amlogic/patches/ffmpeg/ffmpeg-hevc-003.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 840aae6cdcc1b1d3ef11da1c33a7ed6519a64cd6 Mon Sep 17 00:00:00 2001 -From: John Cox -Date: Fri, 13 Jan 2023 17:56:55 +0000 -Subject: [PATCH] Be much more relaxed before long timeout - ---- - libavcodec/v4l2_m2m.h | 2 +- - libavcodec/v4l2_m2m_dec.c | 20 ++++++++++++-------- - 2 files changed, 13 insertions(+), 9 deletions(-) - -diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h -index 87f81febd2..c109b21d08 100644 ---- a/libavcodec/v4l2_m2m.h -+++ b/libavcodec/v4l2_m2m.h -@@ -66,7 +66,7 @@ typedef struct pts_stats_s - - typedef struct xlat_track_s { - unsigned int track_no; -- int64_t last_pts; -+ int64_t last_pts; // Last valid PTS decoded - int64_t last_opaque; - V4L2m2mTrackEl track_els[FF_V4L2_M2M_TRACK_SIZE]; - } xlat_track_t; -diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index 6078811404..2bd113facb 100644 ---- a/libavcodec/v4l2_m2m_dec.c -+++ b/libavcodec/v4l2_m2m_dec.c -@@ -590,7 +590,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) - - do { - const int pending = xlat_pending(&s->xlat); -- const int prefer_dq = (pending > 3); -+ const int prefer_dq = (pending > 4); - const int last_src_rv = src_rv; - - av_log(avctx, AV_LOG_TRACE, "Pending=%d, src_rv=%d, req_pkt=%d\n", pending, src_rv, s->req_pkt); -@@ -619,10 +619,14 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) - // (b) enqueue returned a status indicating that decode should be attempted - if (dst_rv != 0 && TRY_DQ(src_rv)) { - // Pick a timeout depending on state -+ // The pending count isn't completely reliable so it is good enough -+ // hint that we want a frame but not good enough to require it in -+ // all cases; however if it has got > 31 that exceeds its margin of -+ // error so require a frame to prevent ridiculous levels of latency - const int t = - src_rv == NQ_Q_FULL ? -1 : - src_rv == NQ_DRAINING ? 300 : -- prefer_dq ? (s->running ? 100 : 5) : 0; -+ prefer_dq ? (s->running && pending > 31 ? 100 : 5) : 0; - - // Dequeue frame will unref any previous contents of frame - // if it returns success so we don't need an explicit unref -@@ -639,13 +643,13 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) - } - } - -- if (s->running != (dst_rv == 0) && prefer_dq) { -- s->running = (dst_rv == 0); -- av_log(avctx, AV_LOG_VERBOSE, "%s running\n", s->running ? "Start" : "Stop"); -- } -- -- if (dst_rv == 0) -+ if (dst_rv == 0) { - set_best_effort_pts(avctx, &s->pts_stat, frame); -+ if (!s->running) { -+ s->running = 1; -+ av_log(avctx, AV_LOG_VERBOSE, "Decode running\n"); -+ } -+ } - - if (dst_rv == AVERROR(EAGAIN) && src_rv == NQ_DRAINING) { - av_log(avctx, AV_LOG_WARNING, "Timeout in drain - assume EOF");