diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2e1c5efd02..23076c15c9 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="df0cc57e057f18e44dac8e6c18aba47ab53202f9" # 5.16.0 - PKG_SHA256="17f180ef85871ca76e1867f9f90bcdb7f98c45ddd9d15d55cc7a13a51fc83167" + PKG_VERSION="754e0b0e35608ed5206d6a67a791563c631cec07" # 5.17-rc4 + PKG_SHA256="5ac1f1703702e2ca3134d5fb8b2f082da221be17b5487ca441f0d1f0ffcdb775" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-896MB.patch index cf232f8074..c633303f76 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-HACK-set-meson-gx-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From d7c211e916097fc4b4cbf931a914a44d900f5014 Mon Sep 17 00:00:00 2001 -From: chewitt +From 4290b6bedb5220144768bb5c695d236eb885483b Mon Sep 17 00:00:00 2001 +From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 01/77] HACK: set meson-gx cma pool to 896MB +Subject: [PATCH 01/79] HACK: set meson-gx cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,10 +11,10 @@ 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 6b457b2c30a4..b87be6505a0d 100644 +index aa14ea017a61..99b8916e0c5d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -52,7 +52,7 @@ +@@ -58,7 +58,7 @@ linux,cma { compatible = "shared-dma-pool"; reusable; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-HACK-set-meson-g12-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-HACK-set-meson-g12-cma-pool-to-896MB.patch index 07dcde2063..ed83b601a6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-HACK-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-HACK-set-meson-g12-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From a7f18b31dc4d3fbe579016bf0858a7f55794c1fc Mon Sep 17 00:00:00 2001 -From: chewitt +From 82c334be5f5406c347711369167b2459f2d911d3 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 02/77] HACK: set meson-g12 cma pool to 896MB +Subject: [PATCH 02/79] HACK: set meson-g12 cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,10 +11,10 @@ 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 00c6f53290d4..93022e53c0db 100644 +index f84d4b489e0b..04da23119ff1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -110,7 +110,7 @@ +@@ -116,7 +116,7 @@ linux,cma { compatible = "shared-dma-pool"; reusable; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch index 9830e94771..06425e2fb9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-HACK-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From b566a3fd9a98747fd3ee6c14740aaacc85bde061 Mon Sep 17 00:00:00 2001 -From: chewitt +From cdfa35a1f50bd5d68dafa26ae2782d9f6bf9da5d Mon Sep 17 00:00:00 2001 +From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 03/77] HACK: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 03/79] HACK: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 6e27b759056a..4c3110aed4ea 100644 +index 591c18a889a5..fdd91a00a285 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -149,8 +149,7 @@ static int c_show(struct seq_file *m, void *v) +@@ -151,8 +151,7 @@ static int c_show(struct seq_file *m, void *v) * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-HACK-arm64-dts-meson-add-LibreELEC-device-tree-overl.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-HACK-arm64-dts-meson-add-LibreELEC-device-tree-overl.patch index 1e84d4d622..f9cbd8b2fd 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-HACK-arm64-dts-meson-add-LibreELEC-device-tree-overl.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-HACK-arm64-dts-meson-add-LibreELEC-device-tree-overl.patch @@ -1,7 +1,7 @@ -From 721ff83e8610a8e8402007e51f8f36973f695051 Mon Sep 17 00:00:00 2001 +From 497f3f78dca6ccc974eb98e959f38b778ff76ebd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 5 Jan 2022 15:03:06 +0000 -Subject: [PATCH 04/77] HACK: arm64: dts: meson: add LibreELEC device-tree +Subject: [PATCH 04/79] HACK: arm64: dts: meson: add LibreELEC device-tree overlays for Amlogic This commit implements a series of device-tree overlays used with LibreELEC diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch deleted file mode 100644 index 519b402725..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-dts-meson-gx-add-ATF-BL32-reserved-memory.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8e835ad2df84c79c873c36d9ded4fd86c3d446cc Mon Sep 17 00:00:00 2001 -From: kszaq -Date: Sat, 6 Jul 2019 07:54:44 +0000 -Subject: [PATCH 05/77] HACK: arm64: dts: meson-gx: add ATF BL32 reserved - memory region - -Vendor firmware/uboot has an additional reserved region for BL32 trusted -firmware. If a board uses BL32 firmware, booting kernel without knowledge -of this region would cause an immediate kernel panic on SError Interrupt. - -TODO: This should be enabled only for boards actually requiring it. - -Signed-off-by: kszaq ---- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index b87be6505a0d..99b8916e0c5d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -49,6 +49,12 @@ - no-map; - }; - -+ /* 32 MiB reserved for ARM Trusted Firmware (BL32) */ -+ secmon_reserved_bl32: secmon@5300000 { -+ reg = <0x0 0x05300000 0x0 0x2000000>; -+ no-map; -+ }; -+ - linux,cma { - compatible = "shared-dma-pool"; - reusable; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index ce4fa31385..c74a0b64ff 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-HACK-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,7 +1,7 @@ -From 466f8eb635b7f6772ff2f0951d3970e07aa35aa0 Mon Sep 17 00:00:00 2001 +From e1296fa0cb4e30e9e14edfc99005fc1d2af9109d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 06/77] HACK: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 05/79] HACK: 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-0007-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch index 793d6c8748..948a4b47bf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-HACK-arm64-dts-meson-add-support-for-GX-PM-and-Virtu.patch @@ -1,7 +1,7 @@ -From 5f7c9858e87b75218e44425f45ad3a6b1ee8c7d7 Mon Sep 17 00:00:00 2001 +From 7e7c283e3315df28a9176b48752d390520519b05 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 07/77] HACK: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 06/79] HACK: arm64: dts: meson: add support for GX PM and Virtual RTC Signed-off-by: Neil Armstrong diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch new file mode 100644 index 0000000000..8b804d06cc --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch @@ -0,0 +1,30 @@ +From da9fa4dff3dd9f2cee14ce7151e9ff33bf874343 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 21 Jan 2021 01:35:36 +0000 +Subject: [PATCH 07/79] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas + VIM + +Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 +while the onboard rtc chip claims /dev/rtc0. + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +index 6ab1cc125b96..24af15e18026 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +@@ -29,6 +29,8 @@ + aliases { + serial2 = &uart_AO_B; + ethernet0 = ðmac; ++ rtc0 = &rtc; ++ rtc1 = &vrtc; + }; + + gpio-keys-polled { +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch index b4a8aff73b..45c6c5646c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch @@ -1,30 +1,30 @@ -From f4a8614ff2443bee069ca662aec12896352abead Mon Sep 17 00:00:00 2001 +From 97bf74fe2a0008384d6c6bf6c7d39f86b641330d Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 08/77] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas - VIM +Date: Sat, 6 Nov 2021 13:01:08 +0000 +Subject: [PATCH 08/79] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas + VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 while the onboard rtc chip claims /dev/rtc0. Signed-off-by: Christian Hewitt --- - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 ++ + arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 6ab1cc125b96..24af15e18026 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -@@ -29,6 +29,8 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +index 86bdc0baf032..9c26d7489d2a 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +@@ -18,6 +18,8 @@ aliases { + serial0 = &uart_AO; serial2 = &uart_AO_B; - ethernet0 = ðmac; + rtc0 = &rtc; + rtc1 = &vrtc; }; - gpio-keys-polled { + chosen { -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch deleted file mode 100644 index f202351f43..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 32cc898fa236045510dbc0344f1219151b52c804 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 09/77] HACK: arm64: dts: meson: add rtc/vrtc aliases to Khadas - VIM2 - -Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 -while the onboard rtc chip claims /dev/rtc0. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index 86bdc0baf032..9c26d7489d2a 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -@@ -18,6 +18,8 @@ - aliases { - serial0 = &uart_AO; - serial2 = &uart_AO_B; -+ rtc0 = &rtc; -+ rtc1 = &vrtc; - }; - - chosen { --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch index a0bb019018..6dd5f5d32c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-HACK-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-N.patch @@ -1,7 +1,7 @@ -From 89698e2631788f852541b57b48ea78d463c81c33 Mon Sep 17 00:00:00 2001 +From fb0163661c5f464ef15cdc975bb0b17a0cc2013b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 10/77] HACK: arm64: dts: meson: add rtc/vrtc aliases to Minix +Subject: [PATCH 09/79] HACK: 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-0012-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch index 28ef57c565..9a1056cdf9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-HACK-usb-hub-disable-autosuspend-for-Genesys-Logic-H.patch @@ -1,7 +1,7 @@ -From 5828bcd04f4f2baa15cf6780c4976a8349abe25e Mon Sep 17 00:00:00 2001 +From ea43b475999dd27ee0d6d3dfe4a93a110564ad9e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 12/77] HACK: usb: hub: disable autosuspend for Genesys Logic +Subject: [PATCH 10/79] HACK: 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 00070a8a6507..63eea83b9308 100644 +index 47a1c8bddf86..588f3ded89cd 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5787,7 +5787,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5804,7 +5804,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-0013-HACK-of-partial-revert-of-fdt.c-changes.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-of-partial-revert-of-fdt.c-changes.patch similarity index 59% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-HACK-of-partial-revert-of-fdt.c-changes.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-of-partial-revert-of-fdt.c-changes.patch index a28da9e771..1523c4c17e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-HACK-of-partial-revert-of-fdt.c-changes.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-of-partial-revert-of-fdt.c-changes.patch @@ -1,7 +1,7 @@ -From 4bbf6486ea01d20c0760ebc4a8ac48b481831d46 Mon Sep 17 00:00:00 2001 +From a7e8bcc7ad1dabbb9ecb888ccd35b6f8805817f0 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Sep 2021 05:00:45 +0000 -Subject: [PATCH 13/77] HACK: of: partial revert of fdt.c changes +Subject: [PATCH 11/79] HACK: 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: @@ -10,22 +10,24 @@ since Linux 5.10; which are also causing crashes in some distros: Signed-off-by: Christian Hewitt --- - drivers/of/fdt.c | 7 ------- - 1 file changed, 7 deletions(-) + drivers/of/fdt.c | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index bdca35284ceb..674d12e37e65 100644 +index ad85ff6474ff..6af91acf0892 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -480,13 +480,6 @@ static int __init early_init_dt_reserve_memory_arch(phys_addr_t base, +@@ -481,15 +481,6 @@ static int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { if (nomap) { - /* - * If the memory is already reserved (by another region), we -- * should not allow it to be marked nomap. +- * should not allow it to be marked nomap, but don't worry +- * if the region isn't memory as it won't be mapped. - */ -- if (memblock_is_region_reserved(base, size)) +- if (memblock_overlaps_region(&memblock.memory, base, size) && +- memblock_is_region_reserved(base, size)) - return -EBUSY; - return memblock_mark_nomap(base, size); diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-arm64-dts-meson-add-common-SM1-ac2xx-dts.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-5.18-arm64-dts-meson-add-common-SM1-ac2xx-dt.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-arm64-dts-meson-add-common-SM1-ac2xx-dts.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-5.18-arm64-dts-meson-add-common-SM1-ac2xx-dt.patch index ef17c9d40d..a2e618d23b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-arm64-dts-meson-add-common-SM1-ac2xx-dts.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-5.18-arm64-dts-meson-add-common-SM1-ac2xx-dt.patch @@ -1,7 +1,7 @@ -From 9854ebc66143c8f8b8ed5679a0e9a2b25915830c Mon Sep 17 00:00:00 2001 +From 3d6a62db16253f725f40a78d948a79c8c6348ddd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 24 Jun 2020 12:41:46 +0000 -Subject: [PATCH 41/77] FROMLIST(v2): arm64: dts: meson: add common SM1 ac2xx +Subject: [PATCH 12/79] FROMGIT(5.18): arm64: dts: meson: add common SM1 ac2xx dtsi Add a common dtsi for Android STB devices based on the Amlogic S905X3 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v2-dt-bindings-arm-amlogic-add-X96-AIR-bind.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-5.18-dt-bindings-arm-amlogic-add-X96-AIR-bin.patch similarity index 79% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v2-dt-bindings-arm-amlogic-add-X96-AIR-bind.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-5.18-dt-bindings-arm-amlogic-add-X96-AIR-bin.patch index 56c25f122c..682898564d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v2-dt-bindings-arm-amlogic-add-X96-AIR-bind.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-5.18-dt-bindings-arm-amlogic-add-X96-AIR-bin.patch @@ -1,7 +1,7 @@ -From 708ae83c0b6398e81236b17aed67643ca5e3b643 Mon Sep 17 00:00:00 2001 +From bc1a7ffff53ede718e540daf4c7a5fc7d9e4f33a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 18 May 2020 23:23:40 +0000 -Subject: [PATCH 40/77] FROMLIST(v2): dt-bindings: arm: amlogic: add X96-AIR +Subject: [PATCH 13/79] FROMGIT(5.18): dt-bindings: arm: amlogic: add X96-AIR bindings Add board bindings for the Amediatech X96-AIR STB which ships with @@ -15,7 +15,7 @@ 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 9176ba3eebab..7c3627d9c773 100644 +index 36081734f720..089d08219cc8 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -170,6 +170,8 @@ properties: @@ -25,8 +25,8 @@ index 9176ba3eebab..7c3627d9c773 100644 + - amediatech,x96-air + - amediatech,x96-air-gbit - bananapi,bpi-m5 - - cyx,a95xf3-air - - cyx,a95xf3-air-gbit + - hardkernel,odroid-c4 + - hardkernel,odroid-hc4 -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch index 6a6de82acf..35bdb640d0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch @@ -1,7 +1,7 @@ -From ee72a1f9a0dd42a12b5e944cfcc624c77cb4a9f7 Mon Sep 17 00:00:00 2001 +From 153f02ce3bc582ce848aace67e312a091c40a101 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 24 Jun 2020 15:04:10 +0000 -Subject: [PATCH 39/77] FROMLIST(v2): arm64: dts: meson: add initial +Subject: [PATCH 14/79] FROMGIT(5.18): arm64: dts: meson: add initial device-trees for X96-AIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -39,10 +39,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 606bdca0fe9e..f7aea90c7f2a 100644 +index 19d4d75305af..411f0ff1c14f 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -59,6 +59,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb +@@ -56,6 +56,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-sm1-odroid-add-cec-nodes.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-sm1-odroid-add-cec-nodes.patch deleted file mode 100644 index ada88ee6d5..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-arm64-dts-meson-sm1-odroid-add-cec-nodes.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77a3c4f6720005e4cbcb6575f92adf9744837e2d Mon Sep 17 00:00:00 2001 -From: Dmitry Shmidt -Date: Fri, 8 Oct 2021 03:54:31 +0000 -Subject: [PATCH 14/77] FROMGIT: arm64: dts: meson-sm1-odroid: add cec nodes - -Enable CEC in same way it is done for other meson odroid devices - -Signed-off-by: Dmitry Shmidt ---- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 5779e70caccd..0bd1e98a0eef 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -@@ -225,6 +225,20 @@ - 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"; -+ status = "okay"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ - &clkc_audio { - status = "okay"; - }; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-dt-bindings-vendor-prefixes-add-cyx-pref.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-cyx-pre.patch similarity index 80% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-dt-bindings-vendor-prefixes-add-cyx-pref.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-cyx-pre.patch index 5d28626444..35cd6d251e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-dt-bindings-vendor-prefixes-add-cyx-pref.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-cyx-pre.patch @@ -1,7 +1,7 @@ -From 9e14ce133cd6f3b7a7461e580f3ee0b9e6a2f672 Mon Sep 17 00:00:00 2001 +From 49fb9e342c99911bef56d0770aedab7a0a7bfaac Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 30 Nov 2021 05:00:45 +0000 -Subject: [PATCH 38/77] FROMLIST(v2): dt-bindings: vendor-prefixes: add cyx +Subject: [PATCH 15/79] FROMGIT(5.18): dt-bindings: vendor-prefixes: add cyx prefix Shenzhen CYX Industrial Co., Ltd are a manufacturer of Android @@ -14,10 +14,10 @@ Acked-by: Rob Herring 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index eddc8a3a07c2..52ff63248892 100644 +index 294093d45a23..7504538a7716 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -279,6 +279,8 @@ patternProperties: +@@ -283,6 +283,8 @@ patternProperties: description: CUI Devices "^cypress,.*": description: Cypress Semiconductor Corporation diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-thermal-zone.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-thermal-zone.patch deleted file mode 100644 index 513460676a..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-thermal-zone.patch +++ /dev/null @@ -1,150 +0,0 @@ -From b93b60c5c35856fa119dacf7c4e275ec1ed6cb27 Mon Sep 17 00:00:00 2001 -From: Alexander Stein -Date: Fri, 26 Nov 2021 15:46:30 +0000 -Subject: [PATCH 15/77] FROMGIT: arm64: dts: amlogic: meson-g12: Fix - thermal-zones indent - -This node is currently at /soc/thermal-zones, but the later introduced -bindings in commit 1202a442a31f ("dt-bindings: thermal: Add yaml bindings -for thermal zones") put this at /thermal-zones. -Fix dtb_check warning by moving the thermal-zones node to / - -Signed-off-by: Alexander Stein -Reviewed-by: Neil Armstrong -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20211026182813.900775-1-alexander.stein@mailbox.org ---- - .../boot/dts/amlogic/meson-g12-common.dtsi | 110 +++++++++--------- - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 93022e53c0db..524188b3344c 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -159,61 +159,6 @@ - status = "disabled"; - }; - -- thermal-zones { -- cpu_thermal: cpu-thermal { -- polling-delay = <1000>; -- polling-delay-passive = <100>; -- thermal-sensors = <&cpu_temp>; -- -- trips { -- cpu_passive: cpu-passive { -- temperature = <85000>; /* millicelsius */ -- hysteresis = <2000>; /* millicelsius */ -- type = "passive"; -- }; -- -- cpu_hot: cpu-hot { -- temperature = <95000>; /* millicelsius */ -- hysteresis = <2000>; /* millicelsius */ -- type = "hot"; -- }; -- -- cpu_critical: cpu-critical { -- temperature = <110000>; /* millicelsius */ -- hysteresis = <2000>; /* millicelsius */ -- type = "critical"; -- }; -- }; -- }; -- -- ddr_thermal: ddr-thermal { -- polling-delay = <1000>; -- polling-delay-passive = <100>; -- thermal-sensors = <&ddr_temp>; -- -- trips { -- ddr_passive: ddr-passive { -- temperature = <85000>; /* millicelsius */ -- hysteresis = <2000>; /* millicelsius */ -- type = "passive"; -- }; -- -- ddr_critical: ddr-critical { -- temperature = <110000>; /* millicelsius */ -- hysteresis = <2000>; /* millicelsius */ -- type = "critical"; -- }; -- }; -- -- cooling-maps { -- map { -- trip = <&ddr_passive>; -- cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -- }; -- }; -- }; -- }; -- - ethmac: ethernet@ff3f0000 { - compatible = "amlogic,meson-g12a-dwmac", - "snps,dwmac-3.70a", -@@ -2415,6 +2360,61 @@ - }; - }; - -+ thermal-zones { -+ cpu_thermal: cpu-thermal { -+ polling-delay = <1000>; -+ polling-delay-passive = <100>; -+ thermal-sensors = <&cpu_temp>; -+ -+ trips { -+ cpu_passive: cpu-passive { -+ temperature = <85000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "passive"; -+ }; -+ -+ cpu_hot: cpu-hot { -+ temperature = <95000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "hot"; -+ }; -+ -+ cpu_critical: cpu-critical { -+ temperature = <110000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "critical"; -+ }; -+ }; -+ }; -+ -+ ddr_thermal: ddr-thermal { -+ polling-delay = <1000>; -+ polling-delay-passive = <100>; -+ thermal-sensors = <&ddr_temp>; -+ -+ trips { -+ ddr_passive: ddr-passive { -+ temperature = <85000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "passive"; -+ }; -+ -+ ddr_critical: ddr-critical { -+ temperature = <110000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "critical"; -+ }; -+ }; -+ -+ cooling-maps { -+ map { -+ trip = <&ddr_passive>; -+ cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+ }; -+ }; -+ - timer { - compatible = "arm,armv8-timer"; - interrupts = Date: Mon, 29 Jun 2020 15:54:45 +0000 -Subject: [PATCH 37/77] FROMLIST(v2): dt-bindings: arm: amlogic: add A95XF3-AIR - bindings +Subject: [PATCH 16/79] FROMGIT(5.18): dt-bindings: arm: amlogic: add + A95XF3-AIR bindings Add board bindings for the CYX A95XF3-AIR set-top box which ships with model variants distiguished by Ethernet configuration: models @@ -15,18 +15,18 @@ 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 294c1948c25a..9176ba3eebab 100644 +index 089d08219cc8..a1a1b3036da6 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -171,6 +171,8 @@ properties: - items: - - enum: +@@ -173,6 +173,8 @@ properties: + - amediatech,x96-air + - amediatech,x96-air-gbit - bananapi,bpi-m5 + - cyx,a95xf3-air + - cyx,a95xf3-air-gbit - hardkernel,odroid-c4 - hardkernel,odroid-hc4 - - haochuangyi,h96-max + - khadas,vim3l -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-GPU-operatin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-GPU-operatin.patch deleted file mode 100644 index 7c61b04a67..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-arm64-dts-amlogic-meson-g12-Fix-GPU-operatin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2f0f9aacc3bd2d12a89cfb02aa8e7eb999f57243 Mon Sep 17 00:00:00 2001 -From: Alexander Stein -Date: Fri, 26 Nov 2021 15:47:31 +0000 -Subject: [PATCH 16/77] FROMGIT: arm64: dts: amlogic: meson-g12: Fix GPU - operating point table node name - -Starting with commit 94274f20f6bf ("dt-bindings: opp: Convert to DT -schema") the opp node name has a mandatory pattern. This change -fixes the dtbs_check warning: -gpu-opp-table: $nodename:0: 'gpu-opp-table' does not match -'^opp-table(-[a-z0-9]+)?$' -Put the 'gpu' part at the end to match the pattern. - -Fixes: 916a0edc43f0 ("arm64: dts: amlogic: meson-g12: add the Mali OPP table and use DVFS") -Reviewed-by: Neil Armstrong -Signed-off-by: Alexander Stein -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20211026182813.900775-2-alexander.stein@mailbox.org ---- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- - 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 524188b3344c..4f4c8e7d79d2 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -58,7 +58,7 @@ - secure-monitor = <&sm>; - }; - -- gpu_opp_table: gpu-opp-table { -+ gpu_opp_table: opp-table-gpu { - compatible = "operating-points-v2"; - - opp-124999998 { --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch index e8fd1e88be..ef74a243c0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v2-arm64-dts-meson-add-initial-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch @@ -1,7 +1,7 @@ -From f0c7f685364f815b3de538f9dbede0edfe0ea82f Mon Sep 17 00:00:00 2001 +From 1c140988f539c40738320b11b54b8a1542025fb1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 3 Jun 2020 18:03:22 +0000 -Subject: [PATCH 36/77] FROMLIST(v2): arm64: dts: meson: add initial +Subject: [PATCH 17/79] FROMGIT(5.18): arm64: dts: meson: add initial device-trees for A95XF3-AIR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -39,7 +39,7 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 0b7362d7cbcd..606bdca0fe9e 100644 +index 411f0ff1c14f..dfbdeeba4e53 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -51,6 +51,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb @@ -49,8 +49,8 @@ index 0b7362d7cbcd..606bdca0fe9e 100644 +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts new file mode 100644 index 000000000000..d1debccdc1c2 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-arm64-dts-amlogic-Fix-SPI-NOR-flash-node-nam.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-arm64-dts-amlogic-Fix-SPI-NOR-flash-node-nam.patch deleted file mode 100644 index 36eb9de0e6..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-arm64-dts-amlogic-Fix-SPI-NOR-flash-node-nam.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0ace998e449d8b64ad0c6adc32fa339aa2986671 Mon Sep 17 00:00:00 2001 -From: Alexander Stein -Date: Fri, 26 Nov 2021 15:48:22 +0000 -Subject: [PATCH 17/77] FROMGIT: arm64: dts: amlogic: Fix SPI NOR flash node - name for ODROID N2/N2+ - -Fix the schema warning: "spi-flash@0: $nodename:0: 'spi-flash@0' does - not match '^flash(@.*)?$'" from jedec,spi-nor.yaml - -Fixes: a084eaf3096c ("arm64: dts: meson-g12b-odroid-n2: add SPIFC controller node") -Reviewed-by: Neil Armstrong -Signed-off-by: Alexander Stein -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20211026182813.900775-3-alexander.stein@mailbox.org ---- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index e8a00a2f8812..3e968b244191 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -609,7 +609,7 @@ - pinctrl-0 = <&nor_pins>; - pinctrl-names = "default"; - -- mx25u64: spi-flash@0 { -+ mx25u64: flash@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "mxicy,mx25u6435f", "jedec,spi-nor"; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-dt-bindings-vendor-prefixes-add-haochuan.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-haochua.patch similarity index 81% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-dt-bindings-vendor-prefixes-add-haochuan.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-haochua.patch index 8e09746473..43a0726e98 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-dt-bindings-vendor-prefixes-add-haochuan.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-5.18-dt-bindings-vendor-prefixes-add-haochua.patch @@ -1,7 +1,7 @@ -From e328e118c8c2555ee3fd5cf761f7be750ca1ad28 Mon Sep 17 00:00:00 2001 +From ecf2e316cd2ee056bfec79a4bee60e4bff2c4b37 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Jan 2021 17:24:07 +0000 -Subject: [PATCH 35/77] FROMLIST(v2): dt-bindings: vendor-prefixes: add +Subject: [PATCH 18/79] FROMGIT(5.18): dt-bindings: vendor-prefixes: add haochuangyi prefix Shenzhen Haochuangyi Technology Co.,Ltd are a manufacturer of Android @@ -14,10 +14,10 @@ Acked-by: Rob Herring 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 66d6432fd781..eddc8a3a07c2 100644 +index 7504538a7716..0d8da47cda1a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -481,6 +481,8 @@ patternProperties: +@@ -491,6 +491,8 @@ patternProperties: deprecated: true "^hannstar,.*": description: HannStar Display Corporation diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-HDMI-in-early.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-HDMI-in-early.patch deleted file mode 100644 index c032d15e84..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-HDMI-in-early.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 34c582c0d2a9387984c73f5c83ab621fe723ceed Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 12 Oct 2021 04:47:14 +0000 -Subject: [PATCH 18/77] FROMGIT: arm64: dts: meson-gxbb-wetek: fix HDMI in - early boot - -Mark the VDDIO_AO18 regulator always-on and set hdmi-supply for the hdmi_tx -node to ensure HDMI is powered in the early stages of boot. - -Fixes: fb72c03e0e32 ("ARM64: dts: meson-gxbb-wetek: add a wetek specific dtsi to cleanup hub and play2") - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -index a350fee1264d..8e2af986ceba 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -@@ -64,6 +64,7 @@ - regulator-name = "VDDIO_AO18"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; -+ regulator-always-on; - }; - - vcc_3v3: regulator-vcc_3v3 { -@@ -161,6 +162,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&vddio_ao18>; - }; - - &hdmi_tx_tmds_port { --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-dt-bindings-arm-amlogic-add-H96-Max-bind.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-5.18-dt-bindings-arm-amlogic-add-H96-Max-bin.patch similarity index 76% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-dt-bindings-arm-amlogic-add-H96-Max-bind.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-5.18-dt-bindings-arm-amlogic-add-H96-Max-bin.patch index c90d300e9f..6706372764 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-dt-bindings-arm-amlogic-add-H96-Max-bind.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-5.18-dt-bindings-arm-amlogic-add-H96-Max-bin.patch @@ -1,7 +1,7 @@ -From 677ac5ae62575e7f0a478e48a6ac0b2d12238414 Mon Sep 17 00:00:00 2001 +From 24420b9ed027ca126fee4983efab5d9524e26e00 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Jan 2021 17:25:33 +0000 -Subject: [PATCH 34/77] FROMLIST(v2): dt-bindings: arm: amlogic: add H96-Max +Subject: [PATCH 19/79] FROMGIT(5.18): dt-bindings: arm: amlogic: add H96-Max bindings Add the board binding for the Haochuangyi H96-Max STB device. @@ -13,11 +13,11 @@ Acked-by: Rob Herring 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 36081734f720..294c1948c25a 100644 +index a1a1b3036da6..7c3627d9c773 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -173,6 +173,7 @@ properties: - - bananapi,bpi-m5 +@@ -177,6 +177,7 @@ properties: + - cyx,a95xf3-air-gbit - hardkernel,odroid-c4 - hardkernel,odroid-hc4 + - haochuangyi,h96-max diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-missing-GPIO-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-missing-GPIO-.patch deleted file mode 100644 index 47fca47df2..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-arm64-dts-meson-gxbb-wetek-fix-missing-GPIO-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 697b8893eeadfcbd62eea066419166bb2cab2e0b Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 12 Oct 2021 05:13:06 +0000 -Subject: [PATCH 19/77] FROMGIT: arm64: dts: meson-gxbb-wetek: fix missing GPIO - binding - -The absence of this binding appears to be harmless in Linux but it breaks -Ethernet support in mainline u-boot. So add the binding (which is present -in all other u-boot supported GXBB device-trees). - -Fixes: fb72c03e0e32 ("ARM64: dts: meson-gxbb-wetek: add a wetek specific dtsi to cleanup hub and play2") - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -index 8e2af986ceba..a4d34398da35 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -@@ -6,6 +6,7 @@ - */ - - #include "meson-gxbb.dtsi" -+#include - - / { - aliases { --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-arm64-dts-meson-add-initial-device-tree-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-arm64-dts-meson-add-initial-device-tree-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch index f005998dd7..03aaaf6c90 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-arm64-dts-meson-add-initial-device-tree-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-5.18-arm64-dts-meson-add-initial-device-tree.patch @@ -1,7 +1,7 @@ -From 627858999ee04d5641d484ccbe8c75f0bd011c57 Mon Sep 17 00:00:00 2001 +From b7f9a33840d2fe071c40ad5bcc76d08e9064f935 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Jan 2021 17:26:42 +0000 -Subject: [PATCH 33/77] FROMLIST(v2): arm64: dts: meson: add initial +Subject: [PATCH 20/79] FROMGIT(5.18): arm64: dts: meson: add initial device-tree for H96-Max The Haochuangyi H96-Max is based on the Amlogic S905X3 reference @@ -30,12 +30,12 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 19d4d75305af..0b7362d7cbcd 100644 +index dfbdeeba4e53..f7aea90c7f2a 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb +@@ -54,6 +54,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-sm1-a95xf3-air-gbit.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-sm1-h96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-arm64-dts-meson-gxbb-wetek-use-updated-LED-b.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-arm64-dts-meson-gxbb-wetek-use-updated-LED-b.patch deleted file mode 100644 index dd8850c95e..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-arm64-dts-meson-gxbb-wetek-use-updated-LED-b.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8f8ba5482f2214fec28e6c5fbd47939f46063638 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 12 Oct 2021 04:58:38 +0000 -Subject: [PATCH 20/77] FROMGIT: arm64: dts: meson-gxbb-wetek: use updated LED - bindings - -Update the dts to use the newer style of LED bindings. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -index a4d34398da35..94dafb955301 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -@@ -7,6 +7,7 @@ - - #include "meson-gxbb.dtsi" - #include -+#include - - / { - aliases { -@@ -26,8 +27,10 @@ - leds { - compatible = "gpio-leds"; - -- led-system { -- label = "wetek-play:system-status"; -+ led-power { -+ /* red in suspend or power-off */ -+ color = ; -+ function = LED_FUNCTION_POWER; - gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>; - default-state = "on"; - panic-indicator; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v1-arm64-dts-meson-sm1-add-spdifin-spdifout.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-5.18-arm64-dts-meson-sm1-add-spdifin-spdifou.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v1-arm64-dts-meson-sm1-add-spdifin-spdifout.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-5.18-arm64-dts-meson-sm1-add-spdifin-spdifou.patch index 3c57b51846..961a8025ef 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v1-arm64-dts-meson-sm1-add-spdifin-spdifout.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-5.18-arm64-dts-meson-sm1-add-spdifin-spdifou.patch @@ -1,7 +1,7 @@ -From 27d799c1243f03068612e61606972197f6298c95 Mon Sep 17 00:00:00 2001 +From 252f42ad7f86eb216bd3210841ae19236391303e Mon Sep 17 00:00:00 2001 From: Artem Lapkin Date: Thu, 16 Dec 2021 16:10:58 +0000 -Subject: [PATCH 46/77] FROMLIST(v1): arm64: dts: meson-sm1: add spdifin +Subject: [PATCH 21/79] FROMGIT(5.18): arm64: dts: meson-sm1: add spdifin spdifout nodes Add spdifin spdifout nodes for Amlogic SM1 SoCs. @@ -12,10 +12,10 @@ Signed-off-by: Artem Lapkin 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -index 78bdbd2ccc9d..a685dabde5d3 100644 +index 3d8b1f4f2001..1e0adf259d61 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -@@ -336,6 +336,33 @@ +@@ -356,6 +356,33 @@ status = "disabled"; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-arm64-dts-meson-p241-add-vcc_5v-regulator.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-arm64-dts-meson-p241-add-vcc_5v-regulator.patch deleted file mode 100644 index c3928630f5..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-arm64-dts-meson-p241-add-vcc_5v-regulator.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0584dd68daa1e54069edd2f42a6ee2cb0252e0e1 Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Tue, 30 Nov 2021 14:08:06 +0000 -Subject: [PATCH 21/77] FROMGIT: arm64: dts: meson: p241: add vcc_5v regulator - -Add the VCC_5V regulator, which feeds the HDMI, USB and audio amplifier. - -Signed-off-by: Jerome Brunet -Reviewed-by: Neil Armstrong -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20211130100159.214489-2-jbrunet@baylibre.com ---- - .../arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -index eb7f5a3fefd4..9d0684a8264b 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -@@ -84,6 +84,14 @@ - regulator-max-microvolt = <3300000>; - }; - -+ vcc_5v: regulator-vcc-5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_5V"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ }; -+ -+ - emmc_pwrseq: emmc-pwrseq { - compatible = "mmc-pwrseq-emmc"; - reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; -@@ -136,6 +144,7 @@ - status = "okay"; - pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; - pinctrl-names = "default"; -+ hdmi-supply = <&vcc_5v>; - }; - - &hdmi_tx_tmds_port { -@@ -220,3 +229,7 @@ - status = "okay"; - dr_mode = "host"; - }; -+ -+&usb2_phy0 { -+ phy-supply = <&vcc_5v>; -+}; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-arm64-dts-meson-g12-common-add-more-pwm_.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-5.18-arm64-dts-meson-g12-common-add-more-pwm.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-arm64-dts-meson-g12-common-add-more-pwm_.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-5.18-arm64-dts-meson-g12-common-add-more-pwm.patch index b17d2419d0..6cc301eb62 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-arm64-dts-meson-g12-common-add-more-pwm_.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-5.18-arm64-dts-meson-g12-common-add-more-pwm.patch @@ -1,7 +1,7 @@ -From 37d980a916b47746c71803f4dd97e02ffde6b394 Mon Sep 17 00:00:00 2001 +From 58311e9ff339cadb745aa8a0a247d70228e4c8a2 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 3 Jan 2022 16:51:30 +0000 -Subject: [PATCH 48/77] FROMLIST(v1): arm64: dts: meson-g12-common: add more +Subject: [PATCH 22/79] FROMGIT(5.18): arm64: dts: meson-g12-common: add more pwm_f options Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. @@ -12,10 +12,10 @@ Signed-off-by: Gary Bisson 1 file 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 4f4c8e7d79d2..8fdf6890b370 100644 +index 04da23119ff1..d54f2a2bdea2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -839,6 +839,22 @@ +@@ -845,6 +845,22 @@ }; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-arm64-dts-meson-g12-common-add-uart_ao_b.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-5.18-arm64-dts-meson-g12-common-add-uart_ao_.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-arm64-dts-meson-g12-common-add-uart_ao_b.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-5.18-arm64-dts-meson-g12-common-add-uart_ao_.patch index 351c0f35a9..141d83cd8e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-arm64-dts-meson-g12-common-add-uart_ao_b.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-5.18-arm64-dts-meson-g12-common-add-uart_ao_.patch @@ -1,7 +1,7 @@ -From 647d7a18a915e24e0e2708aa155ad7c7128863ca Mon Sep 17 00:00:00 2001 +From 5ebb2c1be918277a5ae6fbc35a7f518622887b22 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 3 Jan 2022 16:52:18 +0000 -Subject: [PATCH 49/77] FROMLIST(v1): arm64: dts: meson-g12-common: add +Subject: [PATCH 23/79] FROMGIT(5.18): arm64: dts: meson-g12-common: add uart_ao_b pins muxing - RX/TX signals can be mapped on 2 different pairs of pins so supporting @@ -14,10 +14,10 @@ Signed-off-by: Gary Bisson 1 file changed, 27 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 8fdf6890b370..282962e856aa 100644 +index d54f2a2bdea2..3a330c9b0e5e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -1897,6 +1897,33 @@ +@@ -1903,6 +1903,33 @@ }; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-clk-meson-gxbb-Fix-the-SDM_EN-bit-for-MPLL0-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-clk-meson-gxbb-Fix-the-SDM_EN-bit-for-MPLL0-.patch deleted file mode 100644 index 942d868298..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-clk-meson-gxbb-Fix-the-SDM_EN-bit-for-MPLL0-.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 8e68c2813b04d3d82ba9c763612cd47f3b116aeb Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Sat, 16 Oct 2021 13:45:35 +0000 -Subject: [PATCH 23/77] FROMGIT: clk: meson: gxbb: Fix the SDM_EN bit for MPLL0 - on GXBB - -There are reports that 48kHz audio does not work on his WeTek Play 2 -(which uses a GXBB SoC), while 44.1kHz audio works fine on the same -board. There are also reports of 48kHz audio working fine on GXL and -GXM SoCs, which are using an (almost) identical AIU (audio controller). - -Experimenting has shown that MPLL0 is causing this problem. In the .dts -we have by default: - - assigned-clocks = <&clkc CLKID_MPLL0>, - <&clkc CLKID_MPLL1>, - <&clkc CLKID_MPLL2>; - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; - -The MPLL0 rate is divisible by 48kHz without remainder and the MPLL1 -rate is divisible by 44.1kHz without remainder. Swapping these two clock -rates "fixes" 48kHz audio but breaks 44.1kHz audio. - -Everything looks normal when looking at the info provided by the common -clock framework while playing 48kHz audio (via I2S with mclk-fs = 256): - mpll_prediv 1 1 0 2000000000 - mpll0_div 1 1 0 294909641 - mpll0 1 1 0 294909641 - cts_amclk_sel 1 1 0 294909641 - cts_amclk_div 1 1 0 12287902 - cts_amclk 1 1 0 12287902 - -meson-clk-msr however shows that the actual MPLL0 clock is off by more -than 38MHz: - mp0_out 333322917 +/-10416Hz - -The rate seen by meson-clk-msr is very close to what we would get when -SDM (the fractional part) was ignored: - - (2000000000Hz * 16384) / ((16384 * 6) = 333.33MHz -If SDM was considered the we should get close to: - (2000000000Hz * 16384) / ((16384 * 6) + 12808) = 294.9MHz - -Further experimenting shows that HHI_MPLL_CNTL7[15] does not have any -effect on the rate of MPLL0 as seen my meson-clk-msr (regardless of -whether that bit is zero or one the rate is always the same according to -meson-clk-msr). Using HHI_MPLL_CNTL[25] on the other hand as SDM_EN -results in SDM being considered for the rate output by the hardware. The -rate - as seen by meson-clk-msr - matches with what we expect when -SDM_EN is enabled (fractional part is being considered, resulting in a -294.9MHz output) or disable (fractional part being ignored, resulting in -a 333.33MHz output). - -Reported-by: Christian Hewitt -Suggested-by: Jerome Brunet -Signed-off-by: Martin Blumenstingl ---- - drivers/clk/meson/gxbb.c | 44 +++++++++++++++++++++++++++++++++++++--- - 1 file changed, 41 insertions(+), 3 deletions(-) - -diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c -index d6eed760327d..608e0e8ca49a 100644 ---- a/drivers/clk/meson/gxbb.c -+++ b/drivers/clk/meson/gxbb.c -@@ -713,6 +713,35 @@ static struct clk_regmap gxbb_mpll_prediv = { - }; - - static struct clk_regmap gxbb_mpll0_div = { -+ .data = &(struct meson_clk_mpll_data){ -+ .sdm = { -+ .reg_off = HHI_MPLL_CNTL7, -+ .shift = 0, -+ .width = 14, -+ }, -+ .sdm_en = { -+ .reg_off = HHI_MPLL_CNTL, -+ .shift = 25, -+ .width = 1, -+ }, -+ .n2 = { -+ .reg_off = HHI_MPLL_CNTL7, -+ .shift = 16, -+ .width = 9, -+ }, -+ .lock = &meson_clk_lock, -+ }, -+ .hw.init = &(struct clk_init_data){ -+ .name = "mpll0_div", -+ .ops = &meson_clk_mpll_ops, -+ .parent_hws = (const struct clk_hw *[]) { -+ &gxbb_mpll_prediv.hw -+ }, -+ .num_parents = 1, -+ }, -+}; -+ -+static struct clk_regmap gxl_mpll0_div = { - .data = &(struct meson_clk_mpll_data){ - .sdm = { - .reg_off = HHI_MPLL_CNTL7, -@@ -749,7 +778,16 @@ static struct clk_regmap gxbb_mpll0 = { - .hw.init = &(struct clk_init_data){ - .name = "mpll0", - .ops = &clk_regmap_gate_ops, -- .parent_hws = (const struct clk_hw *[]) { &gxbb_mpll0_div.hw }, -+ .parent_data = &(const struct clk_parent_data) { -+ /* -+ * Note: -+ * GXL and GXBB have different SDM_EN registers. We -+ * fallback to the global naming string mechanism so -+ * mpll0_div picks up the appropriate one. -+ */ -+ .name = "mpll0_div", -+ .index = -1, -+ }, - .num_parents = 1, - .flags = CLK_SET_RATE_PARENT, - }, -@@ -3044,7 +3082,7 @@ static struct clk_hw_onecell_data gxl_hw_onecell_data = { - [CLKID_VAPB_1] = &gxbb_vapb_1.hw, - [CLKID_VAPB_SEL] = &gxbb_vapb_sel.hw, - [CLKID_VAPB] = &gxbb_vapb.hw, -- [CLKID_MPLL0_DIV] = &gxbb_mpll0_div.hw, -+ [CLKID_MPLL0_DIV] = &gxl_mpll0_div.hw, - [CLKID_MPLL1_DIV] = &gxbb_mpll1_div.hw, - [CLKID_MPLL2_DIV] = &gxbb_mpll2_div.hw, - [CLKID_MPLL_PREDIV] = &gxbb_mpll_prediv.hw, -@@ -3439,7 +3477,7 @@ static struct clk_regmap *const gxl_clk_regmaps[] = { - &gxbb_mpll0, - &gxbb_mpll1, - &gxbb_mpll2, -- &gxbb_mpll0_div, -+ &gxl_mpll0_div, - &gxbb_mpll1_div, - &gxbb_mpll2_div, - &gxbb_cts_amclk_div, --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-ath10k-Fix-the-MTU-size-on-QCA9377-SDIO.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-ath10k-Fix-the-MTU-size-on-QCA9377-SDIO.patch deleted file mode 100644 index a75b7f2f9c..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-ath10k-Fix-the-MTU-size-on-QCA9377-SDIO.patch +++ /dev/null @@ -1,706 +0,0 @@ -From 91903600088de81fd90af27b44f28838a8de3cef Mon Sep 17 00:00:00 2001 -From: Fabio Estevam -Date: Wed, 24 Nov 2021 13:20:05 +0000 -Subject: [PATCH 24/77] FROMGIT: ath10k: Fix the MTU size on QCA9377 SDIO - -On an imx6dl-pico-pi board with a QCA9377 SDIO chip, simply trying to -connect via ssh to another machine causes: - -[ 55.824159] ath10k_sdio mmc1:0001:1: failed to transmit packet, dropping: -12 -[ 55.832169] ath10k_sdio mmc1:0001:1: failed to submit frame: -12 -[ 55.838529] ath10k_sdio mmc1:0001:1: failed to push frame: -12 -[ 55.905863] ath10k_sdio mmc1:0001:1: failed to transmit packet, dropping: -12 -[ 55.913650] ath10k_sdio mmc1:0001:1: failed to submit frame: -12 -[ 55.919887] ath10k_sdio mmc1:0001:1: failed to push frame: -12 - -leading to an ssh connection failure. - -One user inspected the size of frames on Wireshark and reported -the followig: - -"I was able to narrow the issue down to the mtu. If I set the mtu for -the wlan0 device to 1486 instead of 1500, the issue does not happen. - -The size of frames that I see on Wireshark is exactly 1500 after -setting it to 1486." - -Clearing the HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE avoids the problem and -the ssh command works successfully after that. - -Introduce a 'credit_size_workaround' field to ath10k_hw_params for -the QCA9377 SDIO, so that the HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE -is not set in this case. - -Tested with QCA9377 SDIO with firmware WLAN.TF.1.1.1-00061-QCATFSWPZ-1. - -Fixes: 2f918ea98606 ("ath10k: enable alt data of TX path for sdio") -Signed-off-by: Fabio Estevam -Signed-off-by: Kalle Valo ---- - .../boot/dts/amlogic/meson-sm1-ac2xx.ok.dtsi | 375 ++++++++++++++++++ - .../dts/amlogic/meson-sm1-x96-air-100.ok.dts | 106 +++++ - drivers/net/wireless/ath/ath10k/core.c | 19 +- - drivers/net/wireless/ath/ath10k/hw.h | 3 + - 4 files changed, 502 insertions(+), 1 deletion(-) - create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.ok.dtsi - create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.ok.dts - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.ok.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.ok.dtsi -new file mode 100644 -index 000000000000..034959bcff00 ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.ok.dtsi -@@ -0,0 +1,375 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre SAS. All rights reserved. -+ * Copyright (c) 2020 Christian Hewitt -+ * -+ * AC200/AC202 = S905D3 -+ * AC213/AC214 = S905X3 -+ * -+ */ -+ -+#include "meson-sm1.dtsi" -+#include -+#include -+#include -+#include -+ -+/ { -+ aliases { -+ serial0 = &uart_AO; -+ ethernet0 = ðmac; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; -+ }; -+ -+ hdmi-connector { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_connector_in: endpoint { -+ remote-endpoint = <&hdmi_tx_tmds_out>; -+ }; -+ }; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x40000000>; -+ }; -+ -+ ao_5v: regulator-ao_5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "AO_5V"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&dc_in>; -+ 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; -+ }; -+ -+ 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; -+ }; -+ -+ 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: regulator-vddcpu { -+ /* -+ * SY8120B1ABC DC/DC Regulator. -+ */ -+ compatible = "pwm-regulator"; -+ -+ regulator-name = "VDDCPU"; -+ regulator-min-microvolt = <690000>; -+ regulator-max-microvolt = <1050000>; -+ -+ vin-supply = <&dc_in>; -+ -+ pwms = <&pwm_AO_cd 1 1500 0>; -+ pwm-dutycycle-range = <100 0>; -+ -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ vddio_ao1v8: regulator-vddio_ao1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; -+ clocks = <&wifi32k>; -+ clock-names = "ext_clock"; -+ }; -+ -+ sound { -+ compatible = "amlogic,axg-sound-card"; -+ model = "SM1-X96-AIR"; -+ 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>; -+ status = "okay"; -+ -+ 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>; -+ }; -+ }; -+ }; -+ -+ 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"; -+}; -+ -+&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"; -+ status = "okay"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+&clkc_audio { -+ status = "okay"; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vddcpu>; -+ operating-points-v2 = <&cpu_opp_table>; -+ clocks = <&clkc CLKID_CPU_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu1 { -+ cpu-supply = <&vddcpu>; -+ operating-points-v2 = <&cpu_opp_table>; -+ clocks = <&clkc CLKID_CPU1_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu2 { -+ cpu-supply = <&vddcpu>; -+ operating-points-v2 = <&cpu_opp_table>; -+ clocks = <&clkc CLKID_CPU2_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&cpu3 { -+ cpu-supply = <&vddcpu>; -+ operating-points-v2 = <&cpu_opp_table>; -+ clocks = <&clkc CLKID_CPU3_CLK>; -+ clock-latency = <50000>; -+}; -+ -+&frddr_a { -+ status = "okay"; -+}; -+ -+&frddr_b { -+ status = "okay"; -+}; -+ -+&frddr_c { -+ status = "okay"; -+}; -+ -+&hdmi_tx { -+ status = "okay"; -+ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&hdmi_tx_tmds_port { -+ hdmi_tx_tmds_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+}; -+ -+&ir { -+ status = "okay"; -+ pinctrl-0 = <&remote_input_ao_pins>; -+ pinctrl-names = "default"; -+ linux,rc-map-name = "rc-beelink-gs1"; -+}; -+ -+&pwm_AO_ab { -+ status = "okay"; -+ pinctrl-0 = <&pwm_ao_a_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin0"; -+}; -+ -+&pwm_AO_cd { -+ pinctrl-0 = <&pwm_ao_d_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin1"; -+ status = "okay"; -+}; -+ -+&pwm_ef { -+ status = "okay"; -+ pinctrl-0 = <&pwm_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&xtal>; -+ clock-names = "clkin0"; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddio_ao1v8>; -+}; -+ -+&sd_emmc_a { -+ status = "okay"; -+ pinctrl-0 = <&sdio_pins>; -+ pinctrl-1 = <&sdio_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ sd-uhs-sdr50; -+ max-frequency = <35000000>; -+ -+ non-removable; -+ disable-wp; -+ -+ /* WiFi firmware requires power to be kept while in suspend */ -+ keep-power-in-suspend; -+ -+ mmc-pwrseq = <&sdio_pwrseq>; -+ -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddio_ao1v8>; -+}; -+ -+/* SD card */ -+&sd_emmc_b { -+ status = "okay"; -+ 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 = <35000000>; -+ disable-wp; -+ -+ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddao_3v3>; -+}; -+ -+/* eMMC */ -+&sd_emmc_c { -+ status = "okay"; -+ 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>; -+ non-removable; -+ disable-wp; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&emmc_1v8>; -+}; -+ -+&tdmif_b { -+ status = "okay"; -+}; -+ -+&tdmout_b { -+ status = "okay"; -+}; -+ -+&tohdmitx { -+ status = "okay"; -+}; -+ -+&uart_AO { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_a_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&usb { -+ status = "okay"; -+ dr_mode = "otg"; -+}; -+ -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.ok.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.ok.dts -new file mode 100644 -index 000000000000..7899c93b9910 ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-100.ok.dts -@@ -0,0 +1,106 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 BayLibre SAS. All rights reserved. -+ * Copyright (c) 2020 Christian Hewitt -+ */ -+ -+/dts-v1/; -+ -+#include "meson-sm1-ac2xx.dtsi" -+ -+/ { -+ compatible = "amediatech,x96-air-2g", "amlogic,sm1"; -+ model = "Shenzhen Amediatech Technology Co., Ltd X96 Air"; -+ -+ aliases { -+ ethernet1 = &rtl8189ftv; -+ }; -+ -+ sound { -+ compatible = "amlogic,axg-sound-card"; -+ model = "SM1-X96-AIR"; -+ 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>; -+ status = "okay"; -+ -+ 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>; -+ }; -+ }; -+ }; -+}; -+ -+ðmac { -+ status = "okay"; -+ phy-handle = <&internal_ephy>; -+ phy-mode = "rmii"; -+}; -+ -+&sd_emmc_a { -+ rtl8189ftv: sdio_wifi@1 { -+ reg = <1>; -+ }; -+}; -+ -+&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"; -+ interrupt-parent = <&gpio_intc>; -+ interrupts = <95 IRQ_TYPE_LEVEL_HIGH>; -+ interrupt-names = "host-wakeup"; -+ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; -+ max-speed = <2000000>; -+ clocks = <&wifi32k>; -+ clock-names = "lpo"; -+ vbat-supply = <&vddao_3v3>; -+ vddio-supply = <&vddio_ao1v8>; -+ }; -+}; -+ -diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c -index 5935e0973d14..5e3b4d10c1a9 100644 ---- a/drivers/net/wireless/ath/ath10k/core.c -+++ b/drivers/net/wireless/ath/ath10k/core.c -@@ -89,6 +89,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = true, - .dynamic_sar_support = false, - }, -@@ -124,6 +125,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = true, - .dynamic_sar_support = false, - }, -@@ -160,6 +162,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -190,6 +193,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .num_wds_entries = 0x20, - .uart_pin_workaround = true, - .tx_stats_over_pktlog = false, -+ .credit_size_workaround = false, - .bmi_large_size_download = true, - .supports_peer_stats_info = true, - .dynamic_sar_support = true, -@@ -226,6 +230,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -261,6 +266,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -296,6 +302,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -334,6 +341,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = true, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .supports_peer_stats_info = true, - .dynamic_sar_support = true, -@@ -376,6 +384,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -424,6 +433,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -469,6 +479,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -504,6 +515,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -541,6 +553,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = true, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -570,6 +583,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .ast_skid_limit = 0x10, - .num_wds_entries = 0x20, - .uart_pin_workaround = true, -+ .credit_size_workaround = true, - .dynamic_sar_support = false, - }, - { -@@ -611,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = false, - .hw_filter_reset_required = true, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = false, - }, -@@ -639,6 +654,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { - .rri_on_ddr = true, - .hw_filter_reset_required = false, - .fw_diag_ce_download = false, -+ .credit_size_workaround = false, - .tx_stats_over_pktlog = false, - .dynamic_sar_support = true, - }, -@@ -714,6 +730,7 @@ static void ath10k_send_suspend_complete(struct ath10k *ar) - - static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) - { -+ bool mtu_workaround = ar->hw_params.credit_size_workaround; - int ret; - u32 param = 0; - -@@ -731,7 +748,7 @@ static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) - - param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET; - -- if (mode == ATH10K_FIRMWARE_MODE_NORMAL) -+ if (mode == ATH10K_FIRMWARE_MODE_NORMAL && !mtu_workaround) - param |= HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE; - else - param &= ~HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE; -diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h -index 6b03c7787e36..591ef7416b61 100644 ---- a/drivers/net/wireless/ath/ath10k/hw.h -+++ b/drivers/net/wireless/ath/ath10k/hw.h -@@ -618,6 +618,9 @@ struct ath10k_hw_params { - */ - bool uart_pin_workaround; - -+ /* Workaround for the credit size calculation */ -+ bool credit_size_workaround; -+ - /* tx stats support over pktlog */ - bool tx_stats_over_pktlog; - --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch index 0d9793cffd..45c3c266f6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-ASoC-meson-aiu-Fix-HDMI-codec-control-se.patch @@ -1,7 +1,7 @@ -From 9dc85a5851195c13d84800fc9c967ea04e445596 Mon Sep 17 00:00:00 2001 +From 7b58e8e6c6527fcfbfcf66ad361d3c808d9c7dc3 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 3 Oct 2021 05:35:48 +0000 -Subject: [PATCH 25/77] FROMLIST(v1): ASoC: meson: aiu: Fix HDMI codec control +Subject: [PATCH 24/79] FROMLIST(v1): ASoC: meson: aiu: Fix HDMI codec control selection The HDMI controllers on Amlogic Meson SoCs which use the AIU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch index 31c7d7b3d5..7e5f329994 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch @@ -1,7 +1,7 @@ -From 4847479b7e93fcdf3f5a22af9074db6f0f4c9bb1 Mon Sep 17 00:00:00 2001 +From 506b0130f9ede05cfb613c8534579af29b78561d Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 27 Nov 2021 07:23:35 +0000 -Subject: [PATCH 26/77] FROMLIST(v1): arm64: dts: meson: make dts use gpio-fan +Subject: [PATCH 25/79] FROMLIST(v1): 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-0027-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch index 773e9e3e11..4efe5c6ff5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch @@ -1,7 +1,7 @@ -From 221138ff0130f3cc81ce1fd4b8de7e8dcb2da16d Mon Sep 17 00:00:00 2001 +From 1d5cf3dc57fb3712bba9857eadb25633918fb816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 27 Nov 2021 07:29:18 +0000 -Subject: [PATCH 27/77] FROMLIST(v1): pwm: meson: Drop always false check from +Subject: [PATCH 26/79] FROMLIST(v1): pwm: meson: Drop always false check from .request() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch index aac05b2ea6..1e3776db7a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-pwm-meson-Drop-useless-check-for-channel.patch @@ -1,7 +1,7 @@ -From 8cc7650bf6f946a5d135cf19e56da265aa957501 Mon Sep 17 00:00:00 2001 +From d2007d6bcc68b53a741eea6778a5eb2f6fdf9270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 27 Nov 2021 07:30:03 +0000 -Subject: [PATCH 28/77] FROMLIST(v1): pwm: meson: Drop useless check for +Subject: [PATCH 27/79] FROMLIST(v1): pwm: meson: Drop useless check for channel data being NULL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch index 365b3778f6..42e5d938dc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-pwm-meson-Simplify-duplicated-per-channe.patch @@ -1,7 +1,7 @@ -From af0425246e0af21a97f1a3b6fe7b9aba357f0b1b Mon Sep 17 00:00:00 2001 +From 84d35c23528d61ef3b3be3de535aa91880cb8485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 27 Nov 2021 07:31:03 +0000 -Subject: [PATCH 29/77] FROMLIST(v1): pwm: meson: Simplify duplicated +Subject: [PATCH 28/79] FROMLIST(v1): pwm: meson: Simplify duplicated per-channel tracking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch index 1d4e231248..d744d40235 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-pwm-meson-Drop-always-false-check-from-..patch @@ -1,7 +1,7 @@ -From a64c2e8e852af3394f0a9742e1579c559b19706c Mon Sep 17 00:00:00 2001 +From 11dd0d3370f79c6cc9c585093b2df672b20fdc23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Sat, 27 Nov 2021 07:32:18 +0000 -Subject: [PATCH 30/77] FROMLIST(v1): pwm: meson: Drop always false check from +Subject: [PATCH 29/79] FROMLIST(v1): pwm: meson: Drop always false check from .apply() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch index c73028ba6f..2aab79c24e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v4-phy-amlogic-phy-meson-gxl-usb2-fix-share.patch @@ -1,7 +1,7 @@ -From dd9b10bd249ec4ff8af71b698327fae72878ff0f Mon Sep 17 00:00:00 2001 +From 4131d0c32f37f848963477482ee32f28deefd06b Mon Sep 17 00:00:00 2001 From: Amjad Ouled-Ameur Date: Mon, 6 Dec 2021 04:25:36 +0000 -Subject: [PATCH 42/77] FROMLIST(v4): phy: amlogic: phy-meson-gxl-usb2: fix +Subject: [PATCH 30/79] FROMLIST(v4): phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use Use reset_control_rearm() call if an error occurs in case diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-drm-connector-Add-define-for-HDMI-1.4-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-drm-connector-Add-define-for-HDMI-1.4-Ma.patch deleted file mode 100644 index b0b004c418..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-drm-connector-Add-define-for-HDMI-1.4-Ma.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 60d788ef66b1f0517330b79c8017b473c20782df Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Sat, 27 Nov 2021 07:26:47 +0000 -Subject: [PATCH 31/77] FROMLIST(v1): drm/connector: Add define for HDMI 1.4 - Maximum Pixel Rate - -A lot of drivers open-code the HDMI 1.4 maximum pixel rate in their -driver to test whether the resolutions are supported or if the -scrambling needs to be enabled. - -Let's create a common define for everyone to use it. - -Signed-off-by: Maxime Ripard ---- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++-- - drivers/gpu/drm/drm_edid.c | 2 +- - drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 ++-- - include/drm/drm_connector.h | 2 ++ - 4 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index f08d0fded61f..2081f1e443ae 100644 ---- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -@@ -46,7 +46,7 @@ - /* DW-HDMI Controller >= 0x200a are at least compliant with SCDC version 1 */ - #define SCDC_MIN_SOURCE_VERSION 0x1 - --#define HDMI14_MAX_TMDSCLK 340000000 -+#define HDMI14_MAX_TMDSCLK (DRM_HDMI_14_MAX_TMDS_CLK_KHZ * 1000) - - enum hdmi_datamap { - RGB444_8B = 0x01, -@@ -1264,7 +1264,7 @@ static bool dw_hdmi_support_scdc(struct dw_hdmi *hdmi, - * for low rates is not supported either - */ - if (!display->hdmi.scdc.scrambling.low_rates && -- display->max_tmds_clock <= 340000) -+ display->max_tmds_clock <= DRM_HDMI_14_MAX_TMDS_CLK_KHZ) - return false; - - return true; -diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c -index 12893e7be89b..4d3473b2f72f 100644 ---- a/drivers/gpu/drm/drm_edid.c -+++ b/drivers/gpu/drm/drm_edid.c -@@ -4975,7 +4975,7 @@ static void drm_parse_hdmi_forum_vsdb(struct drm_connector *connector, - u32 max_tmds_clock = hf_vsdb[5] * 5000; - struct drm_scdc *scdc = &hdmi->scdc; - -- if (max_tmds_clock > 340000) { -+ if (max_tmds_clock > DRM_HDMI_14_MAX_TMDS_CLK_KHZ) { - display->max_tmds_clock = max_tmds_clock; - DRM_DEBUG_KMS("HF-VSDB: max TMDS clock %d kHz\n", - display->max_tmds_clock); -diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c -index 0afbd1e70bfc..8078667aea0e 100644 ---- a/drivers/gpu/drm/meson/meson_dw_hdmi.c -+++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c -@@ -434,7 +434,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, - readl_relaxed(priv->io_base + _REG(VPU_HDMI_SETTING)); - - DRM_DEBUG_DRIVER("\"%s\" div%d\n", mode->name, -- mode->clock > 340000 ? 40 : 10); -+ mode->clock > DRM_HDMI_14_MAX_TMDS_CLK_KHZ ? 40 : 10); - - /* Enable clocks */ - regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100); -@@ -457,7 +457,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data, - dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_BIST_CNTL, BIT(12)); - - /* TMDS pattern setup */ -- if (mode->clock > 340000 && -+ if (mode->clock > DRM_HDMI_14_MAX_TMDS_CLK_KHZ && - dw_hdmi->output_bus_fmt == MEDIA_BUS_FMT_YUV8_1X24) { - dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_01, - 0); -diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 379746d3266f..09f462d3e8fa 100644 ---- a/include/drm/drm_connector.h -+++ b/include/drm/drm_connector.h -@@ -258,6 +258,8 @@ struct drm_hdmi_info { - struct drm_hdmi_dsc_cap dsc_cap; - }; - -+#define DRM_HDMI_14_MAX_TMDS_CLK_KHZ (340 * 1000) -+ - /** - * enum drm_link_status - connector's link_status property value - * --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch index 127bc536ef..e3bbe38730 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v4-phy-amlogic-meson8b-usb2-Use-dev_err_pro.patch @@ -1,7 +1,7 @@ -From d14fd616b58ed6d76106d95b298c06d4b4ebaa1c Mon Sep 17 00:00:00 2001 +From e746227557414e6ca37c1379e4c4c8d1e0ebe06e Mon Sep 17 00:00:00 2001 From: Amjad Ouled-Ameur Date: Mon, 6 Dec 2021 04:26:22 +0000 -Subject: [PATCH 43/77] FROMLIST(v4): phy: amlogic: meson8b-usb2: Use +Subject: [PATCH 31/79] FROMLIST(v4): phy: amlogic: meson8b-usb2: Use dev_err_probe() Use the existing dev_err_probe() helper instead of open-coding the same diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-watchdog-meson_gxbb_wdt-remove-watchdog_.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-watchdog-meson_gxbb_wdt-remove-watchdog_.patch deleted file mode 100644 index b4c3961240..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-watchdog-meson_gxbb_wdt-remove-watchdog_.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bcf2783307b6274cf8b3e441760301cc03fdca01 Mon Sep 17 00:00:00 2001 -From: Artem Lapkin -Date: Sat, 27 Nov 2021 07:36:59 +0000 -Subject: [PATCH 32/77] FROMLIST(v1): watchdog: meson_gxbb_wdt: remove - watchdog_stop_on_reboot() - -The Meson platform still has some hardware drivers problems for some -configurations which can freeze devices on shutdown/reboot. - -Remove watchdog_stop_on_reboot() to catch this situation and ensure that -the reboot happens anyway. Users who still want to stop the watchdog on -reboot can still do so using the watchdog.stop_on_reboot=1 module -parameter. - -https://lore.kernel.org/linux-watchdog/20210729072308.1908904-1-art@khadas.com/T/#t - -Signed-off-by: Artem Lapkin ---- - drivers/watchdog/meson_gxbb_wdt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c -index 945f5e65db57..d3c9e2f6e63b 100644 ---- a/drivers/watchdog/meson_gxbb_wdt.c -+++ b/drivers/watchdog/meson_gxbb_wdt.c -@@ -198,7 +198,6 @@ static int meson_gxbb_wdt_probe(struct platform_device *pdev) - - meson_gxbb_wdt_set_timeout(&data->wdt_dev, data->wdt_dev.timeout); - -- watchdog_stop_on_reboot(&data->wdt_dev); - return devm_watchdog_register_device(dev, &data->wdt_dev); - } - --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch index 489e667b32..d8ad1091c9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v4-phy-amlogic-meson8b-usb2-fix-shared-rese.patch @@ -1,7 +1,7 @@ -From e633584b0e7b2eff1fd5661d3209beb1da356d14 Mon Sep 17 00:00:00 2001 +From 51a05050b15b4985ecf9491eec1f6af7764d611b Mon Sep 17 00:00:00 2001 From: Amjad Ouled-Ameur Date: Mon, 6 Dec 2021 04:27:13 +0000 -Subject: [PATCH 44/77] FROMLIST(v4): phy: amlogic: meson8b-usb2: fix shared +Subject: [PATCH 32/79] FROMLIST(v4): phy: amlogic: meson8b-usb2: fix shared reset control use Use reset_control_rearm() call if an error occurs in case diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch index 533a543826..d36def55e5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v2-media-v4l2-mem2mem-Apply-DST_QUEUE_OFF_B.patch @@ -1,7 +1,7 @@ -From 3ed6fd2175a0b370e9bdc3ab5189ca795defdec3 Mon Sep 17 00:00:00 2001 +From 95e3fbc0849f895a43321954af29b77f1c38b33d Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Wed, 15 Dec 2021 03:51:07 +0000 -Subject: [PATCH 45/77] FROMLIST(v2): media: v4l2-mem2mem: Apply +Subject: [PATCH 33/79] FROMLIST(v2): media: v4l2-mem2mem: Apply DST_QUEUE_OFF_BASE on MMAP buffers across ioctls DST_QUEUE_OFF_BASE is applied to offset/mem_offset on MMAP capture buffers @@ -22,7 +22,7 @@ Signed-off-by: Chen-Yu Tsai 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index e7f4bf5bc8dd..67582d788b9b 100644 +index e2654b422334..3bac9e373502 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -585,19 +585,14 @@ int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch index e9b2263db1..539844b461 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-pinctrl-meson-g12a-add-more-pwm_f-option.patch @@ -1,7 +1,7 @@ -From 7d86c5559f9eeae01a2ae5ddec71c35441904518 Mon Sep 17 00:00:00 2001 +From 1a25371cdc291eb3beabac1af4537cbbd4ead9c6 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Mon, 3 Jan 2022 16:49:28 +0000 -Subject: [PATCH 47/77] FROMLIST(v1): pinctrl: meson-g12a: add more pwm_f +Subject: [PATCH 34/79] FROMLIST(v1): pinctrl: meson-g12a: add more pwm_f options Add missing PWM_F pin muxing for GPIOA_11 and GPIOZ_12. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch index 38ddb3f589..dd2207891f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch @@ -1,7 +1,7 @@ -From 5bb8333ec7de89e2f0d9346acc02b8157c84f346 Mon Sep 17 00:00:00 2001 +From 64c232731c937df1e049c317ffccb416d90a8cc3 Mon Sep 17 00:00:00 2001 From: Sergey Shtylyov Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 50/77] FROMLIST(v1): mmc: meson-gx: fix deferred probing +Subject: [PATCH 35/79] 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 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v3-Bluetooth-btrtl-Add-support-for-RTL8822C.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v3-Bluetooth-btrtl-Add-support-for-RTL8822C.patch new file mode 100644 index 0000000000..5552f74c5d --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v3-Bluetooth-btrtl-Add-support-for-RTL8822C.patch @@ -0,0 +1,35 @@ +From 02cfd807efd2a9dee300070c9d1f0cf13b822682 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Bocharov +Date: Sat, 15 Jan 2022 08:27:14 +0000 +Subject: [PATCH 36/79] FROMLIST(v3): Bluetooth: btrtl: Add support for + RTL8822C hci_ver 0x08 + +Add detection of RTL8822CS controller with hci_ver = 0x08 + +Signed-off-by: Vyacheslav Bocharov +--- + drivers/bluetooth/btrtl.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c +index c2bdd1e6060e..13e82783c2b9 100644 +--- a/drivers/bluetooth/btrtl.c ++++ b/drivers/bluetooth/btrtl.c +@@ -156,6 +156,14 @@ static const struct id_table ic_id_table[] = { + .fw_name = "rtl_bt/rtl8822cs_fw.bin", + .cfg_name = "rtl_bt/rtl8822cs_config" }, + ++ /* 8822C with UART interface */ ++ { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0x8, HCI_UART), ++ .config_needed = true, ++ .has_rom_version = true, ++ .has_msft_ext = true, ++ .fw_name = "rtl_bt/rtl8822cs_fw.bin", ++ .cfg_name = "rtl_bt/rtl8822cs_config" }, ++ + /* 8822C with USB interface */ + { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB), + .config_needed = false, +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v3-Bluetooth-hci_h5-Add-power-reset-via-gpi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v3-Bluetooth-hci_h5-Add-power-reset-via-gpi.patch new file mode 100644 index 0000000000..4af3950af1 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v3-Bluetooth-hci_h5-Add-power-reset-via-gpi.patch @@ -0,0 +1,32 @@ +From 2ca35b29a7b5bc5b70e19da8e83a2be1abc1ef27 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Bocharov +Date: Wed, 19 Jan 2022 06:30:48 +0000 +Subject: [PATCH 37/79] FROMLIST(v3): Bluetooth: hci_h5: Add power reset via + gpio in h5_btrtl_open + +Add power reset via enable-gpios in h5_btrtl_open function. + +Signed-off-by: Vyacheslav Bocharov +--- + drivers/bluetooth/hci_h5.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c +index 34286ffe0568..fdf504b0d265 100644 +--- a/drivers/bluetooth/hci_h5.c ++++ b/drivers/bluetooth/hci_h5.c +@@ -966,6 +966,11 @@ static void h5_btrtl_open(struct h5 *h5) + pm_runtime_enable(&h5->hu->serdev->dev); + } + ++ /* The controller needs reset to startup */ ++ gpiod_set_value_cansleep(h5->enable_gpio, 0); ++ gpiod_set_value_cansleep(h5->device_wake_gpio, 0); ++ msleep(100); ++ + /* The controller needs up to 500ms to wakeup */ + gpiod_set_value_cansleep(h5->enable_gpio, 1); + gpiod_set_value_cansleep(h5->device_wake_gpio, 1); +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-arm64-dts-meson-remove-opps-below-1GHz-for-g12-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch similarity index 71% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-arm64-dts-meson-remove-opps-below-1GHz-for-g12-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch index 8b5123db06..6a829620b0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-HACK-arm64-dts-meson-remove-opps-below-1GHz-for-g12-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch @@ -1,18 +1,22 @@ -From 71e3140ba0f0da6352d677e50c7ac6267c21245c Mon Sep 17 00:00:00 2001 +From e4893d4507c02d6f266a970d35b35345d320e6e3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Thu, 25 Nov 2021 11:31:43 +0000 -Subject: [PATCH 11/77] HACK: arm64: dts: meson: remove opps below 1GHz for - g12/sm1 +Date: Thu, 10 Feb 2022 09:53:37 +0000 +Subject: [PATCH 38/79] FROMLIST(v2): arm64: dts: meson: remove CPU opps below + 1GHz for G12B boards -This seems to workaround or hide occurrences of CPU stalls and other -board wedges that are not seen when 'performance' is forced. +Amlogic G12B 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: b96d4e92709b ("arm64: dts: meson-g12b: support a311d and s922x cpu operating points") Signed-off-by: Christian Hewitt --- .../boot/dts/amlogic/meson-g12b-a311d.dtsi | 40 ------------------- .../boot/dts/amlogic/meson-g12b-s922x.dtsi | 40 ------------------- - arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 20 ---------- - 3 files changed, 100 deletions(-) + 2 files changed, 80 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi index d61f43052a34..8e9ad1e51d66 100644 @@ -130,37 +134,6 @@ index 1e5d0ee5d541..44c23c984034 100644 opp-1000000000 { opp-hz = /bits/ 64 <1000000000>; opp-microvolt = <771000>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -index 3d8b1f4f2001..78bdbd2ccc9d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -@@ -95,26 +95,6 @@ - compatible = "operating-points-v2"; - opp-shared; - -- opp-100000000 { -- opp-hz = /bits/ 64 <100000000>; -- opp-microvolt = <730000>; -- }; -- -- opp-250000000 { -- opp-hz = /bits/ 64 <250000000>; -- opp-microvolt = <730000>; -- }; -- -- opp-500000000 { -- opp-hz = /bits/ 64 <500000000>; -- opp-microvolt = <730000>; -- }; -- -- opp-667000000 { -- opp-hz = /bits/ 64 <666666666>; -- opp-microvolt = <750000>; -- }; -- - opp-1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt = <770000>; -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch new file mode 100644 index 0000000000..6e60c224e5 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v2-arm64-dts-meson-remove-CPU-opps-below-1G.patch @@ -0,0 +1,53 @@ +From 1556f3e8267a9453acb236832850ef9ab3e2d31c Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 10 Feb 2022 10:01:05 +0000 +Subject: [PATCH 39/79] FROMLIST(v2): arm64: dts: meson: remove CPU opps below + 1GHz for SM1 boards + +Amlogic SM1 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: 3d9e76483049 ("arm64: dts: meson-sm1-sei610: enable DVFS") +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +index 1e0adf259d61..a685dabde5d3 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +@@ -95,26 +95,6 @@ + compatible = "operating-points-v2"; + opp-shared; + +- opp-100000000 { +- opp-hz = /bits/ 64 <100000000>; +- opp-microvolt = <730000>; +- }; +- +- opp-250000000 { +- opp-hz = /bits/ 64 <250000000>; +- opp-microvolt = <730000>; +- }; +- +- opp-500000000 { +- opp-hz = /bits/ 64 <500000000>; +- opp-microvolt = <730000>; +- }; +- +- opp-667000000 { +- opp-hz = /bits/ 64 <666666666>; +- opp-microvolt = <750000>; +- }; +- + opp-1000000000 { + opp-hz = /bits/ 64 <1000000000>; + opp-microvolt = <770000>; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-VP9-support-to-GXM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-drivers-meson-vdec-add-VP9-support-to-GX.patch similarity index 62% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-VP9-support-to-GXM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-drivers-meson-vdec-add-VP9-support-to-GX.patch index c58b489a64..bea0efaf73 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-VP9-support-to-GXM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-drivers-meson-vdec-add-VP9-support-to-GX.patch @@ -1,9 +1,13 @@ -From 25a9ec427c4c25f62b2cd1010b3b6d93142df144 Mon Sep 17 00:00:00 2001 +From d6d99aaaf02294a9f07f8e480c12885cd8671f6c Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Fri, 7 Jan 2022 06:21:31 +0000 -Subject: [PATCH 57/77] WIP: drivers: meson: vdec: add VP9 support to GXM +Date: Thu, 25 Nov 2021 11:31:43 +0000 +Subject: [PATCH 40/79] FROMLIST(v1): drivers: meson: vdec: add VP9 support to + GXM -It seems this was missed in the original VP9 codec submission +VP9 support for GXM appears to have been missed from the original +codec submission [0] but it works well, so let's add support. + +[0] https://github.com/torvalds/linux/commit/00c43088aa680989407b6afbda295f67b3f123f1 Signed-off-by: Christian Hewitt --- @@ -11,10 +15,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 12 insertions(+) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index b03527705cc8..810039a02b44 100644 +index eabbebab2da2..88c9d72e1c83 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c -@@ -128,6 +128,18 @@ static const struct amvdec_format vdec_formats_gxl[] = { +@@ -103,6 +103,18 @@ static const struct amvdec_format vdec_formats_gxl[] = { static const struct amvdec_format vdec_formats_gxm[] = { { @@ -30,8 +34,8 @@ index b03527705cc8..810039a02b44 100644 + .flags = V4L2_FMT_FLAG_COMPRESSED | + V4L2_FMT_FLAG_DYN_RESOLUTION, + }, { - .pixfmt = V4L2_PIX_FMT_HEVC, - .min_buffers = 4, + .pixfmt = V4L2_PIX_FMT_H264, + .min_buffers = 2, .max_buffers = 24, -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-dt-bindings-vendor-prefixes-add-osmc-pre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-dt-bindings-vendor-prefixes-add-osmc-pre.patch new file mode 100644 index 0000000000..5253fd17bd --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v2-dt-bindings-vendor-prefixes-add-osmc-pre.patch @@ -0,0 +1,30 @@ +From 75b9c8828a1a9daa05876beb24b67b9098e22487 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 02:29:42 +0000 +Subject: [PATCH 41/79] FROMLIST(v2): dt-bindings: vendor-prefixes: add osmc + prefix + +Open Source Media Centre (Sam Nazarko Trading Ltd.) are a manufacturer +of Linux Set-Top Box devices. + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml +index 0d8da47cda1a..c1fa95a505e9 100644 +--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml ++++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml +@@ -896,6 +896,8 @@ patternProperties: + description: Ortus Technology Co., Ltd. + "^osddisplays,.*": + description: OSD Displays ++ "^osmc,.*": ++ description: Sam Nazarko Trading Ltd. (Open Source Media Centre) + "^ouya,.*": + description: Ouya Inc. + "^overkiz,.*": +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v2-dt-bindings-arm-amlogic-add-Vero-4K-bind.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v2-dt-bindings-arm-amlogic-add-Vero-4K-bind.patch new file mode 100644 index 0000000000..8659dd9195 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v2-dt-bindings-arm-amlogic-add-Vero-4K-bind.patch @@ -0,0 +1,28 @@ +From 9f243093662b21cd1f59c19744b2f546479f295c Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 02:40:20 +0000 +Subject: [PATCH 42/79] FROMLIST(v2): dt-bindings: arm: amlogic: add Vero 4K+ + bindings + +Add the board binding for the OSMC Vero 4K+ STB device + +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 7c3627d9c773..05365bb50b29 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -108,6 +108,7 @@ properties: + - amlogic,p230 + - amlogic,p231 + - libretech,aml-s905d-pc ++ - osmc,vero4k-plus + - phicomm,n1 + - smartlabs,sml5442tw + - videostrong,gxl-kii-pro +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v2-arm64-dts-meson-add-support-for-OSMC-Ver.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v2-arm64-dts-meson-add-support-for-OSMC-Ver.patch new file mode 100644 index 0000000000..b1d7164f97 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v2-arm64-dts-meson-add-support-for-OSMC-Ver.patch @@ -0,0 +1,170 @@ +From 5ebb2556c99e6422301d613a0563aaa1a0842c47 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 04:06:17 +0000 +Subject: [PATCH 43/79] FROMLIST(v2): arm64: dts: meson: add support for OSMC + Vero 4K+ + +The OSMC Vero 4K+ device is based on the Amlogic S905D (P230) +reference design with the following specifications: + +- 2GB DDR4 RAM +- 16GB eMMC +- HDMI 2.1 video +- S/PDIF optical output +- AV output +- 10/100/1000 Ethernet +- AP6255 Wireless (802.11 a/b/g/n/ac, BT 4.2) +- 2x USB 2.0 ports (1x OTG) +- IR receiver (internal) +- IR extender port (external) +- 1x micro SD card slot +- 1x Power LED (red) +- 1x Reset button (in AV jack) + +Signed-off-by: Christian Hewitt +Tested-by: Chad Wagner +Reviewed-by: Neil Armstrong +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../amlogic/meson-gxl-s905d-vero4k-plus.dts | 117 ++++++++++++++++++ + 2 files changed, 118 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index f7aea90c7f2a..383e9fb49852 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -36,6 +36,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts +new file mode 100644 +index 000000000000..4b0ff707e21b +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-vero4k-plus.dts +@@ -0,0 +1,117 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Author: Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-gxl-s905d.dtsi" ++#include "meson-gx-p23x-q20x.dtsi" ++#include ++#include ++ ++/ { ++ compatible = "osmc,vero4k-plus", "amlogic,s905d", "amlogic,meson-gxl"; ++ model = "OSMC Vero 4K Plus"; ++ ++ gpio-keys-polled { ++ compatible = "gpio-keys-polled"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ poll-interval = <20>; ++ ++ button@0 { ++ label = "power"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-standby { ++ color = ; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ panic-indicator; ++ }; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>; ++ pinctrl-names = "default"; ++ ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++ ++ amlogic,tx-delay-ns = <0>; ++}; ++ ++&external_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ pinctrl-0 = <ð_phy_irq_pin>; ++ pinctrl-names = "default"; ++ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; ++ ++ interrupt-parent = <&gpio_intc>; ++ interrupts = <25 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&pinctrl_periphs { ++ /* Ensure the phy irq pin is properly configured as input */ ++ eth_phy_irq_pin: eth-phy-irq { ++ mux { ++ groups = "GPIOZ_15"; ++ function = "gpio_periphs"; ++ bias-disable; ++ output-disable; ++ }; ++ }; ++}; ++ ++&sd_emmc_a { ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++&uart_A { ++ status = "okay"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ max-speed = <2000000>; ++ clocks = <&wifi32k>; ++ clock-names = "lpo"; ++ }; ++}; ++ ++&usb { ++ dr_mode = "host"; ++}; ++ ++&usb2_phy0 { ++ /* HDMI_5V also supplies the USB VBUS */ ++ phy-supply = <&hdmi_5v>; ++}; ++ ++&usb2_phy0 { ++ /* HDMI_5V also supplies the USB VBUS */ ++ phy-supply = <&hdmi_5v>; ++}; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch index 59fe430617..67f577a9bc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-ASoC-hdmi-codec-reorder-channel-allocation-list.patch @@ -1,7 +1,7 @@ -From 035aee4f0b2b437940c06d2257bedc8eafec5802 Mon Sep 17 00:00:00 2001 +From bde321a49247ea8dfeec6e0fa08bcc520a554508 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 65/77] WIP: ASoC: hdmi-codec: reorder channel allocation list +Subject: [PATCH 44/79] WIP: ASoC: hdmi-codec: reorder channel allocation list Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). @@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c -index b61f980cabdc..74e58cd2a021 100644 +index b07607a9ecea..a12015471ea2 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -188,84 +188,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch index 2e3995e82e..84b00123bc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-mmc-meson-gx-mmc-set-core-clock-phase-to-270-deg.patch @@ -1,7 +1,7 @@ -From ab55fa4dd6955486dcc9f6244d7c76de566ce6e2 Mon Sep 17 00:00:00 2001 +From e8416e70af875bd08af88e4099e7484963ca0fbd Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 14 Jan 2021 17:43:02 +0100 -Subject: [PATCH 51/77] WIP: mmc: meson-gx-mmc: set core clock phase to 270 +Subject: [PATCH 45/79] WIP: mmc: meson-gx-mmc: set core clock phase to 270 degrees for AXG compatible controllers Signed-off-by: Neil Armstrong diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch new file mode 100644 index 0000000000..1e54299025 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch @@ -0,0 +1,32 @@ +From eb982580576ff4df7dd72979622b1ac0ff99b6d4 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 13 Jan 2022 03:50:01 +0000 +Subject: [PATCH 46/79] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi + +The P212 has a combined WiFi/BT module. The BT side is already enabled +in the dtsi but the WiFi side is not. Let's enable the WiFi module. + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +index 05cb2f5e5c36..7055057d7942 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +@@ -125,6 +125,11 @@ + + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddio_boot>; ++ ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; + }; + + /* SD card */ +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-move-pwm_ef-node-in-P212-dtsi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-move-pwm_ef-node-in-P212-dtsi.patch new file mode 100644 index 0000000000..378663fd17 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-move-pwm_ef-node-in-P212-dtsi.patch @@ -0,0 +1,49 @@ +From 3bd8ae1730a5096a81ec5bdadcc421eb343dda14 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 13 Jan 2022 03:56:12 +0000 +Subject: [PATCH 47/79] WIP: arm64: dts: meson: move pwm_ef node in P212 dtsi + +Cosmetic-only change to alpha-sort the pwm_ef node. + +Signed-off-by: Christian Hewitt +--- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +index 7055057d7942..a150cc0e18ff 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +@@ -97,6 +97,14 @@ + pinctrl-names = "default"; + }; + ++&pwm_ef { ++ status = "okay"; ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&clkc CLKID_FCLK_DIV4>; ++ clock-names = "clkin0"; ++}; ++ + &saradc { + status = "okay"; + vref-supply = <&vddio_ao18>; +@@ -170,14 +178,6 @@ + vqmmc-supply = <&vddio_boot>; + }; + +-&pwm_ef { +- status = "okay"; +- pinctrl-0 = <&pwm_e_pins>; +- pinctrl-names = "default"; +- clocks = <&clkc CLKID_FCLK_DIV4>; +- clock-names = "clkin0"; +-}; +- + /* This is connected to the Bluetooth module: */ + &uart_A { + status = "okay"; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-remove-Broadcom-WiFi-BT-nodes-fr.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-WiFi-BT-nodes-from-Khadas.patch similarity index 64% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-remove-Broadcom-WiFi-BT-nodes-fr.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-WiFi-BT-nodes-from-Khadas.patch index 9793452434..6863009812 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-remove-Broadcom-WiFi-BT-nodes-fr.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-WiFi-BT-nodes-from-Khadas.patch @@ -1,27 +1,25 @@ -From f99adeec959a2c74db1f3c97fc1a9b4c8f5de862 Mon Sep 17 00:00:00 2001 +From 71b807b4965b1c751547d374becdf529baff04ed Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Tue, 4 Jan 2022 04:36:12 +0000 -Subject: [PATCH 77/77] WIP: arm64: dts: meson: remove Broadcom WiFi/BT nodes - from Khadas VIM1 +Date: Thu, 13 Jan 2022 03:58:58 +0000 +Subject: [PATCH 48/79] WIP: arm64: dts: meson: remove WiFi/BT nodes from + Khadas VIM1 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi so we can remove them from the VIM1 board dts. Signed-off-by: Christian Hewitt --- - .../amlogic/meson-gxl-s905x-khadas-vim.dts | 19 ------------------- - 1 file changed, 19 deletions(-) + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 15 --------------- + 1 file changed, 15 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 24af15e18026..fb0dd920882f 100644 +index 24af15e18026..5ed1e9313003 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -@@ -219,25 +219,6 @@ - pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; - }; +@@ -221,21 +221,6 @@ --&sd_emmc_a { -- max-frequency = <100000000>; + &sd_emmc_a { + max-frequency = <100000000>; - - brcmf: wifi@1 { - reg = <1>; @@ -37,11 +35,9 @@ index 24af15e18026..fb0dd920882f 100644 - clocks = <&wifi32k>; - clock-names = "lpo"; - }; --}; -- + }; + /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */ - &uart_AO { - status = "okay"; -- 2.17.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch new file mode 100644 index 0000000000..dd5e9b0d5c --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -0,0 +1,109 @@ +From 6d91b9daa664c69ecf484639711ad6a1adbafe04 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 18 Jan 2022 15:09:12 +0000 +Subject: [PATCH 49/79] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to + 100MHz + +Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but +real-world tests on an assortment of GXL and GXM boards show noteable +increases in throughput when max-frequency is 100MHz, so let's use it. + +Before results from a p231 device: + +Connecting to host 192.168.0.1, port 5201 +Reverse mode, remote host 192.168.0.1 is sending +[ 5] local 192.168.0.41 port 42550 connected to 192.168.0.1 port 5201 +[ ID] Interval Transfer Bitrate +[ 5] 0.00-1.00 sec 8.84 MBytes 74.2 Mbits/sec +[ 5] 1.00-2.00 sec 9.60 MBytes 80.5 Mbits/sec +[ 5] 2.00-3.00 sec 9.07 MBytes 76.1 Mbits/sec +[ 5] 3.00-4.00 sec 9.14 MBytes 76.6 Mbits/sec +[ 5] 4.00-5.00 sec 9.26 MBytes 77.7 Mbits/sec +[ 5] 5.00-6.00 sec 9.08 MBytes 76.2 Mbits/sec +[ 5] 6.00-7.00 sec 9.11 MBytes 76.4 Mbits/sec +[ 5] 7.00-8.00 sec 8.65 MBytes 72.5 Mbits/sec +[ 5] 8.00-9.00 sec 9.24 MBytes 77.5 Mbits/sec +[ 5] 9.00-10.00 sec 8.57 MBytes 71.9 Mbits/sec +- - - - - - - - - - - - - - - - - - - - - - - - - +[ ID] Interval Transfer Bitrate Retr +[ 5] 0.00-10.27 sec 94.1 MBytes 76.8 Mbits/sec 0 sender +[ 5] 0.00-10.00 sec 90.6 MBytes 76.0 Mbits/sec receiver + +clock: 50000000 Hz +actual clock: 50000000 Hz +vdd: 21 (3.3 ~ 3.4 V) +bus mode: 2 (push-pull) +chip select: 0 (don't care) +power mode: 2 (on) +bus width: 2 (4 bits) +timing spec: 2 (sd high-speed) +signal voltage: 1 (1.80 V) +driver type: 0 (driver type B) + +After results from a p231 device: + +Connecting to host 192.168.0.1, port 5201 +Reverse mode, remote host 192.168.0.1 is sending +[ 5] local 192.168.0.41 port 58534 connected to 192.168.0.1 port 5201 +[ ID] Interval Transfer Bitrate +[ 5] 0.00-1.00 sec 12.6 MBytes 106 Mbits/sec +[ 5] 1.00-2.00 sec 13.0 MBytes 109 Mbits/sec +[ 5] 2.00-3.00 sec 12.8 MBytes 107 Mbits/sec +[ 5] 3.00-4.00 sec 13.2 MBytes 111 Mbits/sec +[ 5] 4.00-5.00 sec 12.4 MBytes 104 Mbits/sec +[ 5] 5.00-6.00 sec 11.2 MBytes 93.9 Mbits/sec +[ 5] 6.00-7.00 sec 12.3 MBytes 103 Mbits/sec +[ 5] 7.00-8.00 sec 12.3 MBytes 103 Mbits/sec +[ 5] 8.00-9.00 sec 12.5 MBytes 105 Mbits/sec +[ 5] 9.00-10.00 sec 12.3 MBytes 103 Mbits/sec +- - - - - - - - - - - - - - - - - - - - - - - - - +[ ID] Interval Transfer Bitrate Retr +[ 5] 0.00-10.22 sec 127 MBytes 104 Mbits/sec 0 sender +[ 5] 0.00-10.00 sec 125 MBytes 105 Mbits/sec receiver + +clock: 100000000 Hz +actual clock: 100000000 Hz +vdd: 21 (3.3 ~ 3.4 V) +bus mode: 2 (push-pull) +chip select: 0 (don't care) +power mode: 2 (on) +bus width: 2 (4 bits) +timing spec: 6 (sd uhs SDR104) +signal voltage: 1 (1.80 V) +driver type: 0 (driver type B) + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +index dafc841f7c16..8d315508360d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +@@ -259,7 +259,7 @@ + + bus-width = <4>; + cap-sd-highspeed; +- max-frequency = <50000000>; ++ max-frequency = <100000000>; + + non-removable; + disable-wp; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +index a150cc0e18ff..b3d7b8613d6d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +@@ -121,7 +121,7 @@ + + bus-width = <4>; + cap-sd-highspeed; +- max-frequency = <50000000>; ++ max-frequency = <100000000>; + + non-removable; + disable-wp; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch new file mode 100644 index 0000000000..9bad090f59 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -0,0 +1,47 @@ +From 16e2fda15b650aaac9e3fd676c17a158086843b4 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 06:45:06 +0000 +Subject: [PATCH 50/79] WIP: arm64: dts: meson: add UHS SDIO capabilities to + p212/p23x/q20x + +Add UHS capabilities to the SDIO node to enable 100MHz speeds. + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 4 ++++ + 2 files changed, 8 insertions(+) + +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 8d315508360d..b0d008fc5f7a 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +@@ -259,6 +259,10 @@ + + bus-width = <4>; + cap-sd-highspeed; ++ sd-uhs-sdr12; ++ sd-uhs-sdr25; ++ sd-uhs-sdr50; ++ sd-uhs-sdr104; + max-frequency = <100000000>; + + non-removable; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +index b3d7b8613d6d..6eec4e81592b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +@@ -121,6 +121,10 @@ + + bus-width = <4>; + cap-sd-highspeed; ++ sd-uhs-sdr12; ++ sd-uhs-sdr25; ++ sd-uhs-sdr50; ++ sd-uhs-sdr104; + max-frequency = <100000000>; + + non-removable; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch new file mode 100644 index 0000000000..56b8a2c20c --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -0,0 +1,32 @@ +From f2153640f208ef41b04d083f6c1eee797e363472 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 18 Jan 2022 15:18:32 +0000 +Subject: [PATCH 51/79] WIP: arm64: dts: meson: remove SDIO node from Khadas + VIM1 + +Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we +can drop the node from the board dts. + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +index 5ed1e9313003..fb0dd920882f 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +@@ -219,10 +219,6 @@ + pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; + }; + +-&sd_emmc_a { +- max-frequency = <100000000>; +-}; +- + /* This is brought out on the Linux_RX (18) and Linux_TX (19) pins: */ + &uart_AO { + status = "okay"; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-arm64-dts-meson-p241-add-sound-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-audio-playback-to-S905X-P212.patch similarity index 52% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-arm64-dts-meson-p241-add-sound-support.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-audio-playback-to-S905X-P212.patch index 99f8ad38ac..3b26d24aa6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-arm64-dts-meson-p241-add-sound-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-audio-playback-to-S905X-P212.patch @@ -1,54 +1,49 @@ -From bee807262674aba588a42180ce9702fc9094728a Mon Sep 17 00:00:00 2001 -From: Jerome Brunet -Date: Tue, 30 Nov 2021 14:08:53 +0000 -Subject: [PATCH 22/77] FROMGIT: arm64: dts: meson: p241: add sound support +From b359a93a0555da6362ca94d963430e70cd43c950 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Thu, 13 Jan 2022 04:30:44 +0000 +Subject: [PATCH 52/79] WIP: arm64: dts: meson: add audio playback to + S905X-P212 dts -Add the p241 sound card support. This board can play audio through HDMI -and the internal DAC. +Add support for the HDMI and Analogue i2s audio outputs. -Signed-off-by: Jerome Brunet -Reviewed-by: Neil Armstrong -Signed-off-by: Neil Armstrong -Link: https://lore.kernel.org/r/20211130100159.214489-3-jbrunet@baylibre.com +Signed-off-by: Christian Hewitt --- - .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 70 +++++++++++++++++++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -index 9d0684a8264b..ff906becd2ab 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -@@ -8,6 +8,7 @@ +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +index 2602940c2077..c2bc7cec476d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +@@ -7,11 +7,19 @@ /dts-v1/; - #include + #include "meson-gxl-s905x-p212.dtsi" +#include - #include "meson-gxl-s805x.dtsi" + / { + compatible = "amlogic,p212", "amlogic,s905x", "amlogic,meson-gxl"; + model = "Amlogic Meson GXL (S905X) P212 Development Board"; -@@ -21,6 +22,13 @@ - ethernet0 = ðmac; - }; - -+ au2: analog-amplifier { ++ dio2133: analog-amplifier { + compatible = "simple-audio-amplifier"; + sound-name-prefix = "AU2"; -+ VCC-supply = <&vcc_5v>; ++ VCC-supply = <&hdmi_5v>; + enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>; + }; + - chosen { - stdout-path = "serial0:115200n8"; - }; -@@ -110,6 +118,68 @@ - clocks = <&wifi32k>; - clock-names = "ext_clock"; + cvbs-connector { + compatible = "composite-video-connector"; + +@@ -32,6 +40,68 @@ + }; + }; }; + + sound { + compatible = "amlogic,gx-sound-card"; -+ model = "GXL-P241"; -+ audio-aux-devs = <&au2>; ++ model = "S905X-P212"; ++ audio-aux-devs = <&dio2133>; + audio-widgets = "Line", "Lineout"; + audio-routing = "AU2 INL", "ACODEC LOLN", + "AU2 INR", "ACODEC LORN", diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch index 54e1bf5e82..8fa6c9fd53 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-remove-redundant-if-statement.patch @@ -1,7 +1,7 @@ -From cddff492c7993629c2d26d1ce37d76c448d57b8f Mon Sep 17 00:00:00 2001 +From 341fc7a61cc42cb90b89ed2d5d645e3f248efd66 Mon Sep 17 00:00:00 2001 From: benjamin545 Date: Thu, 15 Jul 2021 14:32:33 -0400 -Subject: [PATCH 52/77] WIP: drivers: meson: vdec: remove redundant if +Subject: [PATCH 53/79] WIP: drivers: meson: vdec: remove redundant if statement checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch index 6ad458adeb..e736ec1c47 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-improve-mmu-and-fbc-handling-.patch @@ -1,7 +1,7 @@ -From e92f87202db2ac13c8e7af5f6356e8ddc9857e5b Mon Sep 17 00:00:00 2001 +From 68657bde0bbcd91a96515ccb7b7d933f60a11850 Mon Sep 17 00:00:00 2001 From: benjamin545 Date: Thu, 15 Jul 2021 16:32:39 -0400 -Subject: [PATCH 53/77] WIP: drivers: meson: vdec: improve mmu and fbc handling +Subject: [PATCH 54/79] WIP: drivers: meson: vdec: improve mmu and fbc handling and add 10 bit handling --- @@ -453,7 +453,7 @@ index 0906b8fb5cc6..a48170fe4cff 100644 u8 quantization; u8 xfer_func; diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c -index b9125c295d1d..bae69b55baf3 100644 +index 203d7afa085d..23a69c51c634 100644 --- a/drivers/staging/media/meson/vdec/vdec_helpers.c +++ b/drivers/staging/media/meson/vdec/vdec_helpers.c @@ -50,32 +50,40 @@ void amvdec_write_parser(struct amvdec_core *core, u32 reg, u32 val) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch index abee35c803..47004f8264 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From a7ac405cb1eebfdf9a8ad7b28787c21df7ae8a5a Mon Sep 17 00:00:00 2001 +From 9065ee07cc7930532b02be84cf4673a86c8a09ba Mon Sep 17 00:00:00 2001 From: benjamin545 Date: Thu, 15 Jul 2021 17:08:42 -0400 -Subject: [PATCH 54/77] WIP: drivers: meson: vdec: add HEVC decode codec +Subject: [PATCH 55/79] WIP: drivers: meson: vdec: add HEVC decode codec --- drivers/staging/media/meson/vdec/Makefile | 2 +- @@ -1517,7 +1517,7 @@ index 0392f41a1eed..e7eabdd2b119 100644 #define HEVC_SAO_MMU_VH1_ADDR 0xd8ec diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index eabbebab2da2..3f463e0538fd 100644 +index 88c9d72e1c83..8592cb3aaea9 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -11,6 +11,7 @@ @@ -1547,10 +1547,11 @@ index eabbebab2da2..3f463e0538fd 100644 }, { .pixfmt = V4L2_PIX_FMT_H264, .min_buffers = 2, -@@ -103,6 +116,18 @@ static const struct amvdec_format vdec_formats_gxl[] = { - - static const struct amvdec_format vdec_formats_gxm[] = { - { +@@ -114,6 +127,18 @@ static const struct amvdec_format vdec_formats_gxm[] = { + .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED | + V4L2_FMT_FLAG_DYN_RESOLUTION, ++ }, { + .pixfmt = V4L2_PIX_FMT_HEVC, + .min_buffers = 4, + .max_buffers = 24, @@ -1562,11 +1563,10 @@ index eabbebab2da2..3f463e0538fd 100644 + .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED | + V4L2_FMT_FLAG_DYN_RESOLUTION, -+ }, { + }, { .pixfmt = V4L2_PIX_FMT_H264, .min_buffers = 2, - .max_buffers = 24, -@@ -153,6 +178,18 @@ static const struct amvdec_format vdec_formats_g12a[] = { +@@ -165,6 +190,18 @@ static const struct amvdec_format vdec_formats_g12a[] = { .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, }, { @@ -1585,7 +1585,7 @@ index eabbebab2da2..3f463e0538fd 100644 .pixfmt = V4L2_PIX_FMT_H264, .min_buffers = 2, .max_buffers = 24, -@@ -202,6 +239,18 @@ static const struct amvdec_format vdec_formats_sm1[] = { +@@ -214,6 +251,18 @@ static const struct amvdec_format vdec_formats_sm1[] = { .pixfmts_cap = { V4L2_PIX_FMT_NV12M, 0 }, .flags = V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch index 2c8f02006c..2ece950abf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-handling-to-HEVC-decoder-.patch @@ -1,7 +1,7 @@ -From db70fba97a46422fa14293dfa4d6d5bdb2c11290 Mon Sep 17 00:00:00 2001 +From e42db1763de291f740b189d82b7b7fb7199cd6d6 Mon Sep 17 00:00:00 2001 From: benjamin545 Date: Mon, 2 Aug 2021 15:18:40 -0400 -Subject: [PATCH 55/77] WIP: drivers: meson: vdec: add handling to HEVC decoder +Subject: [PATCH 56/79] WIP: drivers: meson: vdec: add handling to HEVC decoder to show frames when ready ..rather than when no longer referenced diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch index 3ac99cfa75..e4de0e9022 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-WIP-drivers-meson-vdec-add-HEVC-support-to-GXBB.patch @@ -1,7 +1,7 @@ -From f546a007569002db78e08399845c1806579e2d37 Mon Sep 17 00:00:00 2001 +From 9c68e82ec9586c13708942d8a5a8931bb22eabbd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 21 Nov 2021 19:12:07 +0000 -Subject: [PATCH 56/77] WIP: drivers: meson: vdec: add HEVC support to GXBB +Subject: [PATCH 57/79] WIP: drivers: meson: vdec: add HEVC support to GXBB It's not clear whether the GXL firmware is the same one used with GXBB but let's try it and see! @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 12 insertions(+) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index 3f463e0538fd..b03527705cc8 100644 +index 8592cb3aaea9..810039a02b44 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -16,6 +16,18 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-WIP-drivers-meson-vdec-check-if-parser-has-really-pa.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-WIP-drivers-meson-vdec-check-if-parser-has-really-pa.patch index 93e414b224..6d0c0e9e77 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-WIP-drivers-meson-vdec-check-if-parser-has-really-pa.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-WIP-drivers-meson-vdec-check-if-parser-has-really-pa.patch @@ -1,7 +1,7 @@ -From bd1ba4f425e2fa4b9311df760df0a40b96756a72 Mon Sep 17 00:00:00 2001 +From 881e27f6225767d6fbded545eac1db62647b0b35 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 58/77] WIP: drivers: meson: vdec: check if parser has really +Subject: [PATCH 58/79] WIP: drivers: meson: vdec: check if parser has really parser before marking input buffer as error Signed-off-by: Neil Armstrong diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-WIP-arm64-dts-meson-radxa-zero-add-support-for-the-u.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-WIP-arm64-dts-meson-radxa-zero-add-support-for-the-u.patch index a2f493a1e3..b415110283 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-WIP-arm64-dts-meson-radxa-zero-add-support-for-the-u.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-WIP-arm64-dts-meson-radxa-zero-add-support-for-the-u.patch @@ -1,7 +1,7 @@ -From f669fd3b1795180c6e50c4646f08eea5d45e76a8 Mon Sep 17 00:00:00 2001 +From 61d5770b41a0de4dc781219e4fd53e9d011591c7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 17 Aug 2021 16:16:43 +0000 -Subject: [PATCH 59/77] WIP: arm64: dts: meson: radxa-zero: add support for the +Subject: [PATCH 59/79] WIP: arm64: dts: meson: radxa-zero: add support for the usb type-c controller Radxa Zero uses an FUSB302 type-c controller, so lets enable it. @@ -13,14 +13,14 @@ GPIOAO_6 for USB3 polarity control. Suggested-by: Neil Armstrong Signed-off-by: Christian Hewitt --- - .../dts/amlogic/meson-g12a-radxa-zero.dts | 47 +++++++++++++++++++ - 1 file changed, 47 insertions(+) + .../dts/amlogic/meson-g12a-radxa-zero.dts | 44 +++++++++++++++++++ + 1 file changed, 44 insertions(+) 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..30d799b44559 100644 +index e3bb6df42ff3..5e3dc013409f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -60,6 +60,17 @@ +@@ -60,6 +60,14 @@ clock-names = "ext_clock"; }; @@ -30,15 +30,12 @@ index e3bb6df42ff3..30d799b44559 100644 + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&ao_5v>; -+ -+ gpio = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; -+ enable-active-high; + }; + ao_5v: regulator-ao_5v { compatible = "regulator-fixed"; regulator-name = "AO_5V"; -@@ -191,6 +202,18 @@ +@@ -191,6 +199,18 @@ }; }; @@ -57,7 +54,7 @@ index e3bb6df42ff3..30d799b44559 100644 &arb { status = "okay"; }; -@@ -278,6 +301,22 @@ +@@ -278,6 +298,22 @@ pinctrl-names = "default"; }; @@ -80,7 +77,7 @@ index e3bb6df42ff3..30d799b44559 100644 &pwm_AO_cd { pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-names = "default"; -@@ -403,3 +442,11 @@ +@@ -403,3 +439,11 @@ status = "okay"; dr_mode = "host"; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-dt-bindings-arm-amlogic-add-support-for-Radxa-Ze.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-dt-bindings-arm-amlogic-add-support-for-Radxa-Ze.patch new file mode 100644 index 0000000000..fa1e5b450b --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-dt-bindings-arm-amlogic-add-support-for-Radxa-Ze.patch @@ -0,0 +1,29 @@ +From 8534bf4f2f554594d0d0f4c1f77563635a8ecb14 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 16 Feb 2022 07:27:07 +0000 +Subject: [PATCH 60/79] WIP: 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 +--- + 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 05365bb50b29..d069aecabeb3 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -152,6 +152,7 @@ properties: + items: + - enum: + - khadas,vim3 ++ - radxa,zero2 + - const: amlogic,a311d + - const: amlogic,g12b + +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-support-for-Radxa-Zero2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-support-for-Radxa-Zero2.patch new file mode 100644 index 0000000000..bfbc5a1d8e --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-support-for-Radxa-Zero2.patch @@ -0,0 +1,547 @@ +From f34401cc59b8732e46bd42c3abedfa8f3da2cab5 Mon Sep 17 00:00:00 2001 +From: Yuntian Zhang +Date: Fri, 14 Jan 2022 15:50:02 +0000 +Subject: [PATCH 61/79] WIP: arm64: dts: meson: add support for Radxa Zero2 + +Radxa Zero2 is a small form factor SBC based on the Amlogic A311D +chipset that ships in a number of eMMC configurations: + +- Amlogic A311D (Quad A73 + Dual A53) CPU +- 4GB LPDDR4 RAM +- 32/64/128GB eMMC +- Mali G52-MP4 GPU +- HDMI 2.1 output (micro) +- BCM4345 WiFi (2.4/5GHz a/b/g/n/ac) and BT 5.0 +- 1x USB 2.0 port - Type C (OTG) +- 1x USB 3.0 port - Type C (Host) +- 1x micro SD Card slot +- 40 Pin GPIO header + +Signed-off-by: Yuntian Zhang +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/meson-g12b-radxa-zero2.dts | 499 ++++++++++++++++++ + 2 files changed, 500 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index 383e9fb49852..d606270f7db2 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +new file mode 100644 +index 000000000000..fefa6f2b7abf +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +@@ -0,0 +1,499 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS ++ * Author: Neil Armstrong ++ * Copyright (c) 2019 Christian Hewitt ++ * Copyright (c) 2022 Radxa Limited ++ * Author: Yuntian Zhang ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-a311d.dtsi" ++#include ++#include ++#include ++#include ++ ++/ { ++ compatible = "radxa,zero2", "amlogic,a311d", "amlogic,g12b"; ++ model = "Radxa Zero2"; ++ ++ aliases { ++ serial0 = &uart_AO; ++ serial2 = &uart_A; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; ++ }; ++ ++ gpio-keys-polled { ++ compatible = "gpio-keys-polled"; ++ poll-interval = <100>; ++ power-button { ++ label = "power"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio GPIOA_12 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++ cvbs-connector { ++ status = "disabled"; ++ compatible = "composite-video-connector"; ++ ++ port { ++ cvbs_connector_in: endpoint { ++ remote-endpoint = <&cvbs_vdac_out>; ++ }; ++ }; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ ao_5v: regulator-ao_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "AO_5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vcc_1v8: regulator-vcc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ vcc_3v3: regulator-vcc_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ /* FIXME: actually controlled by VDDCPU_B_EN */ ++ }; ++ ++ vddao_1v8: regulator-vddao_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO1V8"; ++ 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 = <&ao_5v>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ /* ++ * MP8756GD Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <730000>; ++ regulator-max-microvolt = <1022000>; ++ ++ pwm-supply = <&ao_5v>; ++ ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ /* ++ * Silergy SY8120B1ABC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <730000>; ++ regulator-max-microvolt = <1022000>; ++ ++ pwm-supply = <&ao_5v>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "RADXA-ZERO2"; ++ 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>; ++ status = "okay"; ++ ++ 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>; ++ }; ++ }; ++ }; ++ ++ 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"; ++}; ++ ++&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"; ++ status = "okay"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&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>; ++}; ++ ++&cvbs_vdac_port { ++ cvbs_vdac_out: endpoint { ++ remote-endpoint = <&cvbs_connector_in>; ++ }; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&gpio { ++ gpio-line-names = ++ /* GPIOZ */ ++ "PIN_27", "PIN_28", "PIN_7", "PIN_11", "PIN_13", "PIN_15", "PIN_18", "PIN_40", ++ "", "", "", "", "", "", "", "", ++ /* GPIOH */ ++ "", "", "", "", "PIN_19", "PIN_21", "PIN_24", "PIN_23", ++ "", ++ /* BOOT */ ++ "", "", "", "", "", "", "", "", ++ "", "", "", "", "EMMC_PWRSEQ", "", "", "", ++ /* GPIOC */ ++ "", "", "", "", "", "", "SD_CD", "PIN_36", ++ /* GPIOA */ ++ "PIN_32", "PIN_12", "PIN_35", "", "", "PIN_38", "", "", ++ "", "", "", "", "LED_GREEN", "PIN_31", "PIN_3", "PIN_5", ++ /* GPIOX */ ++ "", "", "", "", "", "", "SDIO_PWRSEQ", "", ++ "", "", "", "", "", "", "", "", ++ "", "BT_SHUTDOWN", "", ""; ++}; ++ ++&gpio_ao { ++ gpio-line-names = ++ /* GPIOAO */ ++ "PIN_8", "PIN_10", "", "BTN_POWER", "", "", "", "PIN_29", ++ "PIN_33", "PIN_37", "FAN", "", ++ /* GPIOE */ ++ "", "", ""; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&ao_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&ir { ++ status = "disabled"; ++ pinctrl-0 = <&remote_input_ao_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&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"; ++ clocks = <&xtal>; ++ clock-names = "clkin2"; ++ status = "okay"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin4"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* SDIO */ ++&sd_emmc_a { ++ status = "okay"; ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <100000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power to be kept while in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ 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 = <&vddao_3v3>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ 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 = <&vcc_3v3>; ++ vqmmc-supply = <&vcc_1v8>; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++&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 = "brcm,bcm43438-bt"; ++ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ max-speed = <2000000>; ++ clocks = <&wifi32k>; ++ clock-names = "lpo"; ++ }; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb { ++ status = "okay"; ++}; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch index 07e0ba8775..c0dd327cc4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch @@ -1,7 +1,7 @@ -From cab5b0ca4bb703d383bbc02b7127eca420338090 Mon Sep 17 00:00:00 2001 +From 6ceea9f0eca293dbc82f37ad587a3be4ba495e18 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 60/77] WIP: arm64: dts: meson: add audio playback to p201 +Subject: [PATCH 62/79] 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-0062-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch deleted file mode 100644 index 7db5d469ea..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-WIP-arm64-dts-meson-add-audio-playback-to-p212-s905x.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ba718fd73363cbc3d88e00fe9e156dca2d82fae9 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Fri, 15 May 2020 08:02:54 +0000 -Subject: [PATCH 62/77] WIP: arm64: dts: meson: add audio playback to - p212-s905x dtsi - -Add initial audio support limited to HDMI i2s. - -Signed-off-by: Christian Hewitt ---- - .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 40 +++++++++++++++++++ - 1 file changed, 40 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index 05cb2f5e5c36..5d41d93bd008 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -11,6 +11,7 @@ - /* Common DTSI for devices which are based on the P212 reference board. */ - - #include "meson-gxl-s905x.dtsi" -+#include - - / { - aliases { -@@ -85,6 +86,45 @@ - clocks = <&wifi32k>; - clock-names = "ext_clock"; - }; -+ -+ sound { -+ compatible = "amlogic,gx-sound-card"; -+ model = "S905X-P212"; -+ assigned-clocks = <&clkc CLKID_MPLL0>, -+ <&clkc CLKID_MPLL1>, -+ <&clkc CLKID_MPLL2>; -+ assigned-clock-parents = <0>, <0>, <0>; -+ assigned-clock-rates = <294912000>, -+ <270950400>, -+ <393216000>; -+ status = "okay"; -+ -+ dai-link-0 { -+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -+ }; -+ -+ dai-link-1 { -+ sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; -+ dai-format = "i2s"; -+ mclk-fs = <256>; -+ -+ codec-0 { -+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>; -+ }; -+ }; -+ -+ dai-link-2 { -+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>; -+ -+ codec-0 { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+}; -+ -+&aiu { -+ status = "okay"; - }; - - ðmac { --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch index 1a5debfe51..a3bf02b993 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch @@ -1,7 +1,7 @@ -From 92b21a784ed7178dc4a0a17a708e0253b176ae12 Mon Sep 17 00:00:00 2001 +From aa3d13886183e5f31263b312a7b67f2f18ccb1a7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 61/77] WIP: arm64: dts: meson: add audio playback to p200 +Subject: [PATCH 63/79] 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-0063-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch index 6a422aebfd..47f93c1a52 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch @@ -1,7 +1,7 @@ -From f6e7d4bdc5a96b55e626fd6ba0300a0e4f7cbc28 Mon Sep 17 00:00:00 2001 +From 20174e83e65843e6fa0c84142b88c42be5d3220d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 63/77] WIP: arm64: dts: meson: add audio playback to u200 +Subject: [PATCH 64/79] 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-0064-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch index c7ac985399..b554bfc141 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch @@ -1,7 +1,7 @@ -From 07ea4a11d76ac9ff589bca2d8cf0c385f971fceb Mon Sep 17 00:00:00 2001 +From 752067e2a76b0626fa63318da1894cb25026bb98 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Nov 2021 13:50:06 +0000 -Subject: [PATCH 64/77] WIP: arm64: dts: meson: add Headphone output to Beelink +Subject: [PATCH 65/79] 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-0066-WIP-ALSA-pcm-fix-ELD-constraints-for-some-compressed.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-ALSA-pcm-fix-ELD-constraints-for-some-compressed.patch deleted file mode 100644 index 10d7973367..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-ALSA-pcm-fix-ELD-constraints-for-some-compressed.patch +++ /dev/null @@ -1,91 +0,0 @@ -From feed5b68c294136aa124de747e9f0a22dfb79d96 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Fri, 19 Mar 2021 12:14:17 +0100 -Subject: [PATCH 66/77] WIP: ALSA: pcm: fix ELD constraints for some compressed - audio formats - -The SADs of compressed formats like AC3 and DTS contain the channel -and sample rate info of the audio data inside the compressed stream, -but when building constraints we must use the rates and formats used -to pass through the stream. eg 2ch 48kHz for AC3. - -Signed-off-by: Matthias Reichl ---- - sound/core/pcm_drm_eld.c | 38 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 35 insertions(+), 3 deletions(-) - -diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c -index 4b5faae5d16e..e7ec7a8b9d42 100644 ---- a/sound/core/pcm_drm_eld.c -+++ b/sound/core/pcm_drm_eld.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - static const unsigned int eld_rates[] = { - 32000, -@@ -17,9 +18,40 @@ static const unsigned int eld_rates[] = { - 192000, - }; - -+static unsigned int sad_format(const u8 *sad) -+{ -+ return (sad[0] & 0x78) >> 3; -+} -+ - static unsigned int sad_max_channels(const u8 *sad) - { -- return 1 + (sad[0] & 7); -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 2; -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 8; -+ default: -+ return 1 + (sad[0] & 7); -+ } -+} -+ -+static unsigned int sad_rate_mask(const u8 *sad) -+{ -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ return 0x07; // 32-48kHz -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 0x7f; // 32-192kHz -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 0x60; // 176.4, 192kHz -+ default: -+ return sad[1] & 0x7f; -+ } - } - - static int eld_limit_rates(struct snd_pcm_hw_params *params, -@@ -42,7 +74,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, - * requested number of channels. - */ - if (c->min <= max_channels) -- rate_mask |= sad[1]; -+ rate_mask |= sad_rate_mask(sad); - } - } - -@@ -70,7 +102,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, - rate_mask |= BIT(i); - - for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) -- if (rate_mask & sad[1]) -+ if (rate_mask & sad_rate_mask(sad)) - t.max = max(t.max, sad_max_channels(sad)); - } - --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch similarity index 80% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch index 6d46aaa575..0f2cbd1c0b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch @@ -1,7 +1,7 @@ -From 8940635fc5a695e4f71343c822f0e002ef626c3f Mon Sep 17 00:00:00 2001 +From ed8e2b9928374e9e9544f7726ae591f79422f52e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 29 Feb 2020 15:13:02 +0000 -Subject: [PATCH 68/77] WIP: dt-bindings: arm: amlogic: add support for the +Subject: [PATCH 66/79] 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,10 +13,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 7c3627d9c773..6f3c43ae92c2 100644 +index d069aecabeb3..56fe7d25b892 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -143,6 +143,7 @@ properties: +@@ -144,6 +144,7 @@ properties: - enum: - amediatech,x96-max - amlogic,u200 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-ALSA-pcm-ignore-formats-not-supported-by-kodi-in.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-ALSA-pcm-ignore-formats-not-supported-by-kodi-in.patch deleted file mode 100644 index d5f6de2664..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-ALSA-pcm-ignore-formats-not-supported-by-kodi-in.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 43ab023e18e0b5bc626d86ba5ff09e781d4dd4be Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sat, 20 Mar 2021 10:48:54 +0100 -Subject: [PATCH 67/77] WIP: ALSA: pcm: ignore formats not supported by kodi in - ELD constraints - -Only parse channel info and rates from the PCM SAD. All other SAD -formats are mapped to basic audio (2ch, 32-48kHz). - -Signed-off-by: Matthias Reichl ---- - sound/core/pcm_drm_eld.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c -index e7ec7a8b9d42..81c1f684daa8 100644 ---- a/sound/core/pcm_drm_eld.c -+++ b/sound/core/pcm_drm_eld.c -@@ -33,8 +33,10 @@ static unsigned int sad_max_channels(const u8 *sad) - case HDMI_AUDIO_CODING_TYPE_DTS_HD: - case HDMI_AUDIO_CODING_TYPE_MLP: - return 8; -- default: -+ case HDMI_AUDIO_CODING_TYPE_PCM: - return 1 + (sad[0] & 7); -+ default: -+ return 2; // ignore, map to basic audio - } - } - -@@ -49,8 +51,10 @@ static unsigned int sad_rate_mask(const u8 *sad) - case HDMI_AUDIO_CODING_TYPE_DTS_HD: - case HDMI_AUDIO_CODING_TYPE_MLP: - return 0x60; // 176.4, 192kHz -- default: -+ case HDMI_AUDIO_CODING_TYPE_PCM: - return sad[1] & 0x7f; -+ default: -+ return 0x07; // ignore, map to basic audio - } - } - --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch index a124bff3ea..f0027bff00 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch @@ -1,7 +1,7 @@ -From 0fa2e5741c73f58343be4aaab6e11ad765c3cd70 Mon Sep 17 00:00:00 2001 +From 14e7663368e3c78aad21c8d0454150ce6fc1f057 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 20 Oct 2019 04:06:59 +0000 -Subject: [PATCH 69/77] WIP: arm64: dts: meson: add support for the Tanix TX5 +Subject: [PATCH 67/79] 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 f7aea90c7f2a..a9620b02bc1a 100644 +index d606270f7db2..0bc5a6d1374e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch index 98f6510d10..3d9476caca 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch @@ -1,7 +1,7 @@ -From 96afe1a89d48b3cfb80f778e7a77fc4c6320ae25 Mon Sep 17 00:00:00 2001 +From cd88d073e0eb7bf93d027c7523261c2e56c3f688 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 21 Oct 2019 03:58:06 +0000 -Subject: [PATCH 70/77] WIP: arm64: dts: meson: add multiple MeCool device +Subject: [PATCH 68/79] WIP: arm64: dts: meson: add multiple MeCool device trees This adds initial device trees for a range of MeCool devices based on various @@ -25,11 +25,11 @@ 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 a9620b02bc1a..3fb642f27fbd 100644 +index 0bc5a6d1374e..8607056c8a60 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -15,6 +15,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb +@@ -16,6 +16,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb 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 @@ -37,7 +37,7 @@ index a9620b02bc1a..3fb642f27fbd 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,7 +34,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +@@ -33,7 +35,10 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch index bc1b698702..2bb85dc73e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch @@ -1,7 +1,7 @@ -From 644080f9faadf99c811357837c53d832e90fe336 Mon Sep 17 00:00:00 2001 +From 90c107c90da6a39c905209c937eb48008e43cb7b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:50:13 +0000 -Subject: [PATCH 71/77] WIP: dt-bindings: arm: amlogic: add support for Minix +Subject: [PATCH 69/79] 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 6f3c43ae92c2..851aff819051 100644 +index 56fe7d25b892..5ae242fd767b 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-0072-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch index 5ba78b1721..bb19e9d600 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch @@ -1,7 +1,7 @@ -From cb5c0ad7370b21503a5454c17c88b0e4ab5902c5 Mon Sep 17 00:00:00 2001 +From d0534162a24d586afc07d25b0f25dcbbac5d75b4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:52:14 +0000 -Subject: [PATCH 72/77] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 70/79] 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 3fb642f27fbd..7e19a4f65454 100644 +index 8607056c8a60..4d6bb615d8e3 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb +@@ -18,6 +18,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-0073-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch index 5980db1d11..32711316bc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-media-rc-add-keymap-for-Beelink-Mini-MXIII-remot.patch @@ -1,7 +1,7 @@ -From c678f2e9aec7296092701d9741e9f26ee9df1222 Mon Sep 17 00:00:00 2001 +From 48bc8c6b232f4d1df1527486e517a36e9d842e1c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:33:47 +0000 -Subject: [PATCH 73/77] WIP: media: rc: add keymap for Beelink Mini MXIII +Subject: [PATCH 71/79] WIP: media: rc: add keymap for Beelink Mini MXIII remote Add a keymap and bindings for the simple IR (NEC) remote used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch index d93e76d98d..41860bba85 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch @@ -1,7 +1,7 @@ -From 650fe25297b94ae00fdbe882eb4d56c0de366bf9 Mon Sep 17 00:00:00 2001 +From cbc817cbcf361ffd2923f238a4f2c530e96986b0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:28:50 +0000 -Subject: [PATCH 74/77] WIP: dt-bindings: arm: amlogic: add support for Beelink +Subject: [PATCH 72/79] 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 851aff819051..cf430e4d77ea 100644 +index 5ae242fd767b..7bf98a03a999 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-0075-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch index 7635065323..029b150a5f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch @@ -1,7 +1,7 @@ -From e9ad2dc4bd2bf79168478676b3ba0d9e073b515c Mon Sep 17 00:00:00 2001 +From 2ae16b2715b0a64e9f95933e0d93cb3a7529c094 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:26:00 +0000 -Subject: [PATCH 75/77] WIP: arm64: dts: meson: add support for Beelink Mini +Subject: [PATCH 73/79] WIP: arm64: dts: meson: add support for Beelink Mini MXIII This is a GXBB board that ships in two variants, one with @@ -15,11 +15,11 @@ 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 7e19a4f65454..76ca9caa7826 100644 +index 4d6bb615d8e3..8014a6a43ba7 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb +@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-beelink-mini-mxiii.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch new file mode 100644 index 0000000000..e9076a03cf --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch @@ -0,0 +1,137 @@ +From 2b2bdca43febecfa1cb098e0cbb06a7d8e92f8ae Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sun, 16 Jan 2022 08:48:02 +0000 +Subject: [PATCH 74/79] WIP: media: rc: add keymap for MeCool M8S Pro W remote + +Add a keymap and bindings for the simple IR (NEC) remote used with +the MeCool M8S Pro W Android STB device. + +Signed-off-by: Christian Hewitt +--- + .../devicetree/bindings/media/rc.yaml | 1 + + drivers/media/rc/keymaps/Makefile | 1 + + .../media/rc/keymaps/rc-mecool-m8s-pro-w.c | 75 +++++++++++++++++++ + include/media/rc-map.h | 1 + + 4 files changed, 78 insertions(+) + create mode 100644 drivers/media/rc/keymaps/rc-mecool-m8s-pro-w.c + +diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml +index ab28159a1768..4bad220cb645 100644 +--- a/Documentation/devicetree/bindings/media/rc.yaml ++++ b/Documentation/devicetree/bindings/media/rc.yaml +@@ -94,6 +94,7 @@ properties: + - rc-manli + - rc-mecool-kii-pro + - rc-mecool-kiii-pro ++ - rc-mecool-m8s-pro-w + - rc-medion-x10 + - rc-medion-x10-digitainer + - rc-medion-x10-or2x +diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile +index 5dc7e2c0e62a..65be4a05d2f9 100644 +--- a/drivers/media/rc/keymaps/Makefile ++++ b/drivers/media/rc/keymaps/Makefile +@@ -70,6 +70,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \ + rc-manli.o \ + rc-mecool-kii-pro.o \ + rc-mecool-kiii-pro.o \ ++ rc-mecool-m8s-pro-w.o \ + rc-medion-x10.o \ + rc-medion-x10-digitainer.o \ + rc-medion-x10-or2x.o \ +diff --git a/drivers/media/rc/keymaps/rc-mecool-m8s-pro-w.c b/drivers/media/rc/keymaps/rc-mecool-m8s-pro-w.c +new file mode 100644 +index 000000000000..9024b999d5a9 +--- /dev/null ++++ b/drivers/media/rc/keymaps/rc-mecool-m8s-pro-w.c +@@ -0,0 +1,75 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++// ++// Copyright (C) 2022 Christian Hewitt ++ ++#include ++#include ++ ++// ++// Keytable for the MeCool M8S Pro W remote control ++// ++ ++static struct rc_map_table mecool_m8s_pro_w[] = { ++ ++ { 0x59, KEY_POWER }, ++ ++ // TV CONTROLS ++ ++ { 0x08, KEY_PREVIOUS }, ++ { 0x0b, KEY_NEXT }, ++ { 0x18, KEY_TEXT }, // INTERNET ++ { 0x19, KEY_MUTE }, ++ { 0x13, KEY_VOLUMEUP }, ++ { 0x17, KEY_VOLUMEDOWN }, ++ ++ { 0x0d, KEY_HOME }, ++ { 0x05, KEY_BACK }, ++ ++ { 0x06, KEY_UP }, ++ { 0x5a, KEY_LEFT }, ++ { 0x1b, KEY_RIGHT }, ++ { 0x1a, KEY_ENTER }, ++ { 0x16, KEY_DOWN }, ++ ++ { 0x45, KEY_MENU }, ++ { 0x12, KEY_CONTEXT_MENU }, // MOUSE ++ ++ { 0x52, KEY_NUMERIC_1 }, ++ { 0x50, KEY_NUMERIC_2 }, ++ { 0x10, KEY_NUMERIC_3 }, ++ { 0x56, KEY_NUMERIC_4 }, ++ { 0x54, KEY_NUMERIC_5 }, ++ { 0x14, KEY_NUMERIC_6 }, ++ { 0x4e, KEY_NUMERIC_7 }, ++ { 0x4c, KEY_NUMERIC_8 }, ++ { 0x0c, KEY_NUMERIC_9 }, ++ { 0x22, KEY_INFO }, // SEARCH ++ { 0x0f, KEY_NUMERIC_0 }, ++ { 0x51, KEY_BACKSPACE }, ++ ++}; ++ ++static struct rc_map_list mecool_m8s_pro_w_map = { ++ .map = { ++ .scan = mecool_m8s_pro_w, ++ .size = ARRAY_SIZE(mecool_m8s_pro_w), ++ .rc_proto = RC_PROTO_NEC, ++ .name = RC_MAP_MECOOL_M8S_PRO_W, ++ } ++}; ++ ++static int __init init_rc_map_mecool_m8s_pro_w(void) ++{ ++ return rc_map_register(&mecool_m8s_pro_w_map); ++} ++ ++static void __exit exit_rc_map_mecool_m8s_pro_w(void) ++{ ++ rc_map_unregister(&mecool_m8s_pro_w_map); ++} ++ ++module_init(init_rc_map_mecool_m8s_pro_w) ++module_exit(exit_rc_map_mecool_m8s_pro_w) ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Christian Hewitt +Date: Sun, 16 Jan 2022 08:15:36 +0000 +Subject: [PATCH 75/79] 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 +(GXL) reference design with an S905W chip. + +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 7bf98a03a999..0ee4a83cea2f 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -89,6 +89,7 @@ properties: + - amlogic,p281 + - oranth,tx3-mini + - jethome,jethub-j80 ++ - videostrong,gxl-m8s-pro-w + - const: amlogic,s905w + - const: amlogic,meson-gxl + +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch deleted file mode 100644 index 4cc7b85d93..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-Broadcom-WiFi-to-P212-dtsi.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 98e001a86feefce8614913f32a69c70cb2f48d39 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 4 Jan 2022 04:09:19 +0000 -Subject: [PATCH 76/77] WIP: arm64: dts: meson: add Broadcom WiFi to P212 dtsi - -The P212 has a combined WiFi/BT module. The BT side is already enabled -in the dtsi but the WiFi side is not. Let's tweak SDIO speed (in-line -with other GXL/GXM devices) and enable the WiFi module. While we are -here, move (alpha-sort) the pwm_ef node. - -Signed-off-by: Christian Hewitt ---- - .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 23 +++++++++++-------- - 1 file changed, 14 insertions(+), 9 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index 5d41d93bd008..e06ce00bfb07 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -137,6 +137,14 @@ - pinctrl-names = "default"; - }; - -+&pwm_ef { -+ status = "okay"; -+ pinctrl-0 = <&pwm_e_pins>; -+ pinctrl-names = "default"; -+ clocks = <&clkc CLKID_FCLK_DIV4>; -+ clock-names = "clkin0"; -+}; -+ - &saradc { - status = "okay"; - vref-supply = <&vddio_ao18>; -@@ -153,7 +161,7 @@ - - bus-width = <4>; - cap-sd-highspeed; -- max-frequency = <50000000>; -+ max-frequency = <100000000>; - - non-removable; - disable-wp; -@@ -165,6 +173,11 @@ - - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; -+ -+ brcmf: wifi@1 { -+ reg = <1>; -+ compatible = "brcm,bcm4329-fmac"; -+ }; - }; - - /* SD card */ -@@ -205,14 +218,6 @@ - vqmmc-supply = <&vddio_boot>; - }; - --&pwm_ef { -- status = "okay"; -- pinctrl-0 = <&pwm_e_pins>; -- pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; --}; -- - /* This is connected to the Bluetooth module: */ - &uart_A { - status = "okay"; --- -2.17.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch new file mode 100644 index 0000000000..24deb1f3bc --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch @@ -0,0 +1,66 @@ +From 5458d1e8aae666d568246da403402996f8824dba Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sun, 16 Jan 2022 08:17:41 +0000 +Subject: [PATCH 76/79] 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) +reference design with an S905W chip and the following specs: + +- 2GB DDR3 RAM +- 16GB eMMC +- 10/100 Base-T Ethernet +- SSV6051P Wireless (802.11 b/g/n) +- HDMI 2.0 video +- 1x 3.5mm AV jack +- 2x USB 2.0 port +- IR receiver +- 1x Power LED (blue) +- 1x Update/Reset button (underside) +- 1x micro SD card slot + +Signed-off-by: Christian Hewitt +--- + .../meson-gxl-s905w-mecool-m8s-pro-w.dts | 30 +++++++++++++++++++ + 1 file changed, 30 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-mecool-m8s-pro-w.dts + +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-mecool-m8s-pro-w.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-mecool-m8s-pro-w.dts +new file mode 100644 +index 000000000000..a5bbe7315471 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-mecool-m8s-pro-w.dts +@@ -0,0 +1,30 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2018 Martin Blumenstingl . ++ * Based on meson-gxl-s905d-p231.dts: ++ * - Copyright (c) 2016 Endless Computers, Inc. ++ * Author: Carlo Caione ++ */ ++ ++/dts-v1/; ++ ++#include "meson-gxl-s905x.dtsi" ++#include "meson-gx-p23x-q20x.dtsi" ++ ++/ { ++ compatible = "videostrong,gxl-m8s-pro-w", "amlogic,s905w", "amlogic,meson-gxl"; ++ model = "MeCool M8S Pro W"; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; ++ }; ++}; ++ ++&ir { ++ linux,rc-map-name = "rc-mecool-m8s-pro-w"; ++}; ++ ++&usb { ++ dr_mode = "host"; ++}; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch new file mode 100644 index 0000000000..bfc534d9b5 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch @@ -0,0 +1,27 @@ +From c2387bf8d3214160be9e188b2557fe022e1dceb9 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 02:40:20 +0000 +Subject: [PATCH 77/79] WIP: dt-bindings: arm: amlogic: add Vero 4K binding + +Add the board binding for the OSMC Vero 4K STB device + +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 0ee4a83cea2f..fbc9d7160c9a 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -102,6 +102,7 @@ properties: + - libretech,aml-s905x-cc + - libretech,aml-s905x-cc-v2 + - nexbox,a95x ++ - osmc,vero4k + - const: amlogic,s905x + - const: amlogic,meson-gxl + +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch new file mode 100644 index 0000000000..4385fa91cf --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch @@ -0,0 +1,230 @@ +From 2eb240af1317fc952ece8b38f0ecfc80dc00f423 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 19 Jan 2022 04:06:17 +0000 +Subject: [PATCH 78/79] 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: + +- 2GB DDR4 RAM +- 16GB eMMC +- HDMI 2.1 video +- S/PDIF optical output +- AV output +- 10/100 Ethernet +- AP6255 Wireless (802.11 a/b/g/n/ac, BT 4.2) +- 2x USB 2.0 ports (1x OTG) +- IR receiver (internal) +- IR extender port (external) +- 1x micro SD card slot +- 1x Power LED (red) +- 1x Reset button (in AV jack) + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/meson-gxl-s905x-vero4k.dts | 180 ++++++++++++++++++ + 2 files changed, 181 insertions(+) + 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 8014a6a43ba7..67d5fcedeeb8 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -37,6 +37,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-vero4k.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-ki-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-mecool-kii-pro.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts +new file mode 100644 +index 000000000000..6196153e424d +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts +@@ -0,0 +1,180 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Author: Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-gxl-s905x-p212.dtsi" ++#include ++#include ++#include ++ ++/ { ++ compatible = "osmc,vero4k", "amlogic,s905x", "amlogic,meson-gxl"; ++ model = "OSMC Vero 4K"; ++ ++ reserved-memory { ++ /* 32 MiB reserved for ARM Trusted Firmware (BL32) */ ++ secmon_reserved_bl32: secmon@5300000 { ++ reg = <0x0 0x05300000 0x0 0x2000000>; ++ no-map; ++ }; ++ }; ++ ++ gpio-keys-polled { ++ compatible = "gpio-keys-polled"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ poll-interval = <20>; ++ ++ button@0 { ++ label = "power"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-standby { ++ color = ; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio GPIODV_24 GPIO_ACTIVE_LOW>; ++ default-state = "off"; ++ panic-indicator; ++ }; ++ }; ++ ++ dio2133: analog-amplifier { ++ compatible = "simple-audio-amplifier"; ++ sound-name-prefix = "AU2"; ++ VCC-supply = <&hdmi_5v>; ++ enable-gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ cvbs-connector { ++ compatible = "composite-video-connector"; ++ ++ port { ++ cvbs_connector_in: endpoint { ++ remote-endpoint = <&cvbs_vdac_out>; ++ }; ++ }; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ sound { ++ compatible = "amlogic,gx-sound-card"; ++ model = "VERO4K"; ++ audio-aux-devs = <&dio2133>; ++ audio-widgets = "Line", "Lineout"; ++ audio-routing = "AU2 INL", "ACODEC LOLN", ++ "AU2 INR", "ACODEC LORN", ++ "Lineout", "AU2 OUTL", ++ "Lineout", "AU2 OUTR"; ++ assigned-clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ status = "okay"; ++ ++ dai-link-0 { ++ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>; ++ dai-format = "i2s"; ++ mclk-fs = <256>; ++ ++ codec-0 { ++ sound-dai = <&aiu AIU_HDMI CTRL_I2S>; ++ }; ++ ++ codec-1 { ++ sound-dai = <&aiu AIU_ACODEC CTRL_I2S>; ++ }; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&aiu AIU_HDMI CTRL_OUT>; ++ ++ codec-0 { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ ++ dai-link-3 { ++ sound-dai = <&aiu AIU_ACODEC CTRL_OUT>; ++ ++ codec-0 { ++ sound-dai = <&acodec>; ++ }; ++ }; ++ }; ++}; ++ ++&acodec { ++ AVDD-supply = <&vddio_ao18>; ++ status = "okay"; ++}; ++ ++&aiu { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ status = "okay"; ++ pinctrl-0 = <&ao_cec_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cvbs_vdac_port { ++ cvbs_vdac_out: endpoint { ++ remote-endpoint = <&cvbs_connector_in>; ++ }; ++}; ++ ++ðmac { ++ phy-mode = "rmii"; ++ phy-handle = <&internal_phy>; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&hdmi_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&internal_phy { ++ pinctrl-0 = <ð_link_led_pins>, <ð_act_led_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* This UART is brought out to the DB9 connector */ ++&uart_AO { ++ status = "okay"; ++}; +-- +2.17.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-drm-meson-meson_vclk-fix-VIC-alternate-timings.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-drm-meson-meson_vclk-fix-VIC-alternate-timings.patch new file mode 100644 index 0000000000..f20aae4707 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-drm-meson-meson_vclk-fix-VIC-alternate-timings.patch @@ -0,0 +1,44 @@ +From 4d4f68640020e59a85cf2fec0d3ae5f6d11e1861 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sun, 13 Feb 2022 08:53:39 +0000 +Subject: [PATCH 79/79] WIP: drm/meson/meson_vclk: fix VIC alternate timings + +4K VP9 media with 59.94 fractional refresh rate refuses to play with +the screen going blank (no sync) and the following error reported in +system logs: + +[ 89.610280] Fatal Error, invalid HDMI vclk freq 593406 + +Modetest shows the following: + +3840x2160 59.94 3840 4016 4104 4400 2160 2168 2178 2250 593407 flags: phsync, pvsync; type: driver +calculated value -----------------------------------------^ + +Tweaking DIV_ROUND_CLOSEST to use 1002 in calculations allows 593406 +to match and 4K 59.94 media now plays correctly. + +Unfortunately this is not a proper fix and it's not guaranteed to +work for everyone. It points and issue with clocks/precision somewhere. + +Fixes: ff217bc710e0 ("drm/meson: Add support for VIC alternate timings") +Signed-off-by: Christian Hewitt +--- + drivers/gpu/drm/meson/meson_vclk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c +index 2a82119eb58e..3fc7d9cb9953 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.c ++++ b/drivers/gpu/drm/meson/meson_vclk.c +@@ -110,7 +110,7 @@ + #define HDMI_PLL_LOCK BIT(31) + #define HDMI_PLL_LOCK_G12A (3 << 30) + +-#define FREQ_1000_1001(_freq) DIV_ROUND_CLOSEST(_freq * 1000, 1001) ++#define FREQ_1000_1001(_freq) DIV_ROUND_CLOSEST(_freq * 1000, 1002) + + /* VID PLL Dividers */ + enum { +-- +2.17.1 + diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 2f2653c374..e8b4016cba 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 5.16.0 Kernel Configuration +# Linux/arm64 5.17.0-rc4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc.real (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621" CONFIG_CC_IS_GCC=y @@ -215,7 +215,6 @@ CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_FUTEX_PI=y -CONFIG_HAVE_FUTEX_CMPXCHG=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y @@ -355,6 +354,8 @@ CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_1463225=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y +CONFIG_ARM64_ERRATUM_2051678=y +# CONFIG_ARM64_ERRATUM_2077057 is not set CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y CONFIG_ARM64_ERRATUM_2054223=y CONFIG_ARM64_ERRATUM_2067961=y @@ -429,6 +430,8 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y # # ARMv8.2 architectural features # +CONFIG_AS_HAS_ARMV8_2=y +CONFIG_AS_HAS_SHA3=y # CONFIG_ARM64_PMEM is not set CONFIG_ARM64_RAS_EXTN=y CONFIG_ARM64_CNP=y @@ -658,6 +661,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -822,8 +826,6 @@ CONFIG_MEMORY_FAILURE=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set -# CONFIG_CLEANCACHE is not set -CONFIG_FRONTSWAP=y CONFIG_CMA=y # CONFIG_CMA_DEBUG is not set CONFIG_CMA_DEBUGFS=y @@ -845,6 +847,7 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y # CONFIG_GUP_TEST is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y +# CONFIG_ANON_VMA_NAME is not set # # Data Access Monitoring @@ -1279,7 +1282,6 @@ CONFIG_BT_LE=y # CONFIG_BT_AOSPEXT is not set CONFIG_BT_DEBUGFS=y # CONFIG_BT_SELFTEST is not set -# CONFIG_BT_FEATURE_DEBUG is not set # # Bluetooth device drivers @@ -1288,6 +1290,7 @@ CONFIG_BT_INTEL=m CONFIG_BT_BCM=m CONFIG_BT_RTL=m CONFIG_BT_QCA=m +CONFIG_BT_MTK=m CONFIG_BT_HCIBTUSB=m # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set CONFIG_BT_HCIBTUSB_BCM=y @@ -1461,6 +1464,7 @@ CONFIG_PCI_MESON=y # CONFIG_UEVENT_HELPER is not set CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_DEVTMPFS_SAFE is not set CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y @@ -1666,7 +1670,6 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_RBD is not set -# CONFIG_BLK_DEV_RSXX is not set # # NVME Support @@ -1804,7 +1807,6 @@ CONFIG_ISCSI_BOOT_SYSFS=y # CONFIG_SCSI_MPI3MR is not set # CONFIG_SCSI_SMARTPQI is not set # CONFIG_SCSI_UFSHCD is not set -# CONFIG_SCSI_UFS_HWMON is not set # CONFIG_SCSI_HPTIOP is not set # CONFIG_SCSI_MYRB is not set # CONFIG_SCSI_MYRS is not set @@ -1989,6 +1991,7 @@ CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_DEC is not set # CONFIG_NET_VENDOR_DLINK is not set # CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_ENGLEDER is not set # CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_GOOGLE is not set # CONFIG_NET_VENDOR_HISILICON is not set @@ -2043,6 +2046,7 @@ CONFIG_DWMAC_MESON=y # CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_TEHUTI is not set # CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VERTEXCOM is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set @@ -2579,6 +2583,7 @@ CONFIG_SERIAL_8250_DWLIB=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_DW=y # CONFIG_SERIAL_8250_RT288X is not set +CONFIG_SERIAL_8250_PERICOM=y CONFIG_SERIAL_OF_PLATFORM=y # @@ -2631,6 +2636,7 @@ CONFIG_HW_RANDOM_OPTEE=m # CONFIG_HW_RANDOM_CCTRNG is not set # CONFIG_HW_RANDOM_XIPHERA is not set CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y +CONFIG_HW_RANDOM_CN10K=y # CONFIG_APPLICOM is not set CONFIG_DEVMEM=y CONFIG_DEVPORT=y @@ -2817,18 +2823,12 @@ CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set # CONFIG_PINCTRL_MCP23S08 is not set -# CONFIG_PINCTRL_SINGLE is not set -# CONFIG_PINCTRL_SX150X is not set -# CONFIG_PINCTRL_STMFX is not set -# CONFIG_PINCTRL_RK805 is not set -# CONFIG_PINCTRL_OCELOT is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set - -# -# Renesas pinctrl drivers -# -# end of Renesas pinctrl drivers - +# CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_RK805 is not set +# CONFIG_PINCTRL_SINGLE is not set +# CONFIG_PINCTRL_STMFX is not set +# CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON_GXBB=y CONFIG_PINCTRL_MESON_GXL=y @@ -2837,6 +2837,12 @@ CONFIG_PINCTRL_MESON_AXG=y CONFIG_PINCTRL_MESON_AXG_PMX=y CONFIG_PINCTRL_MESON_G12A=y CONFIG_PINCTRL_MESON_A1=y + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + CONFIG_GPIOLIB=y CONFIG_GPIOLIB_FASTPATH_LIMIT=512 CONFIG_OF_GPIO=y @@ -2920,6 +2926,7 @@ CONFIG_GPIO_PCA953X=m # # CONFIG_GPIO_AGGREGATOR is not set # CONFIG_GPIO_MOCKUP is not set +# CONFIG_GPIO_SIM is not set # end of Virtual GPIO drivers # CONFIG_W1 is not set @@ -2960,6 +2967,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_CHARGER_LT3651 is not set # CONFIG_CHARGER_LTC4162L is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set +# CONFIG_CHARGER_MAX77976 is not set # CONFIG_CHARGER_BQ2415X is not set # CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_BQ24257 is not set @@ -3082,6 +3090,7 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_NCT7904 is not set # CONFIG_SENSORS_NPCM7XX is not set # CONFIG_SENSORS_NZXT_KRAKEN2 is not set +# CONFIG_SENSORS_NZXT_SMART2 is not set # CONFIG_SENSORS_OCC_P8_I2C is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set @@ -3111,6 +3120,7 @@ CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_AMC6821 is not set # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA3221 is not set # CONFIG_SENSORS_TC74 is not set # CONFIG_SENSORS_THMC50 is not set @@ -3323,7 +3333,6 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8994 is not set # CONFIG_MFD_ROHM_BD718XX is not set -# CONFIG_MFD_ROHM_BD70528 is not set # CONFIG_MFD_ROHM_BD71828 is not set # CONFIG_MFD_ROHM_BD957XMUF is not set # CONFIG_MFD_STPMIC1 is not set @@ -3365,6 +3374,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_MAX8893 is not set # CONFIG_REGULATOR_MAX8952 is not set # CONFIG_REGULATOR_MAX8973 is not set +# CONFIG_REGULATOR_MAX20086 is not set # CONFIG_REGULATOR_MAX77826 is not set # CONFIG_REGULATOR_MCP16502 is not set # CONFIG_REGULATOR_MP5416 is not set @@ -3799,6 +3809,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_OV6650 is not set # CONFIG_VIDEO_OV5670 is not set # CONFIG_VIDEO_OV5675 is not set +# CONFIG_VIDEO_OV5693 is not set # CONFIG_VIDEO_OV5695 is not set # CONFIG_VIDEO_OV7251 is not set # CONFIG_VIDEO_OV772X is not set @@ -4100,8 +4111,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y # CONFIG_DRM_DP_CEC is not set CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_GEM_SHMEM_HELPER=y +CONFIG_DRM_GEM_SHMEM_HELPER=m CONFIG_DRM_SCHED=m # @@ -4131,7 +4141,8 @@ CONFIG_DRM_SCHED=m # CONFIG_DRM_AST is not set # CONFIG_DRM_MGAG200 is not set # CONFIG_DRM_RCAR_DW_HDMI is not set -# CONFIG_DRM_RCAR_LVDS is not set +# CONFIG_DRM_RCAR_USE_LVDS is not set +# CONFIG_DRM_RCAR_MIPI_DSI is not set # CONFIG_DRM_QXL is not set CONFIG_DRM_PANEL=y @@ -4225,6 +4236,7 @@ CONFIG_DRM_MESON_DW_HDMI=y # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_SIMPLEDRM is not set # CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9163 is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set # CONFIG_TINYDRM_ILI9486 is not set @@ -4239,6 +4251,7 @@ CONFIG_DRM_PANFROST=m # CONFIG_DRM_GUD is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y +CONFIG_DRM_NOMODESET=y # # Frame buffer Devices @@ -4330,6 +4343,7 @@ CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set @@ -4387,6 +4401,7 @@ CONFIG_SND_USB_VARIAX=m CONFIG_SND_SOC=y # CONFIG_SND_SOC_ADI is not set # CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_AMD_ACP_CONFIG is not set # CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set # CONFIG_SND_DESIGNWARE_I2S is not set @@ -4463,6 +4478,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ADAU7118_I2C is not set # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4118 is not set +# CONFIG_SND_SOC_AK4375 is not set # CONFIG_SND_SOC_AK4458 is not set # CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4613 is not set @@ -4561,6 +4577,7 @@ CONFIG_SND_SOC_SPDIF=y # CONFIG_SND_SOC_TDA7419 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TFA989X is not set +# CONFIG_SND_SOC_TLV320ADC3XXX is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set @@ -4681,6 +4698,7 @@ CONFIG_HID_KENSINGTON=y # CONFIG_HID_LCPOWER is not set # CONFIG_HID_LED is not set CONFIG_HID_LENOVO=y +# CONFIG_HID_LETSKETCH is not set CONFIG_HID_LOGITECH=y CONFIG_HID_LOGITECH_DJ=y CONFIG_HID_LOGITECH_HIDPP=y @@ -5141,6 +5159,10 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_PATTERN is not set # CONFIG_LEDS_TRIGGER_AUDIO is not set # CONFIG_LEDS_TRIGGER_TTY is not set + +# +# Simple LED drivers +# # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_SUPPORT=y @@ -5365,6 +5387,7 @@ CONFIG_R8188EU=m # CONFIG_FB_SM750 is not set CONFIG_STAGING_MEDIA=y +# CONFIG_VIDEO_MAX96712 is not set CONFIG_VIDEO_MESON_VDEC=m # CONFIG_VIDEO_ZORAN is not set # CONFIG_DVB_AV7110 is not set @@ -5389,6 +5412,7 @@ CONFIG_VIDEO_MESON_VDEC=m # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5412,6 +5436,7 @@ CONFIG_COMMON_CLK_SCPI=y # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_COMMON_CLK_LAN966X is not set # CONFIG_COMMON_CLK_S2MPS11 is not set # CONFIG_COMMON_CLK_AXI_CLKGEN is not set # CONFIG_COMMON_CLK_XGENE is not set @@ -5705,6 +5730,12 @@ CONFIG_MESON_SARADC=y # CONFIG_XILINX_XADC is not set # end of Analog to digital converters +# +# Analog to digital and digital to analog converters +# +# CONFIG_AD74413R is not set +# end of Analog to digital and digital to analog converters + # # Analog Front Ends # @@ -5762,6 +5793,7 @@ CONFIG_MESON_SARADC=y # # Digital to analog converters # +# CONFIG_AD3552R is not set # CONFIG_AD5064 is not set # CONFIG_AD5360 is not set # CONFIG_AD5380 is not set @@ -5781,6 +5813,7 @@ CONFIG_MESON_SARADC=y # CONFIG_AD5766 is not set # CONFIG_AD5770R is not set # CONFIG_AD5791 is not set +# CONFIG_AD7293 is not set # CONFIG_AD7303 is not set # CONFIG_AD8801 is not set # CONFIG_DPOT_DAC is not set @@ -5804,6 +5837,12 @@ CONFIG_MESON_SARADC=y # # end of IIO dummy driver +# +# Filters +# +# CONFIG_ADMV8818 is not set +# end of Filters + # # Frequency Synthesizers DDS/PLL # @@ -5819,6 +5858,7 @@ CONFIG_MESON_SARADC=y # # CONFIG_ADF4350 is not set # CONFIG_ADF4371 is not set +# CONFIG_ADMV1013 is not set # CONFIG_ADRF6780 is not set # end of Phase-Locked Loop (PLL) frequency synthesizers # end of Frequency Synthesizers DDS/PLL @@ -6124,8 +6164,10 @@ CONFIG_PHY_MESON_AXG_MIPI_DPHY=y # CONFIG_PHY_CADENCE_SALVO is not set # CONFIG_PHY_FSL_IMX8MQ_USB is not set # CONFIG_PHY_MIXEL_MIPI_DPHY is not set +# CONFIG_PHY_FSL_IMX8M_PCIE is not set # CONFIG_PHY_PXA_28NM_HSIC is not set # CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_LAN966X_SERDES is not set # CONFIG_PHY_CPCAP_USB is not set # CONFIG_PHY_MAPPHONE_MDM6600 is not set # CONFIG_PHY_OCELOT_SERDES is not set @@ -6144,6 +6186,8 @@ CONFIG_PHY_MESON_AXG_MIPI_DPHY=y # CONFIG_ARM_PMU is not set # CONFIG_ARM_DSU_PMU is not set # CONFIG_ARM_SPE_PMU is not set +# CONFIG_MARVELL_CN10K_TAD_PMU is not set +# CONFIG_HISI_PCIE_PMU is not set # end of Performance monitor support CONFIG_RAS=y @@ -6513,7 +6557,7 @@ CONFIG_INIT_STACK_NONE=y # end of Kernel hardening options # end of Security options -CONFIG_XOR_BLOCKS=m +CONFIG_XOR_BLOCKS=y CONFIG_CRYPTO=y # @@ -6658,6 +6702,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y # CONFIG_CRYPTO_DRBG_CTR is not set CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_KDF800108_CTR=y CONFIG_CRYPTO_USER_API=y CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_SKCIPHER=y @@ -6665,25 +6710,6 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=y # CONFIG_CRYPTO_USER_API_AEAD is not set CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_HASH_INFO=y - -# -# Crypto library routines -# -CONFIG_CRYPTO_LIB_AES=y -CONFIG_CRYPTO_LIB_ARC4=y -CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y -CONFIG_CRYPTO_LIB_BLAKE2S=y -CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y -CONFIG_CRYPTO_LIB_CHACHA=y -CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y -CONFIG_CRYPTO_LIB_CURVE25519=y -CONFIG_CRYPTO_LIB_DES=y -CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 -CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y -CONFIG_CRYPTO_LIB_POLY1305=y -CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y -CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set @@ -6727,7 +6753,6 @@ CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_GENERIC_STRNCPY_FROM_USER=y CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_FIND_FIRST_BIT=y CONFIG_CORDIC=m # CONFIG_PRIME_NUMBERS is not set CONFIG_RATIONAL=y @@ -6736,6 +6761,26 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y CONFIG_ARCH_HAS_FAST_MULTIPLIER=y CONFIG_ARCH_USE_SYM_ANNOTATIONS=y # CONFIG_INDIRECT_PIO is not set + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y +CONFIG_CRYPTO_LIB_CHACHA=y +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y +CONFIG_CRYPTO_LIB_CURVE25519=y +CONFIG_CRYPTO_LIB_DES=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_SHA256=y +# end of Crypto library routines + CONFIG_CRC_CCITT=m CONFIG_CRC16=y CONFIG_CRC_T10DIF=y @@ -6847,8 +6892,8 @@ CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=4 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DYNAMIC_DEBUG_CORE is not set +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DYNAMIC_DEBUG_CORE=y CONFIG_SYMBOLIC_ERRNAME=y CONFIG_DEBUG_BUGVERBOSE=y # end of printk and dmesg options @@ -6885,11 +6930,19 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_MISC=y +# +# Networking Debugging +# +# CONFIG_NET_DEV_REFCNT_TRACKER is not set +# CONFIG_NET_NS_REFCNT_TRACKER is not set +# end of Networking Debugging + # # Memory Debugging # @@ -7037,7 +7090,6 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_FAULT_INJECTION is not set CONFIG_ARCH_HAS_KCOV=y CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set