diff --git a/packages/linux/package.mk b/packages/linux/package.mk index b544bfe7dd..cfe4769bc9 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,11 +16,11 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="380df7b7938d3c3ba1d0d0b472a810fd38061329" # 6.9.5 - PKG_SHA256="740368c264d071200577ef745c1e06362564daefd941c7c562905853c6f16598" + PKG_VERSION="98f7e32f20d28ec452afb208f9cffc08448a2652" # 6.11.0 + PKG_SHA256="" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" - PKG_PATCH_DIRS="default rtlwifi/6.10 rtlwifi/6.11" + PKG_PATCH_DIRS="default" ;; raspberrypi) PKG_VERSION="c1321370c9af9681e0604c4d3363cf362fb48598" # 6.6.51 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 79dd1362e3..768830c38c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From 206700df130ec0f8d26200b06d654e43c50fef97 Mon Sep 17 00:00:00 2001 +From c10c853a2171806795b651d345e6f2e219231b17 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 01/52] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 01/35] LOCAL: set meson-gx cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch index 7a610d5b59..dfc2b5649c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From f0e9bd4a8b251fbc622ce375f7e5d3d7f2216601 Mon Sep 17 00:00:00 2001 +From 00e2f20560ea8e7a7b8599eb84b6b4ec87aa6e9f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 02/52] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 02/35] LOCAL: set meson-g12 cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 9d5eab6595d0..a960d07f9af3 100644 +index d08c97797010..0bc28eb2079b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -117,7 +117,7 @@ secmon_reserved_bl32: secmon@5300000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch index e5dbef34c5..fba2e5fa66 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From 2f1610b87a7cf5dc0b03dce6306d340d40bfde43 Mon Sep 17 00:00:00 2001 +From df51d70e7c239929672aaef042f5d2dd82b2ebb9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 03/52] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 03/35] LOCAL: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index d4e5e6834f..ffffeb145e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,7 +1,7 @@ -From 5f037501721e9a3be26d3ee1ae703967c40d5cea Mon Sep 17 00:00:00 2001 +From 1d18a30d304758cfe0dbfa24a6726c2bc3662f0d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 04/52] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 04/35] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend The Amlogic Meson GX SoCs uses a non-standard argument to the PSCI CPU_SUSPEND call to enter system suspend. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch index 722c32254c..afbe3afd48 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch @@ -1,7 +1,7 @@ -From 50299761b13374df2c3b9c48fb1658b80787cb56 Mon Sep 17 00:00:00 2001 +From f77ed164339433e1c3d5516fb222dace58fe8b5e Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 05/52] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 05/35] LOCAL: 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-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 451c5bad32..32658667e1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From c7a09826dd87ac6276723b795d07b1d7b3402003 Mon Sep 17 00:00:00 2001 +From 64c8a0f6d4d996cf19ce7c60342145a3734ea5ee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 06/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 06/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 4384e4a412..35f37b3789 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 650ba8c1646070e57055820228e28869f298f043 Mon Sep 17 00:00:00 2001 +From 9d3334346553c8939bfad508e0653183bef1a8a1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 07/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 07/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 9e2048e247..ceb1093cbc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From 1dd902597bf4f23cb22ca21592d7dd5bbc055c3d Mon Sep 17 00:00:00 2001 +From ecf83ea2a6eba1e155f0bb1109f0ec587c3cd295 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 08/52] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix +Subject: [PATCH 08/35] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch index f3f51a8a0d..da04e09345 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch @@ -1,7 +1,7 @@ -From 57075cf3c64b7d8a5466a86acd2275ededdbb382 Mon Sep 17 00:00:00 2001 +From c2aadae4e1d972f45ce2922216248b6e10d35119 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 09/52] LOCAL: ASoC: meson: assign internal PCM +Subject: [PATCH 09/35] LOCAL: ASoC: meson: assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with an HDMI codec the kctls @@ -24,10 +24,10 @@ Tested-by: Christian Hewitt 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c -index 6f73b3c2c205..4653351cc4b9 100644 +index 6e7905749c4a..f554295cc132 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c -@@ -2577,7 +2577,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, +@@ -2609,7 +2609,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, knew.name = "Playback Channel Map"; else knew.name = "Capture Channel Map"; @@ -40,7 +40,7 @@ index 6f73b3c2c205..4653351cc4b9 100644 knew.private_value = private_value; info->kctl = snd_ctl_new1(&knew, info); diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c -index d3abb7ce2153..e06b28c7e5ba 100644 +index 74caae52e127..99300f3bfb8c 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -802,7 +802,8 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch index 4a68761f9b..b8ff8cfc29 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch @@ -1,7 +1,7 @@ -From 9bc892b8d6af3441bbc7129818b370555830afff Mon Sep 17 00:00:00 2001 +From e75df97211041efbb284709e0fb48aa70949da48 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 10/52] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 10/35] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch new file mode 100644 index 0000000000..d99904444b --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.12-arm64-dts-amlogic-add-clock-and-clock-n.patch @@ -0,0 +1,831 @@ +From 77d60071b759c40f416b143c704c6a4b9540bc1a Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 28 Aug 2024 15:53:56 +0200 +Subject: [PATCH 11/35] FROMGIT(6.12): arm64: dts: amlogic: add clock and + clock-names to sound cards + +Add the missing clocks in the sound card nodes according to the +AXG and GX sound card bindings changes. + +It solves the following errors: +sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) + from schema $id: http://devicetree.org/schemas/sound/amlogic,axg-sound-card.yaml# +sound: Unevaluated properties are not allowed ('assigned-clock-parents', 'assigned-clock-rates', 'assigned-clocks' were unexpected) + from schema $id: http://devicetree.org/schemas/sound/amlogic,gx-sound-card.yaml# +sound: 'anyOf' conditional failed, one must be fixed: + 'clocks' is a required property + '#clock-cells' is a required property + from schema $id: http://devicetree.org/schemas/clock/clock.yaml# + +Acked-by: Conor Dooley +Link: https://lore.kernel.org/r/20240828-topic-amlogic-upstream-bindings-fixes-audio-snd-card-v2-3-58159abf0779@linaro.org +Signed-off-by: Neil Armstrong +--- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 ++++ + .../boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 4 ++++ + .../dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi | 6 ++++++ + arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 ++++ + .../arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++++ + .../boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 ++++ + .../arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts | 5 +++++ + arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 4 ++++ + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 4 ++++ + 50 files changed, 203 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +index 7ed526f45175..9611775b81ee 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts +@@ -268,6 +268,10 @@ sound { + "Speaker1 Right", "SPK1 OUT_D", + "Linein AINL", "Linein", + "Linein AINR", "Linein"; ++ clocks = <&clkc CLKID_HIFI_PLL>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_HIFI_PLL>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts +index af211d8f3952..a457b3f4397b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts +@@ -176,6 +176,10 @@ sound { + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +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 15b9bc280706..c779a5da7d1e 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +@@ -138,6 +138,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +index 61cb8135a392..ea51341f031b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +@@ -201,6 +201,10 @@ sound { + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +index 0e239939ade6..f70a46967e2b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +@@ -238,6 +238,10 @@ sound { + "Lineout", "10U2 OUTL", + "Lineout", "10U2 OUTR"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +index 05c7a1e3f1b7..32f98a192494 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +@@ -158,6 +158,10 @@ sound { + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +index 13d478f9c891..2d74456e685d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +@@ -70,6 +70,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts +index 003efed529ba..0f48c32bec97 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts +@@ -79,6 +79,10 @@ sound { + "LINPUT1", "Mic Jack", + "Mic Jack", "MICB"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +index 6a346cb86a53..d4e1990b5f26 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +@@ -194,6 +194,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi +index 3a24c2411552..de35fa2d7a6d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi +@@ -38,6 +38,12 @@ sound { + "SPDIFOUT_A IN 0", "FRDDR_A OUT 3", + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; ++ ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts +index bb73e10b5e74..369c5cf889b6 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts +@@ -48,6 +48,10 @@ sound { + "TDMOUT_A IN 2", "FRDDR_C OUT 1", + "TDM_A Playback", "TDMOUT_A OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts +index 6eeedd54ab91..654449afd3a4 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts +@@ -49,6 +49,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts +index 0da386cabe1a..e20311386745 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts +@@ -37,6 +37,10 @@ sound { + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +index eed2a23047ca..e21831dfceee 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +@@ -234,6 +234,10 @@ sound { + "Internal Speakers", "Speaker Amplifier OUTL", + "Internal Speakers", "Speaker Amplifier OUTR"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +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 86eb81112232..3bca8023638d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +@@ -95,6 +95,10 @@ sound { + "Lineout", "U19 OUTL", + "Lineout", "U19 OUTR"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts +index e26f3e3258e1..1b9097a30251 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts +@@ -39,6 +39,10 @@ sound { + "TODDR_B IN 6", "TDMIN_LB OUT", + "TODDR_C IN 6", "TDMIN_LB OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +index 8445701100d0..39feba7f2d08 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts +@@ -176,6 +176,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +index 6396f190d703..4c1a75b926ee 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +@@ -32,6 +32,10 @@ sound { + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi +index efd662a452e8..d38c3a224fbe 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi +@@ -194,6 +194,10 @@ sound { + "AU2 INR", "ACODEC LORN", + "7J4-14 LEFT", "AU2 OUTL", + "7J4-11 RIGHT", "AU2 OUTR"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +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 08d6b69ba469..45ccddd1aaf0 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +@@ -129,6 +129,10 @@ sound { + "AU2 INR", "ACODEC LORN", + "Lineout", "AU2 OUTL", + "Lineout", "AU2 OUTR"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +index f28452b9f00f..073b47ce8c3c 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +@@ -45,6 +45,10 @@ button-reset { + sound { + compatible = "amlogic,gx-sound-card"; + model = "KII-PRO"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +index 1fd2e56e6b08..cf2e2ef81680 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +@@ -135,6 +135,10 @@ hdmi_connector_in: endpoint { + sound { + compatible = "amlogic,gx-sound-card"; + model = "NANOPI-K2"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +index cca129ce2c58..7d7dde93fff3 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +@@ -142,6 +142,10 @@ hdmi_connector_in: endpoint { + sound { + compatible = "amlogic,gx-sound-card"; + model = "NEXBOX-A95X"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +index c37cc6b036cd..959bd8d77a82 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +@@ -177,6 +177,10 @@ hdmi_connector_in: endpoint { + sound { + compatible = "amlogic,gx-sound-card"; + model = "ODROID-C2"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +index 7f94716876d3..bfac00e76ba3 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts +@@ -68,6 +68,10 @@ button-menu { + sound { + compatible = "amlogic,gx-sound-card"; + model = "P200"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +index 6f81eed83bec..c10f66031ecd 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +@@ -17,6 +17,10 @@ / { + sound { + compatible = "amlogic,gx-sound-card"; + model = "P201"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +index 255e93a0b36d..3807a184810b 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +@@ -108,6 +108,10 @@ sdio_pwrseq: sdio-pwrseq { + sound { + compatible = "amlogic,gx-sound-card"; + model = "VEGA-S95"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +index af9ea32a2876..ec281a9e9e77 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +@@ -16,6 +16,10 @@ / { + sound { + compatible = "amlogic,gx-sound-card"; + model = "WETEK-HUB"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +index 376760d86766..924414861b72 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +@@ -48,6 +48,10 @@ button { + sound { + compatible = "amlogic,gx-sound-card"; + model = "WETEK-PLAY2"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +index 90ef9c17d80b..c6132fb71dfc 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +@@ -123,6 +123,10 @@ sound { + "Speaker", "9J5-2 RIGHT"; + audio-routing = "9J5-3 LEFT", "ACODEC LOLN", + "9J5-2 RIGHT", "ACODEC LORN"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +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 08a4718219b1..c5e2306ad7a4 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts +@@ -128,6 +128,10 @@ sound { + "AU2 INR", "ACODEC LORN", + "Lineout", "AU2 OUTL", + "Lineout", "AU2 OUTR"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +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 dacbca73279c..0741d34945bb 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 +@@ -69,6 +69,10 @@ hdmi_connector_in: endpoint { + sound { + compatible = "amlogic,gx-sound-card"; + model = "KHADAS-VIM"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts +index 63b20860067c..6cbdfde00e12 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts +@@ -160,6 +160,10 @@ vcc_1v8: regulator-vcc-1v8 { + sound { + compatible = "amlogic,gx-sound-card"; + model = "LIBRETECH-CC-V2"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +index 8b26c9661be1..401064b0428d 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +@@ -142,6 +142,10 @@ sound { + "AU2 INR", "ACODEC LORN", + "Lineout", "AU2 OUTL", + "Lineout", "AU2 OUTR"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +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 9b4ea6a49398..8b41e340f919 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dts +@@ -50,6 +50,10 @@ sound { + "AU2 INR", "ACODEC LORN", + "Lineout", "AU2 OUTL", + "Lineout", "AU2 OUTR"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts +index de996e930b82..a9c5881c9783 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts +@@ -90,6 +90,11 @@ sound { + "AU2 INR", "ACODEC LORN", + "Lineout", "AU2 OUTL", + "Lineout", "AU2 OUTR"; ++ ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +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 a03269a00486..544c757f8bb7 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +@@ -152,6 +152,10 @@ wifi32k: wifi32k { + sound { + compatible = "amlogic,gx-sound-card"; + model = "KHADAS-VIM2"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +index ad2dd4ad0a31..773107cc47dd 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts +@@ -86,6 +86,10 @@ hdmi_connector_in: endpoint { + sound { + compatible = "amlogic,gx-sound-card"; + model = "NEXBOX-A1"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +index d05dde8da5c5..7356d3b628b1 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts +@@ -101,6 +101,10 @@ sdio_pwrseq: sdio-pwrseq { + sound { + compatible = "amlogic,gx-sound-card"; + model = "RBOX-PRO"; ++ clocks = <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>, ++ <&clkc CLKID_MPLL2>; ++ + assigned-clocks = <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>, + <&clkc CLKID_MPLL2>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +index e78cc9b577a0..7daa9b122d5c 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +@@ -182,6 +182,10 @@ sound { + "TODDR_B IN 0", "TDMIN_A OUT", + "TODDR_C IN 0", "TDMIN_A OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +index 082b72703cdf..929e4720ae76 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi +@@ -200,6 +200,10 @@ sound { + <&tdmin_a>, <&tdmin_b>, <&tdmin_c>, + <&dioo2133>; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +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 +index 9b2eb6e42651..3c43d3490e14 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts +index 6e34fd80ed71..445c1671ede7 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts +index 586034316ec3..eeaff22edade 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +index f045bf851638..697855fec476 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +@@ -57,6 +57,10 @@ sound { + "Lineout", "ACODEC LOLP", + "Lineout", "ACODEC LORP"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts +index e6e9410d40cb..7b3a014d4cde 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +index 951eb8e3f0c0..7b0e9817a615 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +@@ -174,6 +174,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +index 3581e14cbf18..2e3397e55da2 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +@@ -239,6 +239,10 @@ sound { + "TODDR_B IN 1", "TDMIN_B OUT", + "TODDR_C IN 1", "TDMIN_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +index fc9b961133cd..e4a3a2a8ad06 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts +index 9ea969255b4f..fff92e0d6dd5 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts +@@ -22,6 +22,10 @@ sound { + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT"; + ++ clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-dt-bindings-media-amlogic-gx-vdec-add-th.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-dt-bindings-media-amlogic-gx-vdec-add-th.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch index d88ef627b3..756117d1df 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-dt-bindings-media-amlogic-gx-vdec-add-th.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.12-dt-bindings-media-amlogic-gx-vdec-add-t.patch @@ -1,7 +1,7 @@ -From fbf4a552ce3e4cc22dd2a6efbf7f92133b8f2564 Mon Sep 17 00:00:00 2001 +From dcbe7ff6cbac1d657292105e1204a54337876562 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 1 Jun 2024 15:46:42 +0000 -Subject: [PATCH 32/52] FROMLIST(v1): dt-bindings: media: amlogic,gx-vdec: add +Subject: [PATCH 12/35] FROMGIT(6.12): dt-bindings: media: amlogic,gx-vdec: add the GXLX SoC family and update GXL The GXLX SoC is a GXL variant that omits VP9 codec support. Also add S905W diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-add-GXLX-SoC-platform.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-add-GXLX-SoC-platform.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch index 7e9994452c..f84afefbe7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-add-GXLX-SoC-platform.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.12-media-meson-vdec-add-GXLX-SoC-platform.patch @@ -1,7 +1,8 @@ -From 2ab0518984ce62d4492448fb574b88c9ffa8f3e7 Mon Sep 17 00:00:00 2001 +From 336acb5208b6c3b191772c4bbe89453af8c40313 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 1 Jun 2024 15:51:07 +0000 -Subject: [PATCH 33/52] FROMLIST(v1): media: meson: vdec: add GXLX SoC platform +Subject: [PATCH 13/35] FROMGIT(6.12): media: meson: vdec: add GXLX SoC + platform Add the GXLX SoC platform which is based on GXL but omits the VP9 codec. @@ -26,10 +27,10 @@ index de3e0345ab7c..5e5b296f93ba 100644 .data = &vdec_platform_g12a }, { .compatible = "amlogic,sm1-vdec", diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index 083adf0d07d9..ca0cb417d793 100644 +index f1df637681e5..75d295fdb5f8 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c -@@ -82,6 +82,44 @@ static const struct amvdec_format vdec_formats_gxl[] = { +@@ -57,6 +57,44 @@ static const struct amvdec_format vdec_formats_gxl[] = { }, }; @@ -74,7 +75,7 @@ index 083adf0d07d9..ca0cb417d793 100644 static const struct amvdec_format vdec_formats_gxm[] = { { .pixfmt = V4L2_PIX_FMT_VP9, -@@ -190,6 +228,12 @@ const struct vdec_platform vdec_platform_gxl = { +@@ -153,6 +191,12 @@ const struct vdec_platform vdec_platform_gxl = { .revision = VDEC_REVISION_GXL, }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index 19502677e4..ad1f52a2e9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From b8bcc5874a5db72ac67f2db4f23b4c467d41f809 Mon Sep 17 00:00:00 2001 +From ac7976449f94f467b90be088c475c565185df593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Feb 2022 08:23:12 +0000 -Subject: [PATCH 11/52] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 14/35] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan Micro Electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -17,10 +17,10 @@ Signed-off-by: Heiner Kallweit 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index b97d298b3eb6..3979d9ebb62a 100644 +index a70ce43b3dc0..c5e5100b83b0 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1464,6 +1464,8 @@ patternProperties: +@@ -1492,6 +1492,8 @@ patternProperties: description: Texas Instruments "^tianma,.*": description: Tianma Micro-electronics Co., Ltd. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index c373679b09..9668ce350a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From ec4c674f72dc4f18f83ed75c8d2ed973792c2572 Mon Sep 17 00:00:00 2001 +From a909b03eaa420b27578c39b37782d083dc78fbc5 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 12/52] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro +Subject: [PATCH 15/35] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro Electronics TM1628 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 2a3b1e261e..1543eb1649 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 3351eebeeffaa70b7738b78494156ceae8217993 Mon Sep 17 00:00:00 2001 +From a5922e5e617e614784c44d7014f79a8a96ea51c7 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 13/52] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 16/35] FROMLIST(v5): docs: ABI: document tm1628 attribute display-text Document the attribute for reading / writing the text to be displayed on diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index 5e9d36b2ed..4397972c26 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 7dacf519d956d0b5892fd539891fc0f92111b95a Mon Sep 17 00:00:00 2001 +From 8aabbce92cedee2b1185c2052e4f31c3f8bffc0e Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 14/52] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 17/35] FROMLIST(v5): auxdisplay: add support for Titanmec TM1628 7 segment display controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -44,7 +44,7 @@ Signed-off-by: Heiner Kallweit create mode 100644 drivers/auxdisplay/tm1628.c diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig -index 69d2138d7efb..dca186b9f2c1 100644 +index 21545ffba065..77646ea60e73 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -525,6 +525,17 @@ config SEG_LED_GPIO diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index c1dd3b9f74..72f57cb99a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From 626fb337c8e9ff57ef8e27c9328a79848ab49f5e Mon Sep 17 00:00:00 2001 +From 8264a2fb9e7c074325c84785f4350b8e211b1360 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 15/52] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add +Subject: [PATCH 18/35] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add support for the 7 segment display This patch adds support for the 7 segment display of the device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 77% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index f0bf90d9d1..8b05e7df99 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From c6b2c72494d81b6d552529d3931ce082985d44f1 Mon Sep 17 00:00:00 2001 +From bef741ca3036ec5d304ac717eceac108d1fe09f0 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 16/52] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 19/35] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit @@ -10,10 +10,10 @@ Signed-off-by: Heiner Kallweit 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS -index 28e20975c26f..82cce970986a 100644 +index cc40a9d9b8cd..2f101da4c452 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -22310,6 +22310,13 @@ W: http://sourceforge.net/projects/tlan/ +@@ -23098,6 +23098,13 @@ W: http://sourceforge.net/projects/tlan/ F: Documentation/networking/device_drivers/ethernet/ti/tlan.rst F: drivers/net/ethernet/ti/tlan.* diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index b539cf4a5b..d31bdd2069 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 391b15bb569f5bc0b41ef31de5b9dd51e9a5ccf9 Mon Sep 17 00:00:00 2001 +From 308949c7e2c71305266f529a0e8a2acaae3d88e3 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 17/52] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 20/35] FROMLIST(v1): ASoC: hdmi-codec: reorder channel allocation list Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). @@ -25,7 +25,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 e06b28c7e5ba..6ebbd4bfa47e 100644 +index 99300f3bfb8c..b39756f2e49b 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -185,84 +185,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index 78945ce21b..2e0b1ff28f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From f31321b94656600652e7214785d80dd67607e9ef Mon Sep 17 00:00:00 2001 +From a34c0a9239a990937e21ca3fdf6c58b88e40a409 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 18/52] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 21/35] FROMLIST(v1): media: meson: vdec: esparser: check parsing state with hardware write pointer Also check the hardware write pointer to check if ES Parser has stalled. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch deleted file mode 100644 index fc4f7c9720..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v4-dt-bindings-usb-Add-the-binding-example-.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 58bf6f6e59c22a472265a17a2420800c3136482b Mon Sep 17 00:00:00 2001 -From: Anand Moon -Date: Wed, 22 Nov 2023 23:53:46 +0530 -Subject: [PATCH 21/52] FROMLIST(v4): dt-bindings: usb: Add the binding example - for the Genesys Logic GL3523 hub - -Add the binding example for the USB3.1 Genesys Logic GL3523 -integrates with USB 3.1 Gen 1 Super Speed and USB 2.0 High-Speed -hub. - -Onboard USB hub supports USB 3.x and USB 2.0 peer controllers. -which has a common reset pin and power supply. -peer-hub phandle each peer controller with proper gpio reset -and help each peer power on during initialization -and power off during suspend. - -Signed-off-by: Anand Moon ---- - .../bindings/usb/genesys,gl850g.yaml | 67 +++++++++++++++++-- - 1 file changed, 63 insertions(+), 4 deletions(-) - -diff --git a/Documentation/devicetree/bindings/usb/genesys,gl850g.yaml b/Documentation/devicetree/bindings/usb/genesys,gl850g.yaml -index 37cf5249e526..47b7789ce7a5 100644 ---- a/Documentation/devicetree/bindings/usb/genesys,gl850g.yaml -+++ b/Documentation/devicetree/bindings/usb/genesys,gl850g.yaml -@@ -9,9 +9,6 @@ title: Genesys Logic USB hub controller - maintainers: - - Icenowy Zheng - --allOf: -- - $ref: usb-device.yaml# -- - properties: - compatible: - enum: -@@ -27,7 +24,16 @@ properties: - - vdd-supply: - description: -- the regulator that provides 3.3V core power to the hub. -+ phandle to the regulator that provides power to the hub. -+ -+ peer-hub: -+ $ref: /schemas/types.yaml#/definitions/phandle -+ description: -+ onboard USB hub supports USB 3.x and USB 2.0 peer controllers. -+ which has a common reset pin and power supply. -+ peer-hub phandle each peer controller with proper gpio reset -+ and help each peer power on during initialization -+ and power off during suspend. - - peer-hub: - $ref: /schemas/types.yaml#/definitions/phandle -@@ -38,6 +44,33 @@ required: - - compatible - - reg - -+allOf: -+ - $ref: usb-device.yaml# -+ - if: -+ properties: -+ compatible: -+ contains: -+ enum: -+ - usb5e3,608 -+ then: -+ properties: -+ peer-hub: false -+ vdd-supply: false -+ reset-gpios: true -+ -+ - if: -+ properties: -+ compatible: -+ contains: -+ enum: -+ - usb5e3,610 -+ - usb5e3,620 -+ then: -+ properties: -+ peer-hub: true -+ vdd-supply: true -+ reset-gpios: true -+ - additionalProperties: false - - examples: -@@ -54,3 +87,29 @@ examples: - reset-gpios = <&pio 7 2 GPIO_ACTIVE_LOW>; - }; - }; -+ -+ - | -+ #include -+ usb { -+ dr_mode = "host"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ /* 2.0 hub on port 1 */ -+ hub_2_0: hub@1 { -+ compatible = "usb5e3,610"; -+ reg = <1>; -+ peer-hub = <&hub_3_0>; -+ reset-gpios = <&gpio 20 GPIO_ACTIVE_LOW>; -+ vdd-supply = <&vcc_5v>; -+ }; -+ -+ /* 3.1 hub on port 4 */ -+ hub_3_0: hub@2 { -+ compatible = "usb5e3,620"; -+ reg = <2>; -+ peer-hub = <&hub_2_0>; -+ reset-gpios = <&gpio 20 GPIO_ACTIVE_LOW>; -+ vdd-supply = <&vcc_5v>; -+ }; -+ }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index e654a6b02e..48b309a7c2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From ccfb2ced6c3bda64c6f41bd9c7837c0ca8c9ead7 Mon Sep 17 00:00:00 2001 +From 3058edcf23558c1981045027dcb15d02b456b43d Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 19/52] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 22/35] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch deleted file mode 100644 index 70bc86425f..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v4-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a8fd419e5ae7d4232d09caa73918192273dc74e0 Mon Sep 17 00:00:00 2001 -From: Anand Moon -Date: Tue, 10 Oct 2023 08:54:43 +0530 -Subject: [PATCH 22/52] FROMLIST(v4): arm64: dts: amlogic: Used onboard usb hub - reset on odroid n2 - -On Odroid n2/n2+ previously use gpio-hog to reset the usb hub, -switch to used on-board usb hub reset to enable the usb hub -and enable power to hub. - -Signed-off-by: Anand Moon ---- - .../dts/amlogic/meson-g12b-odroid-n2.dtsi | 36 ++++++++++++------- - 1 file changed, 24 insertions(+), 12 deletions(-) - -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 d80dd9a3da31..86eb81112232 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -31,6 +31,30 @@ hub_5v: regulator-hub-5v { - enable-active-high; - }; - -+ /* USB hub supports both USB 2.0 and USB 3.0 root hub */ -+ usb-hub { -+ dr_mode = "host"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ /* 2.0 hub on port 1 */ -+ hub_2_0: hub@1 { -+ compatible = "usb5e3,610"; -+ reg = <1>; -+ peer-hub = <&hub_3_0>; -+ vdd-supply = <&usb_pwr_en>; -+ }; -+ -+ /* 3.0 hub on port 4 */ -+ hub_3_0: hub@2 { -+ compatible = "usb5e3,620"; -+ reg = <2>; -+ peer-hub = <&hub_2_0>; -+ reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>; -+ vdd-supply = <&vcc_5v>; -+ }; -+ }; -+ - sound { - compatible = "amlogic,axg-sound-card"; - model = "ODROID-N2"; -@@ -234,18 +258,6 @@ &gpio { - "PIN_3", /* GPIOX_17 */ - "PIN_5", /* GPIOX_18 */ - "PIN_36"; /* GPIOX_19 */ -- /* -- * WARNING: The USB Hub on the Odroid-N2 needs a reset signal -- * to be turned high in order to be detected by the USB Controller -- * This signal should be handled by a USB specific power sequence -- * in order to reset the Hub when USB bus is powered down. -- */ -- usb-hub-hog { -- gpio-hog; -- gpios = ; -- output-high; -- line-name = "usb-hub-reset"; -- }; - }; - - &i2c3 { --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch deleted file mode 100644 index 8b3e072097..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5ef1c858e834704d5ae23775d7e859f37a0ccdd4 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 23/52] FROMLIST(v1): arm64: dts: meson: radxa-zero2: add - pwm-fan support - -The A311D on Zero2 needs active cooling and the board includes a header to -connect a simple fan. Add pwm-fan support with basic thermal properties so -the fan runs when connected. - -Suggested-by: Yuntian Zhang -Signed-off-by: Christian Hewitt ---- - .../dts/amlogic/meson-g12b-radxa-zero2.dts | 27 +++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -index 890f5bfebb03..895b6ea67180 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -@@ -33,6 +33,15 @@ memory@0 { - reg = <0x0 0x0 0x0 0x80000000>; - }; - -+ fan0: pwm-fan { -+ compatible = "pwm-fan"; -+ #cooling-cells = <2>; -+ cooling-min-state = <0>; -+ cooling-max-state = <4>; -+ cooling-levels = <0 64 128 192 255>; -+ pwms = <&pwm_AO_ab 0 40000 0>; -+ }; -+ - gpio-keys-polled { - compatible = "gpio-keys-polled"; - poll-interval = <100>; -@@ -286,6 +295,24 @@ &cpu103 { - clock-latency = <50000>; - }; - -+&cpu_thermal { -+ cooling-maps { -+ map0 { -+ trip = <&cpu_passive>; -+ cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ -+&ddr_thermal { -+ cooling-maps { -+ map0 { -+ trip = <&ddr_passive>; -+ cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ - &frddr_a { - status = "okay"; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index a1a9232d5d..ea6edc68ca 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 818b4f3161d46d9a2c440b8ba8021657b8121317 Mon Sep 17 00:00:00 2001 +From 1313e9587848ed846d2f5ef2373712aa0a80bb61 Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 20/52] FROMLIST(v2): media: meson: vdec: add HEVC decode codec +Subject: [PATCH 23/35] FROMLIST(v2): media: meson: vdec: add HEVC decode codec Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using the common "HEVC" decoder driver. @@ -1546,7 +1546,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 f1df637681e5..083adf0d07d9 100644 +index 75d295fdb5f8..ca0cb417d793 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -11,10 +11,23 @@ @@ -1592,7 +1592,7 @@ index f1df637681e5..083adf0d07d9 100644 }, { .pixfmt = V4L2_PIX_FMT_H264, .min_buffers = 2, -@@ -70,6 +95,18 @@ static const struct amvdec_format vdec_formats_gxm[] = { +@@ -108,6 +133,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, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch similarity index 78% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch index 838835c764..11a40c931b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v1-iio-adc-meson-fix-voltage-reference-sele.patch @@ -1,7 +1,7 @@ -From 8a126faad7a89013f08e1988f046213c99af1a71 Mon Sep 17 00:00:00 2001 +From afeaf33b612fa359c1f2080cf179fddb5d099fc4 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:04:49 +0100 -Subject: [PATCH 25/52] FROMLIST(v1): iio: adc: meson: fix voltage reference +Subject: [PATCH 24/35] FROMLIST(v1): iio: adc: meson: fix voltage reference selection field name typo The field should be called "vref_voltage", without a typo in the word @@ -13,7 +13,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c -index 13b473d8c6c7..2615d74534df 100644 +index e16b0e28974e..4fe0688cb4d1 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -327,7 +327,7 @@ struct meson_sar_adc_param { @@ -25,7 +25,7 @@ index 13b473d8c6c7..2615d74534df 100644 }; struct meson_sar_adc_data { -@@ -1001,7 +1001,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) +@@ -989,7 +989,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) } regval = FIELD_PREP(MESON_SAR_ADC_REG11_VREF_VOLTAGE, @@ -34,7 +34,7 @@ index 13b473d8c6c7..2615d74534df 100644 regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_VREF_VOLTAGE, regval); -@@ -1225,7 +1225,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { +@@ -1212,7 +1212,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 10, .has_reg11 = true, @@ -43,7 +43,7 @@ index 13b473d8c6c7..2615d74534df 100644 .cmv_select = 1, }; -@@ -1237,7 +1237,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { +@@ -1224,7 +1224,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, @@ -52,7 +52,7 @@ index 13b473d8c6c7..2615d74534df 100644 .cmv_select = 1, }; -@@ -1249,7 +1249,7 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { +@@ -1236,7 +1236,7 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v2-meson_plane-Add-error-handling.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v2-meson_plane-Add-error-handling.patch deleted file mode 100644 index 4eb76c0c73..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v2-meson_plane-Add-error-handling.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b283f7314af96a207cbaaaf7cfb8baef6f5503d2 Mon Sep 17 00:00:00 2001 -From: Haoran Liu -Date: Wed, 29 Nov 2023 03:34:05 -0800 -Subject: [PATCH 24/52] FROMLIST(v2): meson_plane: Add error handling - -This patch adds robust error handling to the meson_plane_create -function in drivers/gpu/drm/meson/meson_plane.c. The function -previously lacked proper handling for potential failure scenarios -of the drm_universal_plane_init call. - -Signed-off-by: Haoran Liu ---- - drivers/gpu/drm/meson/meson_plane.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 815dfe30492b..b43ac61201f3 100644 ---- a/drivers/gpu/drm/meson/meson_plane.c -+++ b/drivers/gpu/drm/meson/meson_plane.c -@@ -534,6 +534,7 @@ int meson_plane_create(struct meson_drm *priv) - struct meson_plane *meson_plane; - struct drm_plane *plane; - const uint64_t *format_modifiers = format_modifiers_default; -+ int ret; - - meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane), - GFP_KERNEL); -@@ -548,12 +549,16 @@ int meson_plane_create(struct meson_drm *priv) - else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) - format_modifiers = format_modifiers_afbc_g12a; - -- drm_universal_plane_init(priv->drm, plane, 0xFF, -- &meson_plane_funcs, -- supported_drm_formats, -- ARRAY_SIZE(supported_drm_formats), -- format_modifiers, -- DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane"); -+ ret = drm_universal_plane_init(priv->drm, plane, 0xFF, -+ &meson_plane_funcs, -+ supported_drm_formats, -+ ARRAY_SIZE(supported_drm_formats), -+ format_modifiers, -+ DRM_PLANE_TYPE_PRIMARY, "meson_primary_plane"); -+ if (ret) { -+ devm_kfree(priv->drm->dev, meson_plane); -+ return ret; -+ } - - drm_plane_helper_add(plane, &meson_plane_helper_funcs); - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch index 1320de2afe..25c775eb47 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v1-iio-adc-consistently-use-bool-and-enum-i.patch @@ -1,7 +1,7 @@ -From 085649b4fb305f5280394b906ab8b9286fc7ebad Mon Sep 17 00:00:00 2001 +From 6ced1ee3d8cddbc5fd33e90c07741c404fb1acdd Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:30:02 +0100 -Subject: [PATCH 26/52] FROMLIST(v1): iio: adc: consistently use bool and enum +Subject: [PATCH 25/35] FROMLIST(v1): iio: adc: consistently use bool and enum in struct meson_sar_adc_param Consistently use bool for any register bit that enables/disables @@ -15,7 +15,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c -index 2615d74534df..6b2af0c2bbc7 100644 +index 4fe0688cb4d1..83849c2320e1 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -156,9 +156,9 @@ @@ -62,8 +62,8 @@ index 2615d74534df..6b2af0c2bbc7 100644 }; struct meson_sar_adc_data { -@@ -982,14 +987,16 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) - MESON_SAR_ADC_DELTA_10_TS_REVE0, 0); +@@ -970,14 +975,16 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) + MESON_SAR_ADC_DELTA_10_TS_REVE0); } - regval = FIELD_PREP(MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, @@ -82,7 +82,7 @@ index 2615d74534df..6b2af0c2bbc7 100644 regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_EOC, regval); -@@ -1005,8 +1012,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) +@@ -993,8 +1000,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_VREF_VOLTAGE, regval); @@ -92,7 +92,7 @@ index 2615d74534df..6b2af0c2bbc7 100644 regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_CMV_SEL, regval); } -@@ -1225,8 +1231,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { +@@ -1212,8 +1218,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 10, .has_reg11 = true, @@ -103,7 +103,7 @@ index 2615d74534df..6b2af0c2bbc7 100644 }; static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { -@@ -1237,8 +1243,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { +@@ -1224,8 +1230,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, @@ -114,7 +114,7 @@ index 2615d74534df..6b2af0c2bbc7 100644 }; static const struct meson_sar_adc_param meson_sar_adc_axg_param = { -@@ -1249,10 +1255,10 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { +@@ -1236,10 +1242,10 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, @@ -127,7 +127,7 @@ index 2615d74534df..6b2af0c2bbc7 100644 }; static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { -@@ -1263,7 +1269,8 @@ static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { +@@ -1250,7 +1256,8 @@ static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch index 9ff50d7eba..e1f1e94269 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v1-iio-adc-meson-simplify-MESON_SAR_ADC_REG.patch @@ -1,7 +1,7 @@ -From 24720fcff9462db2603d6ccf1b67671676b50e52 Mon Sep 17 00:00:00 2001 +From 81fd17f0b7b188e9c42c0ace5aef314fb049501a Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:35:58 +0100 -Subject: [PATCH 27/52] FROMLIST(v1): iio: adc: meson: simplify +Subject: [PATCH 26/35] FROMLIST(v1): iio: adc: meson: simplify MESON_SAR_ADC_REG11 register access Simply check the max_register value to decide whether @@ -16,7 +16,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c -index 6b2af0c2bbc7..8c1e542c0ab7 100644 +index 83849c2320e1..ba63ec05d8c0 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -320,14 +320,12 @@ static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { @@ -34,7 +34,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 bool has_vref_select; bool cmv_select; bool adc_eoc; -@@ -995,7 +993,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) +@@ -983,7 +981,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, regval); @@ -43,7 +43,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 regval = priv->param->adc_eoc ? MESON_SAR_ADC_REG11_EOC : 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_EOC, regval); -@@ -1031,16 +1029,15 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) +@@ -1019,16 +1017,15 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); @@ -67,7 +67,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 } static int meson_sar_adc_hw_enable(struct iio_dev *indio_dev) -@@ -1205,7 +1202,6 @@ static const struct iio_info meson_sar_adc_iio_info = { +@@ -1192,7 +1189,6 @@ static const struct iio_info meson_sar_adc_iio_info = { static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { .has_bl30_integration = false, .clock_rate = 1150000, @@ -75,7 +75,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution = 10, .temperature_trimming_bits = 4, -@@ -1216,7 +1212,6 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { +@@ -1203,7 +1199,6 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { static const struct meson_sar_adc_param meson_sar_adc_meson8b_param = { .has_bl30_integration = false, .clock_rate = 1150000, @@ -83,7 +83,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution = 10, .temperature_trimming_bits = 5, -@@ -1227,10 +1222,8 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8b_param = { +@@ -1214,10 +1209,8 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8b_param = { static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .has_bl30_integration = true, .clock_rate = 1200000, @@ -94,7 +94,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 .vref_voltage = VREF_VOLTAGE_1V8, .cmv_select = true, }; -@@ -1238,11 +1231,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { +@@ -1225,11 +1218,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .has_bl30_integration = true, .clock_rate = 1200000, @@ -106,7 +106,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 .vref_voltage = VREF_VOLTAGE_1V8, .cmv_select = true, }; -@@ -1250,11 +1241,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { +@@ -1237,11 +1228,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .has_bl30_integration = true, .clock_rate = 1200000, @@ -118,7 +118,7 @@ index 6b2af0c2bbc7..8c1e542c0ab7 100644 .vref_voltage = VREF_VOLTAGE_1V8, .has_vref_select = true, .vref_select = VREF_VDDA, -@@ -1264,11 +1253,9 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { +@@ -1251,11 +1240,9 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { .has_bl30_integration = false, .clock_rate = 1200000, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch index 2a3a7d27ff..4fd0e7a324 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-net-mdio-meson-gxl-set-28th-bit-in-eth_r.patch @@ -1,7 +1,7 @@ -From 3c20e23dc64f192cfb74a546244b2a5804865231 Mon Sep 17 00:00:00 2001 +From 6bcf59bdbd8f85188ac652a7874eafc98272d6bf Mon Sep 17 00:00:00 2001 From: Da Xue Date: Fri, 24 May 2024 15:17:37 +0000 -Subject: [PATCH 30/52] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in +Subject: [PATCH 27/35] FROMLIST(v1): net: mdio: meson-gxl set 28th bit in eth_reg2 This bit is necessary to enable packets on the interface. Without this diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-ASoC-meson-Constify-static-snd_pcm_hardw.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-ASoC-meson-Constify-static-snd_pcm_hardw.patch deleted file mode 100644 index 4ae210890e..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-ASoC-meson-Constify-static-snd_pcm_hardw.patch +++ /dev/null @@ -1,73 +0,0 @@ -From c32f8f643e24d1e478cdd5056957e7e9e3b85077 Mon Sep 17 00:00:00 2001 -From: Krzysztof Kozlowski -Date: Mon, 29 Apr 2024 13:48:48 +0200 -Subject: [PATCH 28/52] FROMLIST(v1): ASoC: meson: Constify static - snd_pcm_hardware - -Static 'struct snd_pcm_hardware' is not modified by the driver and its -copy is passed to the core, so it can be made const for increased code -safety. - -Signed-off-by: Krzysztof Kozlowski ---- - sound/soc/meson/aiu-fifo-i2s.c | 2 +- - sound/soc/meson/aiu-fifo-spdif.c | 2 +- - sound/soc/meson/aiu-fifo.h | 2 +- - sound/soc/meson/axg-fifo.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/meson/aiu-fifo-i2s.c b/sound/soc/meson/aiu-fifo-i2s.c -index 7d833500c799..eccbc16b293a 100644 ---- a/sound/soc/meson/aiu-fifo-i2s.c -+++ b/sound/soc/meson/aiu-fifo-i2s.c -@@ -25,7 +25,7 @@ - - #define AIU_FIFO_I2S_BLOCK 256 - --static struct snd_pcm_hardware fifo_i2s_pcm = { -+static const struct snd_pcm_hardware fifo_i2s_pcm = { - .info = (SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | -diff --git a/sound/soc/meson/aiu-fifo-spdif.c b/sound/soc/meson/aiu-fifo-spdif.c -index fa91f3c53fa4..e0e00ec026dc 100644 ---- a/sound/soc/meson/aiu-fifo-spdif.c -+++ b/sound/soc/meson/aiu-fifo-spdif.c -@@ -27,7 +27,7 @@ - - #define AIU_FIFO_SPDIF_BLOCK 8 - --static struct snd_pcm_hardware fifo_spdif_pcm = { -+static const struct snd_pcm_hardware fifo_spdif_pcm = { - .info = (SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | -diff --git a/sound/soc/meson/aiu-fifo.h b/sound/soc/meson/aiu-fifo.h -index 42ce266677cc..84ab4577815a 100644 ---- a/sound/soc/meson/aiu-fifo.h -+++ b/sound/soc/meson/aiu-fifo.h -@@ -18,7 +18,7 @@ struct snd_pcm_hw_params; - struct platform_device; - - struct aiu_fifo { -- struct snd_pcm_hardware *pcm; -+ const struct snd_pcm_hardware *pcm; - unsigned int mem_offset; - unsigned int fifo_block; - struct clk *pclk; -diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c -index ecb3eb7a9723..23ce75273da4 100644 ---- a/sound/soc/meson/axg-fifo.c -+++ b/sound/soc/meson/axg-fifo.c -@@ -23,7 +23,7 @@ - * These differences are handled in the respective DAI drivers - */ - --static struct snd_pcm_hardware axg_fifo_hw = { -+static const struct snd_pcm_hardware axg_fifo_hw = { - .info = (SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch index 911d8dca72..3bb3abbf9c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-dt-bindings-iio-adc-amlogic-meson-saradc.patch @@ -1,7 +1,7 @@ -From 940583242da6c14e1906abbc76cff986ed32e2a3 Mon Sep 17 00:00:00 2001 +From 88b219a016ccbe6534ef7e26009e928447c98689 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:38:59 +0100 -Subject: [PATCH 34/52] FROMLIST(v1): dt-bindings: iio: adc: +Subject: [PATCH 28/35] FROMLIST(v1): dt-bindings: iio: adc: amlogic,meson-saradc: add GXLX SoC compatible Add support for the GXLX SoC. GXLX is very similar to GXL but has three @@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml -index 7e8328e9ce13..b2fef72267b4 100644 +index f748f3a60b35..26344eedef0b 100644 --- a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml +++ b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.yaml @@ -23,6 +23,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-ASoC-meson-Use-snd_soc_substream_to_rtd-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-ASoC-meson-Use-snd_soc_substream_to_rtd-.patch deleted file mode 100644 index f31d2d140f..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-ASoC-meson-Use-snd_soc_substream_to_rtd-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 10f4ba40b8ac1125f3216427fad0d4ea82f03b6b Mon Sep 17 00:00:00 2001 -From: Krzysztof Kozlowski -Date: Tue, 30 Apr 2024 16:02:20 +0200 -Subject: [PATCH 29/52] FROMLIST(v1): ASoC: meson: Use - snd_soc_substream_to_rtd() for accessing private_data - -Do not open-code snd_soc_substream_to_rtd(). - -Signed-off-by: Krzysztof Kozlowski ---- - sound/soc/meson/aiu-fifo.c | 2 +- - sound/soc/meson/axg-fifo.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sound/soc/meson/aiu-fifo.c b/sound/soc/meson/aiu-fifo.c -index 4041ff8e437f..b222bde1f61b 100644 ---- a/sound/soc/meson/aiu-fifo.c -+++ b/sound/soc/meson/aiu-fifo.c -@@ -25,7 +25,7 @@ - - static struct snd_soc_dai *aiu_fifo_dai(struct snd_pcm_substream *ss) - { -- struct snd_soc_pcm_runtime *rtd = ss->private_data; -+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss); - - return snd_soc_rtd_to_cpu(rtd, 0); - } -diff --git a/sound/soc/meson/axg-fifo.c b/sound/soc/meson/axg-fifo.c -index 23ce75273da4..59abe0b3c59f 100644 ---- a/sound/soc/meson/axg-fifo.c -+++ b/sound/soc/meson/axg-fifo.c -@@ -46,7 +46,7 @@ static const struct snd_pcm_hardware axg_fifo_hw = { - - static struct snd_soc_dai *axg_fifo_dai(struct snd_pcm_substream *ss) - { -- struct snd_soc_pcm_runtime *rtd = ss->private_data; -+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(ss); - - return snd_soc_rtd_to_cpu(rtd, 0); - } --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch index f384717617..212318494a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v1-iio-adc-meson-add-support-for-the-GXLX-S.patch @@ -1,7 +1,7 @@ -From d284f5b692c07f5527129eefa708c1e47d38e3a0 Mon Sep 17 00:00:00 2001 +From b9c9f83faceff5cf074c233e7ba74089e3cf3477 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:44:41 +0100 -Subject: [PATCH 35/52] FROMLIST(v1): iio: adc: meson: add support for the GXLX +Subject: [PATCH 29/35] FROMLIST(v1): iio: adc: meson: add support for the GXLX SoC The SARADC IP on GXLX is identical to the one found on GXL SoCs: except @@ -16,7 +16,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 31 insertions(+) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c -index 8c1e542c0ab7..6ad1a6f33f7d 100644 +index ba63ec05d8c0..4896442ccf69 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -160,6 +160,11 @@ @@ -39,7 +39,7 @@ index 8c1e542c0ab7..6ad1a6f33f7d 100644 enum meson_sar_adc_vref_sel vref_select; enum meson_sar_adc_vref_voltage vref_voltage; }; -@@ -1013,6 +1019,12 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) +@@ -1001,6 +1007,12 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) regval = priv->param->cmv_select ? MESON_SAR_ADC_REG11_CMV_SEL : 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_CMV_SEL, regval); @@ -52,7 +52,7 @@ index 8c1e542c0ab7..6ad1a6f33f7d 100644 } ret = clk_set_parent(priv->adc_sel_clk, priv->clkin); -@@ -1238,6 +1250,17 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { +@@ -1225,6 +1237,17 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .cmv_select = true, }; @@ -70,7 +70,7 @@ index 8c1e542c0ab7..6ad1a6f33f7d 100644 static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .has_bl30_integration = true, .clock_rate = 1200000, -@@ -1287,6 +1310,11 @@ static const struct meson_sar_adc_data meson_sar_adc_gxl_data = { +@@ -1274,6 +1297,11 @@ static const struct meson_sar_adc_data meson_sar_adc_gxl_data = { .name = "meson-gxl-saradc", }; @@ -82,7 +82,7 @@ index 8c1e542c0ab7..6ad1a6f33f7d 100644 static const struct meson_sar_adc_data meson_sar_adc_gxm_data = { .param = &meson_sar_adc_gxl_param, .name = "meson-gxm-saradc", -@@ -1318,6 +1346,9 @@ static const struct of_device_id meson_sar_adc_of_match[] = { +@@ -1305,6 +1333,9 @@ static const struct of_device_id meson_sar_adc_of_match[] = { }, { .compatible = "amlogic,meson-gxl-saradc", .data = &meson_sar_adc_gxl_data, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch new file mode 100644 index 0000000000..8d6b1b9a11 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch @@ -0,0 +1,39 @@ +From 72e2c72fb9d2b7cf421187616c759232f3e7a7c4 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Wed, 5 Jun 2024 11:15:11 +0200 +Subject: [PATCH 30/35] FROMLIST(v1): dt-bindings: usb: dwc2: allow device + sub-nodes + +Allow the '#address-cells', '#size-cells' and subnodes as defined in +usb-hcd.yaml and used in the meson-gxbb-odroidc2 DT. + +The fixes the following: +meson-gxbb-odroidc2.dtb: usb@c9100000: '#address-cells', '#size-cells', 'hub@1' do not match any of the regexes: 'pinctrl-[0-9]+' + from schema $id: http://devicetree.org/schemas/usb/dwc2.yaml# + +Signed-off-by: Neil Armstrong +--- + Documentation/devicetree/bindings/usb/dwc2.yaml | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/Documentation/devicetree/bindings/usb/dwc2.yaml b/Documentation/devicetree/bindings/usb/dwc2.yaml +index a5f2e3442a0e..a1ef0b02e12e 100644 +--- a/Documentation/devicetree/bindings/usb/dwc2.yaml ++++ b/Documentation/devicetree/bindings/usb/dwc2.yaml +@@ -177,6 +177,13 @@ properties: + minItems: 1 + maxItems: 2 + ++ "#address-cells": true ++ ++ "#size-cells": true ++ ++patternProperties: ++ "^.*@[0-9a-f]{1,2}$": true ++ + dependencies: + port: [ usb-role-switch ] + role-switch-default-mode: [ usb-role-switch ] +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch new file mode 100644 index 0000000000..9540987b92 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-media-rc-meson-ir-support-PM-suspend-res.patch @@ -0,0 +1,63 @@ +From 4c5157d6e917df3acf5c44955bab894db101d32a Mon Sep 17 00:00:00 2001 +From: Zelong Dong +Date: Wed, 3 Jul 2024 17:38:58 +0800 +Subject: [PATCH 31/35] FROMLIST(v1): media: rc: meson-ir: support PM + suspend/resume + +IR controller could be used and updated by another processor +while kernel has been suspended. Just in case, reinitialize +the IR controller when kernel is resuming. + +Signed-off-by: Zelong Dong +--- + drivers/media/rc/meson-ir.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c +index 5303e6da5809..9cdb45821ecc 100644 +--- a/drivers/media/rc/meson-ir.c ++++ b/drivers/media/rc/meson-ir.c +@@ -567,6 +567,32 @@ static void meson_ir_shutdown(struct platform_device *pdev) + spin_unlock_irqrestore(&ir->lock, flags); + } + ++static __maybe_unused int meson_ir_resume(struct device *dev) ++{ ++ struct meson_ir *ir = dev_get_drvdata(dev); ++ ++ if (ir->param->support_hw_decoder) ++ meson_ir_hw_decoder_init(ir->rc, &ir->rc->enabled_protocols); ++ else ++ meson_ir_sw_decoder_init(ir->rc); ++ ++ return 0; ++} ++ ++static __maybe_unused int meson_ir_suspend(struct device *dev) ++{ ++ struct meson_ir *ir = dev_get_drvdata(dev); ++ unsigned long flags; ++ ++ spin_lock_irqsave(&ir->lock, flags); ++ regmap_update_bits(ir->reg, IR_DEC_REG1, IR_DEC_REG1_ENABLE, 0); ++ spin_unlock_irqrestore(&ir->lock, flags); ++ ++ return 0; ++} ++ ++static SIMPLE_DEV_PM_OPS(meson_ir_pm_ops, meson_ir_suspend, meson_ir_resume); ++ + static const struct meson_ir_param meson6_ir_param = { + .support_hw_decoder = false, + .max_register = IR_DEC_REG1, +@@ -607,6 +633,7 @@ static struct platform_driver meson_ir_driver = { + .driver = { + .name = DRIVER_NAME, + .of_match_table = meson_ir_match, ++ .pm = pm_ptr(&meson_ir_pm_ops), + }, + }; + +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-soc-amlogic-meson-gx-socinfo-Add-S905L-I.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-soc-amlogic-meson-gx-socinfo-Add-S905L-I.patch deleted file mode 100644 index 8de401bb6c..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-soc-amlogic-meson-gx-socinfo-Add-S905L-I.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 019ce1acd2112465aafcd59be1c44b70aac58023 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 1 Jan 2024 07:48:39 +0000 -Subject: [PATCH 31/52] FROMLIST(v1): soc: amlogic: meson-gx-socinfo: Add S905L - ID - -Add the S905L SoC ID observed in several P271 boards: - -kernel: soc soc0: Amlogic Meson GXLX (S905L) Revision 26:a (c1:2) Detected - -Signed-off-by: Christian Hewitt ---- - drivers/soc/amlogic/meson-gx-socinfo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/soc/amlogic/meson-gx-socinfo.c b/drivers/soc/amlogic/meson-gx-socinfo.c -index 6abb730344ab..7e255acf5430 100644 ---- a/drivers/soc/amlogic/meson-gx-socinfo.c -+++ b/drivers/soc/amlogic/meson-gx-socinfo.c -@@ -64,6 +64,7 @@ static const struct meson_gx_package_id { - { "962E", 0x24, 0x20, 0xf0 }, - { "A113X", 0x25, 0x37, 0xff }, - { "A113D", 0x25, 0x22, 0xff }, -+ { "S905L", 0x26, 0, 0x0 }, - { "S905D2", 0x28, 0x10, 0xf0 }, - { "S905Y2", 0x28, 0x30, 0xf0 }, - { "S905X2", 0x28, 0x40, 0xf0 }, --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch index 963ea8e104..bfc166c233 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-WIP-media-meson-vdec-add-HEVC-and-remove-MPEG1-2-fro.patch @@ -1,7 +1,7 @@ -From a2eec503dc2236727808124d2d517b0ee86aa070 Mon Sep 17 00:00:00 2001 +From 839aaf55e76c7debea6c4376f54069fd53ddbfe4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 4 Jun 2024 10:49:58 +0000 -Subject: [PATCH 42/52] WIP: media: meson: vdec: add HEVC and remove MPEG1/2 +Subject: [PATCH 32/35] WIP: media: meson: vdec: add HEVC and remove MPEG1/2 from GXLX This patch is required until GXLX support has been merged upstream. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-media-meson-vdec-reintroduce-wiggle-room.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-media-meson-vdec-reintroduce-wiggle-room.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch index bcdb4142cb..92c7db7e3e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-media-meson-vdec-reintroduce-wiggle-room.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-WIP-media-meson-vdec-reintroduce-wiggle-room.patch @@ -1,7 +1,7 @@ -From c4bf5b5b549f9ec2bb7efa68f2deb87839160375 Mon Sep 17 00:00:00 2001 +From 1a55206f01aa409dbf1426ff267d51ffc2526855 Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Tue, 2 Apr 2024 14:22:52 +0000 -Subject: [PATCH 43/52] WIP: media: meson: vdec: reintroduce wiggle room +Subject: [PATCH 33/35] WIP: media: meson: vdec: reintroduce wiggle room Without the wiggle room, it happens that matching offsets can't be found. This results in non-matches and afterwards in frame drops in userspace apps. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch index 5350616dc2..d62905c32a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -1,7 +1,7 @@ -From 84bba1f7c639992bf7beb27a777e366eb30d635f Mon Sep 17 00:00:00 2001 +From b924a18b08bc7f51b8e315cb8d5838ef42fd78ea Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Mar 2023 01:13:15 +0000 -Subject: [PATCH 44/52] WIP: media: meson: vdec: fix memory leak of 'new_frame' +Subject: [PATCH 34/35] WIP: media: meson: vdec: fix memory leak of 'new_frame' Reported-by: kernel test robot Reported-by: Dan Carpenter diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch new file mode 100644 index 0000000000..00f8c1c739 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-Revert-drm-meson-vclk-fix-calculation-of-59.94-fract.patch @@ -0,0 +1,43 @@ +From 45e7be20199750cf5a5058bd8ad01ad7e4d71531 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sun, 7 Jul 2024 03:16:12 +0000 +Subject: [PATCH 35/35] Revert "drm/meson: vclk: fix calculation of 59.94 + fractional rates" + +This reverts commit bfbc68e4d8695497f858a45a142665e22a512ea3. +--- + drivers/gpu/drm/meson/meson_vclk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c +index 2a942dc6a6dc..2a82119eb58e 100644 +--- a/drivers/gpu/drm/meson/meson_vclk.c ++++ b/drivers/gpu/drm/meson/meson_vclk.c +@@ -790,13 +790,13 @@ meson_vclk_vic_supported_freq(struct meson_drm *priv, unsigned int phy_freq, + FREQ_1000_1001(params[i].pixel_freq)); + DRM_DEBUG_DRIVER("i = %d phy_freq = %d alt = %d\n", + i, params[i].phy_freq, +- FREQ_1000_1001(params[i].phy_freq/1000)*1000); ++ FREQ_1000_1001(params[i].phy_freq/10)*10); + /* Match strict frequency */ + if (phy_freq == params[i].phy_freq && + vclk_freq == params[i].vclk_freq) + return MODE_OK; + /* Match 1000/1001 variant */ +- if (phy_freq == (FREQ_1000_1001(params[i].phy_freq/1000)*1000) && ++ if (phy_freq == (FREQ_1000_1001(params[i].phy_freq/10)*10) && + vclk_freq == FREQ_1000_1001(params[i].vclk_freq)) + return MODE_OK; + } +@@ -1070,7 +1070,7 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target, + + for (freq = 0 ; params[freq].pixel_freq ; ++freq) { + if ((phy_freq == params[freq].phy_freq || +- phy_freq == FREQ_1000_1001(params[freq].phy_freq/1000)*1000) && ++ phy_freq == FREQ_1000_1001(params[freq].phy_freq/10)*10) && + (vclk_freq == params[freq].vclk_freq || + vclk_freq == FREQ_1000_1001(params[freq].vclk_freq))) { + if (vclk_freq != params[freq].vclk_freq) +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-dt-bindings-arm-amlogic-add-GXLX-S905L-p.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-dt-bindings-arm-amlogic-add-GXLX-S905L-p.patch deleted file mode 100644 index 9a1846056f..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-dt-bindings-arm-amlogic-add-GXLX-S905L-p.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3fe02d7f4044de21d61f70db4bef7f2f34bfaba6 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 1 Jan 2024 07:13:19 +0000 -Subject: [PATCH 36/52] FROMLIST(v1): dt-bindings: arm: amlogic: add - GXLX/S905L/p271 reference board - -Add support for an Amlogic GXLX based S905L SoC and P271 reference -design board. The S905L is a low-cost design similar to the P281 -(S905W) and is similarly derived from P212 (S905X). However S905L -omits support for the VP9 codec and uses Mali 450-MP2 (not MP3). - -Signed-off-by: Christian Hewitt ---- - Documentation/devicetree/bindings/arm/amlogic.yaml | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 949537cea6be..d2aa3a05850a 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -107,6 +107,13 @@ properties: - - const: amlogic,s905d - - const: amlogic,meson-gxl - -+ - description: Boards with the Amlogic Meson GXLX S905L SoC -+ items: -+ - enum: -+ - amlogic,p271 -+ - const: amlogic,s905l -+ - const: amlogic,meson-gxlx -+ - - description: Boards with the Amlogic Meson GXM S912 SoC - items: - - enum: --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-arm64-dts-meson-add-GXLX-S905L-p271-supp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-arm64-dts-meson-add-GXLX-S905L-p271-supp.patch deleted file mode 100644 index 9da76e2218..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-arm64-dts-meson-add-GXLX-S905L-p271-supp.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 9beefd846bb397e116584c97d8b318e3ba7ee026 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 1 Jan 2024 07:40:15 +0000 -Subject: [PATCH 37/52] FROMLIST(v1): arm64: dts: meson: add GXLX/S905L/p271 - support - -Add a device-tree for the GXLX Amlogic P271 (S905L) reference design -board. This is a low-cost design similar to P281 (S905W) but with -silicon differences to omit VP9 and use Mali 450-MP2 (not MP3). The -SoC is marked with S905L and "2" (believed to denote MP2) resulting -in chip distributor stock lists and Android STB marketing sometimes -describing it as an S905L2 chip. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/Makefile | 1 + - .../dts/amlogic/meson-gxlx-s905l-p271.dts | 51 +++++++++++++++++++ - 2 files changed, 52 insertions(+) - create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts - -diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 1ab160bf928a..b046aaf76aeb 100644 ---- a/arch/arm64/boot/dts/amlogic/Makefile -+++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-gxlx-s905l-p271.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-gt1-ultimate.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-khadas-vim2.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts b/arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts -new file mode 100644 -index 000000000000..1221f4545130 ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts -@@ -0,0 +1,51 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2024 Christian Hewitt -+ */ -+ -+/dts-v1/; -+ -+#include "meson-gxl-s905x.dtsi" -+#include "meson-gx-p23x-q20x.dtsi" -+ -+/ { -+ compatible = "amlogic,p271", "amlogic,s905l", "amlogic,meson-gxlx"; -+ model = "Amlogic Meson GXLX (S905L) P271 Development Board"; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x40000000>; -+ }; -+ -+ sound { -+ model = "P271"; -+ }; -+}; -+ -+&apb { -+ mali: gpu@c0000 { -+ /* Mali 450-MP2 */ -+ interrupts = , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ interrupt-names = "gp", "gpmmu", "pp", "pmu", -+ "pp0", "ppmmu0", "pp1", "ppmmu1"; -+ }; -+}; -+ -+&saradc { -+ compatible = "amlogic,meson-gxlx-saradc", "amlogic,meson-saradc"; -+}; -+ -+&usb { -+ dr_mode = "host"; -+}; -+ -+&vdec { -+ compatible = "amlogic,gxlx-vdec", "amlogic,gx-vdec"; -+}; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v1-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v1-dt-bindings-arm-amlogic-add-support-for-.patch deleted file mode 100644 index e4e14f57f1..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMLIST-v1-dt-bindings-arm-amlogic-add-support-for-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 49884838fc7caee92816149390d2cda95a5a1bf0 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 5 Apr 2021 13:48:34 +0000 -Subject: [PATCH 38/52] FROMLIST(v1): dt-bindings: arm: amlogic: add support - for Dreambox One/Two - -The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based -on the Amlogic W400 reference board with an S922X chip. - -Signed-off-by: Christian Hewitt ---- - Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index d2aa3a05850a..d3fb1f0a159f 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -175,6 +175,8 @@ properties: - - azw,gtking - - azw,gtking-pro - - bananapi,bpi-m2s -+ - dream,dreambox-one -+ - dream,dreambox-two - - hardkernel,odroid-go-ultra - - hardkernel,odroid-n2 - - hardkernel,odroid-n2l --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v1-arm64-dts-meson-add-initial-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v1-arm64-dts-meson-add-initial-device-trees.patch deleted file mode 100644 index 6f204958da..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMLIST-v1-arm64-dts-meson-add-initial-device-trees.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 1b9ab39300c9f76a273d37b6d664472be99be939 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 5 Apr 2021 13:51:20 +0000 -Subject: [PATCH 39/52] FROMLIST(v1): arm64: dts: meson: add initial - device-trees for Dreambox One/Two - -Dreambox One and Dreambox Two are based on the Amlogic W400 reference -board with an S922X chip and the following specs: - -- 2GB DDR3 RAM -- 16GB eMMC -- 10/100/1000 Base-T Ethernet -- AP6356 Wireless (802.11 b/g/n/ac, BT 5.0) -- HDMI 2.1 video -- S/PDIF optical output -- 2x DVB-S2/T2 -- Smartcard Reader Slot -- 2x USB 2.0 port (1x micro-USB for service) -- 1x USB 3.0 port -- IR receiver -- 1x Power LED (blue) -- 1x Power button (top) -- 1x Update/Reset button (underside) -- 1x micro SD card slot - -Dreambox Two differences: - -- 3" Colour LCD display (MIPI-DSI) -- Common Interface Slot - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/Makefile | 2 + - .../dts/amlogic/meson-g12b-dreambox-one.dts | 17 ++ - .../dts/amlogic/meson-g12b-dreambox-two.dts | 20 +++ - .../boot/dts/amlogic/meson-g12b-dreambox.dtsi | 160 ++++++++++++++++++ - 4 files changed, 199 insertions(+) - create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts - create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts - create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi - -diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index b046aaf76aeb..d4ad5b20610a 100644 ---- a/arch/arm64/boot/dts/amlogic/Makefile -+++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -17,6 +17,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts -new file mode 100644 -index 000000000000..ecfa1c683dde ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts -@@ -0,0 +1,17 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 Christian Hewitt -+ */ -+ -+/dts-v1/; -+ -+#include "meson-g12b-dreambox.dtsi" -+ -+/ { -+ compatible = "dream,dreambox-one", "amlogic,s922x", "amlogic,g12b"; -+ model = "Dreambox One"; -+}; -+ -+&sd_emmc_a { -+ sd-uhs-sdr12; -+}; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts -new file mode 100644 -index 000000000000..df0d71983c3d ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts -@@ -0,0 +1,20 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2019 Christian Hewitt -+ */ -+ -+/dts-v1/; -+ -+#include "meson-g12b-dreambox.dtsi" -+ -+/ { -+ compatible = "dream,dreambox-two", "amlogic,s922x", "amlogic,g12b"; -+ model = "Dreambox Two"; -+}; -+ -+&sd_emmc_a { -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-sdr104; -+}; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi -new file mode 100644 -index 000000000000..a76045fd739c ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi -@@ -0,0 +1,160 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2021 Christian Hewitt -+ */ -+ -+#include "meson-g12b-w400.dtsi" -+#include -+#include -+#include -+ -+/ { -+ cvbs-connector { -+ status = "disabled"; -+ }; -+ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&gpio GPIOA_11 GPIO_ACTIVE_LOW>; -+ clocks = <&wifi32k>; -+ clock-names = "ext_clock"; -+ }; -+ -+ spdif_dit: audio-codec-1 { -+ #sound-dai-cells = <0>; -+ compatible = "linux,spdif-dit"; -+ status = "okay"; -+ sound-name-prefix = "DIT"; -+ }; -+ -+ sound { -+ compatible = "amlogic,axg-sound-card"; -+ model = "DREAMBOX"; -+ 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", -+ "SPDIFOUT_A IN 0", "FRDDR_A OUT 3", -+ "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", -+ "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; -+ -+ 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>; -+ }; -+ }; -+ -+ /* spdif hdmi or toslink interface */ -+ dai-link-4 { -+ sound-dai = <&spdifout_a>; -+ -+ codec-0 { -+ sound-dai = <&spdif_dit>; -+ }; -+ -+ codec-1 { -+ sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_A>; -+ }; -+ }; -+ -+ /* spdif hdmi interface */ -+ dai-link-5 { -+ sound-dai = <&spdifout_b>; -+ -+ codec { -+ sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_B>; -+ }; -+ }; -+ -+ /* hdmi glue */ -+ dai-link-6 { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; -+ -+ codec { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+}; -+ -+&arb { -+ status = "okay"; -+}; -+ -+&clkc_audio { -+ status = "okay"; -+}; -+ -+&frddr_a { -+ status = "okay"; -+}; -+ -+&frddr_b { -+ status = "okay"; -+}; -+ -+&frddr_c { -+ status = "okay"; -+}; -+ -+&ir { -+ linux,rc-map-name = "rc-dreambox"; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddao_1v8>; -+}; -+ -+&spdifout_a { -+ pinctrl-0 = <&spdif_out_h_pins>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ -+&spdifout_b { -+ status = "okay"; -+}; -+ -+&tdmif_b { -+ status = "okay"; -+}; -+ -+&tdmout_b { -+ status = "okay"; -+}; -+ -+&tohdmitx { -+ status = "okay"; -+}; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-dt-bindings-arm-amlogic-add-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-dt-bindings-arm-amlogic-add-OSMC-Vero-4K.patch deleted file mode 100644 index 527dc7934f..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMLIST-v1-dt-bindings-arm-amlogic-add-OSMC-Vero-4K.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e18690779cce33887f27cfd97f8e8fc8351db02b Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 19 Jan 2022 02:40:20 +0000 -Subject: [PATCH 40/52] FROMLIST(v1): dt-bindings: arm: amlogic: add OSMC Vero - 4K - -Add support for the OSMC Vero 4K - -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 d3fb1f0a159f..79deb7bfe698 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -91,6 +91,7 @@ properties: - - libretech,aml-s905x-cc - - libretech,aml-s905x-cc-v2 - - nexbox,a95x -+ - osmc,vero4k - - const: amlogic,s905x - - const: amlogic,meson-gxl - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-arm64-dts-meson-add-support-for-OSMC-Ver.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-arm64-dts-meson-add-support-for-OSMC-Ver.patch deleted file mode 100644 index 18da25ee34..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-arm64-dts-meson-add-support-for-OSMC-Ver.patch +++ /dev/null @@ -1,259 +0,0 @@ -From 6ee61e29f4863e930a49b5522438ce0e086f0902 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 19 Jan 2022 04:06:17 +0000 -Subject: [PATCH 41/52] FROMLIST(v1): 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 | 7 + - .../dts/amlogic/meson-gxl-s905x-vero4k.dts | 202 ++++++++++++++++++ - 2 files changed, 209 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 d4ad5b20610a..d106a18c39a8 100644 ---- a/arch/arm64/boot/dts/amlogic/Makefile -+++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -51,6 +51,13 @@ 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-s905x-hwacom-amazetv.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb -+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-s905w-jethome-jethub-j80.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-s905x-vero4k.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts -new file mode 100644 -index 000000000000..a2be35d63c96 ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts -@@ -0,0 +1,202 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2024 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>; -+ }; -+ -+ spdif_dit: audio-codec-0 { -+ #sound-dai-cells = <0>; -+ compatible = "linux,spdif-dit"; -+ sound-name-prefix = "DIT"; -+ }; -+ -+ 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 LOLP", -+ "AU2 INR", "ACODEC LORP", -+ "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_SPDIF_FIFO>; -+ }; -+ -+ dai-link-2 { -+ 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-3 { -+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; -+ -+ codec-0 { -+ sound-dai = <&spdif_dit>; -+ }; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>; -+ -+ codec-0 { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ -+ dai-link-5 { -+ sound-dai = <&aiu AIU_ACODEC CTRL_OUT>; -+ -+ codec-0 { -+ sound-dai = <&acodec>; -+ }; -+ }; -+ }; -+}; -+ -+&acodec { -+ AVDD-supply = <&vddio_ao18>; -+ status = "okay"; -+}; -+ -+&aiu { -+ status = "okay"; -+ pinctrl-0 = <&spdif_out_h_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&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.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-increase-SD-speeds-on-Minix-Neo-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-increase-SD-speeds-on-Minix-Neo-.patch deleted file mode 100644 index 11d08e9414..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-increase-SD-speeds-on-Minix-Neo-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3ef227118302ee6ab5afac361ad6261c07deed45 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Mon, 1 Jan 2024 06:15:40 +0000 -Subject: [PATCH 45/52] WIP: arm64: dts: meson: increase SD speeds on Minix Neo - U9-H - -Lets see what happens/breaks when all the fancy modes are added - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -index b929682805dd..c3fb523fd18e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -@@ -106,6 +106,15 @@ brcmf: wifi@1 { - }; - }; - -+&sd_emmc_b { -+ /* experimental */ -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-sdr104; -+ max-frequency = <200000000>; -+}; -+ - &uart_A { - status = "okay"; - pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-fixup-Minix-U9-H-wifi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-fixup-Minix-U9-H-wifi.patch deleted file mode 100644 index 714796100f..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-fixup-Minix-U9-H-wifi.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6b2ef08327a276b9760926bbbc62a5739b92bb28 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Fri, 5 Jan 2024 03:07:58 +0000 -Subject: [PATCH 46/52] WIP: arm64: dts: meson: fixup Minix U9-H wifi - -I think the 'drop compatible' change conflicted so remove this too. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -index c3fb523fd18e..bed70c5c2d9c 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-minix-neo-u9h.dts -@@ -99,13 +99,6 @@ rtc: rtc@51 { - }; - }; - --&sd_emmc_a { -- brcmf: wifi@1 { -- reg = <1>; -- compatible = "brcm,bcm4329-fmac"; -- }; --}; -- - &sd_emmc_b { - /* experimental */ - sd-uhs-sdr12; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch deleted file mode 100644 index ca2f9f8877..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ /dev/null @@ -1,109 +0,0 @@ -From a3aa1beabdba84dedb6214641823870d5691e6e1 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 47/52] 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 08d6b69ba469..9ac5079019fa 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -256,7 +256,7 @@ &sd_emmc_a { - - 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 7e7dc87ede2d..1c64b2d64ae8 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 @@ &sd_emmc_a { - - bus-width = <4>; - cap-sd-highspeed; -- max-frequency = <50000000>; -+ max-frequency = <100000000>; - - non-removable; - disable-wp; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch deleted file mode 100644 index 366cb3815e..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2fee9c1ed3b4acedb96d9cd6c56de114d18e80af Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 48/52] 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 9ac5079019fa..e6f88ec58869 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -256,6 +256,10 @@ &sd_emmc_a { - - 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 1c64b2d64ae8..b83b38b2d9e1 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 @@ &sd_emmc_a { - - bus-width = <4>; - cap-sd-highspeed; -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-sdr104; - max-frequency = <100000000>; - - non-removable; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch deleted file mode 100644 index 12f78bd847..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 68a2c518918cb350e6092ce59f1338e3e0283a8a Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 49/52] 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 dacbca73279c..aeda42d5d606 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 -@@ -217,10 +217,6 @@ &pwm_ef { - 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.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-drop-broadcom-compatible-from-re.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-drop-broadcom-compatible-from-re.patch deleted file mode 100644 index 07d9ac5850..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-drop-broadcom-compatible-from-re.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 1e36d0165e86298b3497f8014de77c0e67714a7b Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 3 Jan 2024 03:14:06 +0000 -Subject: [PATCH 50/52] WIP: arm64: dts: meson: drop broadcom compatible from - reference board SDIO nodes - -Remove the Broadcom compatible to allow Android STB boards using Qualcom QCA9377 -and Realtek RTL8189ES/FS SDIO modules to also have working WiFi when booting with -the reference board device-tree(s). Also do the same to the Vega S95 dtsi as this -is commonly used in the same way. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 3 +-- - arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 3 +-- - 7 files changed, 7 insertions(+), 14 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -index 52d57773a77f..1736bd2e96e2 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -@@ -178,9 +178,8 @@ &sd_emmc_a { - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; - -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -index 255e93a0b36d..b5e8b1cbafa9 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -@@ -251,9 +251,8 @@ &sd_emmc_a { - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; - -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts -index c1470416faad..7dffeb5931c9 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts -@@ -102,8 +102,7 @@ hdmi_tx_tmds_out: endpoint { - }; - - &sd_emmc_a { -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts -index 92c425d0259c..ff9145d49090 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts -@@ -21,8 +21,7 @@ ðmac { - }; - - &sd_emmc_a { -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; -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 b83b38b2d9e1..c74308499786 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -138,9 +138,8 @@ &sd_emmc_a { - vmmc-supply = <&vddao_3v3>; - vqmmc-supply = <&vddio_boot>; - -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts -index d4858afa0e9c..feb31207773f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts -@@ -72,8 +72,7 @@ external_phy: ethernet-phy@0 { - }; - - &sd_emmc_a { -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts -index d02b80d77378..6c8bec1853ac 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts -@@ -21,8 +21,7 @@ ðmac { - }; - - &sd_emmc_a { -- brcmf: wifi@1 { -+ sdio: wifi@1 { - reg = <1>; -- compatible = "brcm,bcm4329-fmac"; - }; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-ASoC-Add-support-for-ti-pcm5242-to-the-pcm512x-d.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-ASoC-Add-support-for-ti-pcm5242-to-the-pcm512x-d.patch deleted file mode 100644 index 447f551135..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-ASoC-Add-support-for-ti-pcm5242-to-the-pcm512x-d.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2407614a32bde162b1ca0114525121d6cca5489e Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sun, 26 May 2024 12:08:54 +0000 -Subject: [PATCH 51/52] WIP: ASoC: Add support for ti,pcm5242 to the pcm512x - driver - -Add compatibles to enable support for the ti,pcm5242 DAC chip in the -pcm512x driver. - -Signed-off-by: Christian Hewitt ---- - Documentation/devicetree/bindings/sound/pcm512x.txt | 2 +- - sound/soc/codecs/pcm512x-i2c.c | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Documentation/devicetree/bindings/sound/pcm512x.txt b/Documentation/devicetree/bindings/sound/pcm512x.txt -index 77006a4aec4a..47878a6df608 100644 ---- a/Documentation/devicetree/bindings/sound/pcm512x.txt -+++ b/Documentation/devicetree/bindings/sound/pcm512x.txt -@@ -6,7 +6,7 @@ on the board). The TAS575x devices only support I2C. - Required properties: - - - compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141", -- "ti,pcm5142", "ti,tas5754" or "ti,tas5756" -+ "ti,pcm5142", "ti,pcm5242", "ti,tas5754" or "ti,tas5756" - - - reg : the I2C address of the device for I2C, the chip select - number for SPI. -diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c -index 4be476a280e1..92bcf5179779 100644 ---- a/sound/soc/codecs/pcm512x-i2c.c -+++ b/sound/soc/codecs/pcm512x-i2c.c -@@ -39,6 +39,7 @@ static const struct i2c_device_id pcm512x_i2c_id[] = { - { "pcm5122", }, - { "pcm5141", }, - { "pcm5142", }, -+ { "pcm5242", }, - { "tas5754", }, - { "tas5756", }, - { } -@@ -51,6 +52,7 @@ static const struct of_device_id pcm512x_of_match[] = { - { .compatible = "ti,pcm5122", }, - { .compatible = "ti,pcm5141", }, - { .compatible = "ti,pcm5142", }, -+ { .compatible = "ti,pcm5242", }, - { .compatible = "ti,tas5754", }, - { .compatible = "ti,tas5756", }, - { } --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch deleted file mode 100644 index 89f3076832..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch +++ /dev/null @@ -1,935 +0,0 @@ -From 9fa1b4e3d5c5cbdbac22a9db1db5e8725dfcfcda Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sun, 26 May 2024 12:53:07 +0000 -Subject: [PATCH 52/52] WIP: arm64: dts: meson: add Odroid-C2 HiFi-Shield - boards - -Add experimental device-tree files for Odroid C2 with HiFi-Shield+ (pcm5102a) -and HiFi-Shield2 (pcm5242) mezzanine boards. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/Makefile | 4 + - .../meson-gxbb-odroidc2-hifishield.dts | 443 +++++++++++++++++ - .../meson-gxbb-odroidc2-hifishield2.dts | 447 ++++++++++++++++++ - 3 files changed, 894 insertions(+) - create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield.dts - create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield2.dts - -diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index d106a18c39a8..e634b37a5af1 100644 ---- a/arch/arm64/boot/dts/amlogic/Makefile -+++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -96,3 +96,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb - # Overlays - meson-g12a-fbx8am-brcm-dtbs := meson-g12a-fbx8am.dtb meson-g12a-fbx8am-brcm.dtbo - meson-g12a-fbx8am-realtek-dtbs := meson-g12a-fbx8am.dtb meson-g12a-fbx8am-realtek.dtbo -+ -+# Experimental -+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2-hifishield.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2-hifishield2.dtb -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield.dts -new file mode 100644 -index 000000000000..906adc1f622b ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield.dts -@@ -0,0 +1,443 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * Copyright (c) 2016 BayLibre, Inc. -+ * Author: Kevin Hilman -+ */ -+ -+/dts-v1/; -+ -+#include "meson-gxbb.dtsi" -+#include -+#include -+ -+/ { -+ compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; -+ model = "Hardkernel ODROID-C2"; -+ -+ aliases { -+ serial0 = &uart_AO; -+ ethernet0 = ðmac; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x80000000>; -+ }; -+ -+ spdif_dit: audio-codec-0 { -+ #sound-dai-cells = <0>; -+ compatible = "linux,spdif-dit"; -+ status = "okay"; -+ sound-name-prefix = "DIT"; -+ }; -+ -+ usb_otg_pwr: regulator-usb-pwrs { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "USB_OTG_PWR"; -+ -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ -+ /* -+ * signal name from schematics: PWREN -+ */ -+ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ /* -+ * signal name from schematics: USB_POWER -+ */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ led-blue { -+ label = "c2:blue:alive"; -+ gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ default-state = "off"; -+ }; -+ }; -+ -+ p5v0: regulator-p5v0 { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "P5V0"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ }; -+ -+ hdmi_p5v0: regulator-hdmi-p5v0 { -+ compatible = "regulator-fixed"; -+ regulator-name = "HDMI_P5V0"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ /* AP2331SA-7 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ tflash_vdd: regulator-tflash-vdd { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "TFLASH_VDD"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ -+ /* -+ * signal name from schematics: TFLASH_VDD_EN -+ */ -+ gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ /* U16 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ tf_io: gpio-regulator-tf-io { -+ compatible = "regulator-gpio"; -+ -+ regulator-name = "TF_IO"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ -+ /* -+ * signal name from schematics: TF_3V3N_1V8_EN -+ */ -+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; -+ gpios-states = <0>; -+ -+ states = <3300000 0>, -+ <1800000 1>; -+ /* U12/U13 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ vcc1v8: regulator-vcc1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ /* U18 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ vcc3v3: regulator-vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ vddio_ao1v8: regulator-vddio-ao1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ /* U17 RT9179GB */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ vddio_ao3v3: regulator-vddio-ao3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ /* U11 MP2161GJ-C499 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ ddr3_1v5: regulator-ddr3-1v5 { -+ compatible = "regulator-fixed"; -+ regulator-name = "DDR3_1V5"; -+ regulator-min-microvolt = <1500000>; -+ regulator-max-microvolt = <1500000>; -+ regulator-always-on; -+ /* U15 MP2161GJ-C499 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 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 = "ODROID-C2"; -+ assigned-clocks = <&clkc CLKID_MPLL0>, -+ <&clkc CLKID_MPLL1>, -+ <&clkc CLKID_MPLL2>; -+ assigned-clock-parents = <0>, <0>, <0>; -+ assigned-clock-rates = <294912000>, -+ <270950400>, -+ <393216000>; -+ -+ dai-link-0 { -+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -+ }; -+ -+ dai-link-1 { -+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; -+ }; -+ -+ dai-link-2 { -+ 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-3 { -+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; -+ -+ codec-0 { -+ sound-dai = <&spdif_dit>; -+ }; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>; -+ -+ codec-0 { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+}; -+ -+&aiu { -+ status = "okay"; -+ pinctrl-0 = <&spdif_out_ao_6_pins &i2s_am_clk_pins &i2s_out_ao_clk_pins &i2s_out_lr_clk_pins &i2s_out_ch01_ao_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&cec_AO { -+ status = "okay"; -+ pinctrl-0 = <&ao_cec_pins>; -+ pinctrl-names = "default"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+ðmac { -+ status = "okay"; -+ pinctrl-0 = <ð_rgmii_pins>; -+ pinctrl-names = "default"; -+ phy-handle = <ð_phy0>; -+ phy-mode = "rgmii"; -+ -+ amlogic,tx-delay-ns = <2>; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ eth_phy0: ethernet-phy@0 { -+ /* Realtek RTL8211F (0x001cc916) */ -+ reg = <0>; -+ -+ reset-assert-us = <10000>; -+ reset-deassert-us = <80000>; -+ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; -+ -+ interrupt-parent = <&gpio_intc>; -+ /* MAC_INTR on GPIOZ_15 */ -+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>; -+ }; -+ }; -+}; -+ -+&hdmi_tx { -+ status = "okay"; -+ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; -+ pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_p5v0>; -+}; -+ -+&hdmi_tx_tmds_port { -+ hdmi_tx_tmds_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+}; -+ -+&i2c_A { -+ status = "okay"; -+ pinctrl-0 = <&i2c_a_pins>; -+ pinctrl-names = "default"; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ pcm5102a: pcm5102a@4c { -+ compatible = "ti,pcm5102a"; -+ reg = <0x4c>; -+ #sound-dai-cells = <0>; -+ }; -+}; -+ -+&ir { -+ status = "okay"; -+ pinctrl-0 = <&remote_input_ao_pins>; -+ pinctrl-names = "default"; -+ linux,rc-map-name = "rc-odroid"; -+}; -+ -+&gpio_ao { -+ gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En", -+ "USB HUB nRESET", "USB OTG Power En", -+ "SPDIF_OUTPUT", "IR In", "I2S_MCLK", -+ "I2S_SCLK", "I2S_LRCLK", "I2S_DATA_OUTPUT", -+ "HDMI CEC", "SYS LED", -+ /* GPIO_TEST_N */ -+ ""; -+}; -+ -+&gpio { -+ gpio-line-names = /* Bank GPIOZ */ -+ "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", -+ "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", -+ "Eth RX D3", "Eth RGMII TX Clk", "Eth TX En", -+ "Eth TX D0", "Eth TX D1", "Eth TX D2", "Eth TX D3", -+ "Eth PHY nRESET", "Eth PHY Intc", -+ /* Bank GPIOH */ -+ "HDMI HPD", "HDMI DDC SDA", "HDMI DDC SCL", "", -+ /* Bank BOOT */ -+ "eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3", "eMMC D4", -+ "eMMC D5", "eMMC D6", "eMMC D7", "eMMC Clk", -+ "eMMC Reset", "eMMC CMD", -+ "", "", "", "", "", "", "", -+ /* Bank CARD */ -+ "SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD", -+ "SDCard D3", "SDCard D2", "SDCard Det", -+ /* Bank GPIODV */ -+ "", "", "", "", "", "", "", "", "", "", "", "", "", -+ "", "", "", "", "", "", "", "", "", "", "", -+ "I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK", -+ "PWM D", "PWM B", -+ /* Bank GPIOY */ -+ "Revision Bit0", "Revision Bit1", "", -+ "J2 Header Pin35", "", "", "", "J2 Header Pin36", -+ "J2 Header Pin31", "", "", "", "TF VDD En", -+ "J2 Header Pin32", "J2 Header Pin26", "", "", -+ /* Bank GPIOX */ -+ "J2 Header Pin29", "J2 Header Pin24", -+ "J2 Header Pin23", "J2 Header Pin22", -+ "J2 Header Pin21", "J2 Header Pin18", -+ "J2 Header Pin33", "J2 Header Pin19", -+ "J2 Header Pin16", "J2 Header Pin15", -+ "J2 Header Pin12", "J2 Header Pin13", -+ "J2 Header Pin8", "J2 Header Pin10", -+ "", "", "", "", "", -+ "J2 Header Pin11", "", "J2 Header Pin7", "", -+ /* Bank GPIOCLK */ -+ "", "", "", ""; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vcc1v8>; -+}; -+ -+&scpi_clocks { -+ status = "disabled"; -+}; -+ -+/* SD */ -+&sd_emmc_b { -+ status = "okay"; -+ pinctrl-0 = <&sdcard_pins>; -+ pinctrl-1 = <&sdcard_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-ddr50; -+ max-frequency = <100000000>; -+ disable-wp; -+ -+ cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; -+ -+ vmmc-supply = <&tflash_vdd>; -+ vqmmc-supply = <&tf_io>; -+}; -+ -+/* eMMC */ -+&sd_emmc_c { -+ status = "okay"; -+ pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; -+ pinctrl-1 = <&emmc_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <8>; -+ max-frequency = <200000000>; -+ non-removable; -+ disable-wp; -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ vmmc-supply = <&vcc3v3>; -+ vqmmc-supply = <&vcc1v8>; -+}; -+ -+&uart_AO { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_a_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&usb0_phy { -+ status = "disabled"; -+ phy-supply = <&usb_otg_pwr>; -+}; -+ -+&usb1_phy { -+ status = "okay"; -+ phy-supply = <&usb_otg_pwr>; -+}; -+ -+&usb0 { -+ status = "disabled"; -+}; -+ -+&usb1 { -+ dr_mode = "host"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ hub@1 { -+ /* Genesys Logic GL852G USB 2.0 hub */ -+ compatible = "usb5e3,610"; -+ reg = <1>; -+ vdd-supply = <&p5v0>; -+ reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; -+ }; -+}; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield2.dts -new file mode 100644 -index 000000000000..91697f5b5cd7 ---- /dev/null -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2-hifishield2.dts -@@ -0,0 +1,447 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2016 Andreas Färber -+ * Copyright (c) 2016 BayLibre, Inc. -+ * Author: Kevin Hilman -+ */ -+ -+/dts-v1/; -+ -+#include "meson-gxbb.dtsi" -+#include -+#include -+ -+/ { -+ compatible = "hardkernel,odroid-c2", "amlogic,meson-gxbb"; -+ model = "Hardkernel ODROID-C2"; -+ -+ aliases { -+ serial0 = &uart_AO; -+ ethernet0 = ðmac; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x80000000>; -+ }; -+ -+ spdif_dit: audio-codec-0 { -+ #sound-dai-cells = <0>; -+ compatible = "linux,spdif-dit"; -+ status = "okay"; -+ sound-name-prefix = "DIT"; -+ }; -+ -+ usb_otg_pwr: regulator-usb-pwrs { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "USB_OTG_PWR"; -+ -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ -+ /* -+ * signal name from schematics: PWREN -+ */ -+ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ /* -+ * signal name from schematics: USB_POWER -+ */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ led-blue { -+ label = "c2:blue:alive"; -+ gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; -+ linux,default-trigger = "heartbeat"; -+ default-state = "off"; -+ }; -+ }; -+ -+ p5v0: regulator-p5v0 { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "P5V0"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ }; -+ -+ hdmi_p5v0: regulator-hdmi-p5v0 { -+ compatible = "regulator-fixed"; -+ regulator-name = "HDMI_P5V0"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ /* AP2331SA-7 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ tflash_vdd: regulator-tflash-vdd { -+ compatible = "regulator-fixed"; -+ -+ regulator-name = "TFLASH_VDD"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ -+ /* -+ * signal name from schematics: TFLASH_VDD_EN -+ */ -+ gpio = <&gpio GPIOY_12 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ /* U16 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ tf_io: gpio-regulator-tf-io { -+ compatible = "regulator-gpio"; -+ -+ regulator-name = "TF_IO"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ -+ /* -+ * signal name from schematics: TF_3V3N_1V8_EN -+ */ -+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; -+ gpios-states = <0>; -+ -+ states = <3300000 0>, -+ <1800000 1>; -+ /* U12/U13 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ vcc1v8: regulator-vcc1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ /* U18 RT9179GB */ -+ vin-supply = <&vddio_ao3v3>; -+ }; -+ -+ vcc3v3: regulator-vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; -+ -+ vddio_ao1v8: regulator-vddio-ao1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-always-on; -+ /* U17 RT9179GB */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ vddio_ao3v3: regulator-vddio-ao3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-always-on; -+ /* U11 MP2161GJ-C499 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ ddr3_1v5: regulator-ddr3-1v5 { -+ compatible = "regulator-fixed"; -+ regulator-name = "DDR3_1V5"; -+ regulator-min-microvolt = <1500000>; -+ regulator-max-microvolt = <1500000>; -+ regulator-always-on; -+ /* U15 MP2161GJ-C499 */ -+ vin-supply = <&p5v0>; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; -+ }; -+ -+ 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 = "ODROID-C2"; -+ assigned-clocks = <&clkc CLKID_MPLL0>, -+ <&clkc CLKID_MPLL1>, -+ <&clkc CLKID_MPLL2>; -+ assigned-clock-parents = <0>, <0>, <0>; -+ assigned-clock-rates = <294912000>, -+ <270950400>, -+ <393216000>; -+ -+ dai-link-0 { -+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -+ }; -+ -+ dai-link-1 { -+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>; -+ }; -+ -+ dai-link-2 { -+ 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-3 { -+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>; -+ -+ codec-0 { -+ sound-dai = <&spdif_dit>; -+ }; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>; -+ -+ codec-0 { -+ sound-dai = <&hdmi_tx>; -+ }; -+ }; -+ }; -+}; -+ -+&aiu { -+ status = "okay"; -+ pinctrl-0 = <&spdif_out_ao_6_pins &i2s_am_clk_pins &i2s_out_ao_clk_pins &i2s_out_lr_clk_pins &i2s_out_ch01_ao_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&cec_AO { -+ status = "okay"; -+ pinctrl-0 = <&ao_cec_pins>; -+ pinctrl-names = "default"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ -+ðmac { -+ status = "okay"; -+ pinctrl-0 = <ð_rgmii_pins>; -+ pinctrl-names = "default"; -+ phy-handle = <ð_phy0>; -+ phy-mode = "rgmii"; -+ -+ amlogic,tx-delay-ns = <2>; -+ -+ mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ eth_phy0: ethernet-phy@0 { -+ /* Realtek RTL8211F (0x001cc916) */ -+ reg = <0>; -+ -+ reset-assert-us = <10000>; -+ reset-deassert-us = <80000>; -+ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; -+ -+ interrupt-parent = <&gpio_intc>; -+ /* MAC_INTR on GPIOZ_15 */ -+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>; -+ }; -+ }; -+}; -+ -+&hdmi_tx { -+ status = "okay"; -+ pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>; -+ pinctrl-names = "default"; -+ hdmi-supply = <&hdmi_p5v0>; -+}; -+ -+&hdmi_tx_tmds_port { -+ hdmi_tx_tmds_out: endpoint { -+ remote-endpoint = <&hdmi_connector_in>; -+ }; -+}; -+ -+&i2c_A { -+ status = "okay"; -+ pinctrl-0 = <&i2c_a_pins>; -+ pinctrl-names = "default"; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ pcm5242: pcm5242@4c { -+ compatible = "ti,pcm5242"; -+ reg = <0x4c>; -+ #sound-dai-cells = <0>; -+ -+ AVDD-supply = <&vddio_ao3v3>; -+ DVDD-supply = <&vddio_ao3v3>; -+ CPVDD-supply = <&vddio_ao3v3>; -+ }; -+}; -+ -+&ir { -+ status = "okay"; -+ pinctrl-0 = <&remote_input_ao_pins>; -+ pinctrl-names = "default"; -+ linux,rc-map-name = "rc-odroid"; -+}; -+ -+&gpio_ao { -+ gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En", -+ "USB HUB nRESET", "USB OTG Power En", -+ "SPDIF_OUTPUT", "IR In", "I2S_MCLK", -+ "I2S_SCLK", "I2S_LRCLK", "I2S_DATA_OUTPUT", -+ "HDMI CEC", "SYS LED", -+ /* GPIO_TEST_N */ -+ ""; -+}; -+ -+&gpio { -+ gpio-line-names = /* Bank GPIOZ */ -+ "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", -+ "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", -+ "Eth RX D3", "Eth RGMII TX Clk", "Eth TX En", -+ "Eth TX D0", "Eth TX D1", "Eth TX D2", "Eth TX D3", -+ "Eth PHY nRESET", "Eth PHY Intc", -+ /* Bank GPIOH */ -+ "HDMI HPD", "HDMI DDC SDA", "HDMI DDC SCL", "", -+ /* Bank BOOT */ -+ "eMMC D0", "eMMC D1", "eMMC D2", "eMMC D3", "eMMC D4", -+ "eMMC D5", "eMMC D6", "eMMC D7", "eMMC Clk", -+ "eMMC Reset", "eMMC CMD", -+ "", "", "", "", "", "", "", -+ /* Bank CARD */ -+ "SDCard D1", "SDCard D0", "SDCard CLK", "SDCard CMD", -+ "SDCard D3", "SDCard D2", "SDCard Det", -+ /* Bank GPIODV */ -+ "", "", "", "", "", "", "", "", "", "", "", "", "", -+ "", "", "", "", "", "", "", "", "", "", "", -+ "I2C A SDA", "I2C A SCK", "I2C B SDA", "I2C B SCK", -+ "PWM D", "PWM B", -+ /* Bank GPIOY */ -+ "Revision Bit0", "Revision Bit1", "", -+ "J2 Header Pin35", "", "", "", "J2 Header Pin36", -+ "J2 Header Pin31", "", "", "", "TF VDD En", -+ "J2 Header Pin32", "J2 Header Pin26", "", "", -+ /* Bank GPIOX */ -+ "J2 Header Pin29", "J2 Header Pin24", -+ "J2 Header Pin23", "J2 Header Pin22", -+ "J2 Header Pin21", "J2 Header Pin18", -+ "J2 Header Pin33", "J2 Header Pin19", -+ "J2 Header Pin16", "J2 Header Pin15", -+ "J2 Header Pin12", "J2 Header Pin13", -+ "J2 Header Pin8", "J2 Header Pin10", -+ "", "", "", "", "", -+ "J2 Header Pin11", "", "J2 Header Pin7", "", -+ /* Bank GPIOCLK */ -+ "", "", "", ""; -+}; -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vcc1v8>; -+}; -+ -+&scpi_clocks { -+ status = "disabled"; -+}; -+ -+/* SD */ -+&sd_emmc_b { -+ status = "okay"; -+ pinctrl-0 = <&sdcard_pins>; -+ pinctrl-1 = <&sdcard_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ sd-uhs-sdr12; -+ sd-uhs-sdr25; -+ sd-uhs-sdr50; -+ sd-uhs-ddr50; -+ max-frequency = <100000000>; -+ disable-wp; -+ -+ cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; -+ -+ vmmc-supply = <&tflash_vdd>; -+ vqmmc-supply = <&tf_io>; -+}; -+ -+/* eMMC */ -+&sd_emmc_c { -+ status = "okay"; -+ pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; -+ pinctrl-1 = <&emmc_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <8>; -+ max-frequency = <200000000>; -+ non-removable; -+ disable-wp; -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ vmmc-supply = <&vcc3v3>; -+ vqmmc-supply = <&vcc1v8>; -+}; -+ -+&uart_AO { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_a_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&usb0_phy { -+ status = "disabled"; -+ phy-supply = <&usb_otg_pwr>; -+}; -+ -+&usb1_phy { -+ status = "okay"; -+ phy-supply = <&usb_otg_pwr>; -+}; -+ -+&usb0 { -+ status = "disabled"; -+}; -+ -+&usb1 { -+ dr_mode = "host"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ hub@1 { -+ /* Genesys Logic GL852G USB 2.0 hub */ -+ compatible = "usb5e3,610"; -+ reg = <1>; -+ vdd-supply = <&p5v0>; -+ reset-gpio = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_LOW>; -+ }; -+}; --- -2.34.1 - diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 890e1f91aa..f188b58d36 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -1,21 +1,21 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.9.5 Kernel Configuration +# Linux/arm64 6.11.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-14.2.0 (GCC) 14.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130200 +CONFIG_GCC_VERSION=140200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24200 +CONFIG_AS_VERSION=24301 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24200 +CONFIG_LD_VERSION=24301 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y -CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y +CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0 @@ -129,6 +129,7 @@ CONFIG_PREEMPT_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_TREE_SRCU=y CONFIG_TASKS_RCU_GENERIC=y +CONFIG_NEED_TASKS_RCU=y CONFIG_TASKS_RCU=y CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y @@ -157,11 +158,12 @@ CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_GCC_NO_STRINGOP_OVERFLOW=y CONFIG_CC_NO_STRINGOP_OVERFLOW=y CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_SLAB_OBJ_EXT=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set CONFIG_MEMCG=y -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_V1 is not set CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_SCHED=y @@ -224,7 +226,7 @@ CONFIG_POSIX_TIMERS=y CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y +# CONFIG_BASE_SMALL is not set CONFIG_FUTEX=y CONFIG_FUTEX_PI=y CONFIG_EPOLL=y @@ -244,7 +246,6 @@ CONFIG_CACHESTAT_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_SELFTEST is not set CONFIG_KALLSYMS_ALL=y -CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_HAVE_PERF_EVENTS=y @@ -296,6 +297,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y # Platform selection # # CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_APPLE is not set @@ -376,6 +378,7 @@ CONFIG_ARM64_ERRATUM_2645198=y CONFIG_ARM64_WORKAROUND_SPECULATIVE_UNPRIV_LOAD=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y +CONFIG_ARM64_ERRATUM_3194386=y # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set # CONFIG_CAVIUM_ERRATUM_27456 is not set @@ -514,6 +517,7 @@ CONFIG_ARM64_CONTPTE=y # CONFIG_CMDLINE="" # CONFIG_EFI is not set +# CONFIG_COMPRESSED_INSTALL is not set # end of Boot options # @@ -667,6 +671,7 @@ CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_WANT_PMD_MKWRITE=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_WANTS_EXECMEM_LATE=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -697,6 +702,7 @@ CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y +CONFIG_RELR=y CONFIG_HAVE_PREEMPT_DYNAMIC=y CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y @@ -704,6 +710,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y CONFIG_ARCH_HAS_HW_PTE_YOUNG=y +CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y # # GCOV-based kernel profiling @@ -717,10 +724,11 @@ CONFIG_GCC_PLUGINS=y # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set CONFIG_FUNCTION_ALIGNMENT_4B=y CONFIG_FUNCTION_ALIGNMENT=4 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y # end of General architecture-dependent options CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_DEBUG is not set # CONFIG_MODULE_FORCE_LOAD is not set @@ -745,11 +753,9 @@ CONFIG_BLK_CGROUP_PUNT_BIO=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_INTEGRITY_T10=y CONFIG_BLK_DEV_WRITE_MOUNTED=y # CONFIG_BLK_DEV_ZONED is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_THROTTLING_LOW is not set # CONFIG_BLK_WBT is not set CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOCOST is not set @@ -831,6 +837,7 @@ CONFIG_COREDUMP=y # CONFIG_SWAP=y # CONFIG_ZSWAP is not set +CONFIG_HAVE_ZSMALLOC=y # # Slab allocator options @@ -840,6 +847,7 @@ CONFIG_SLUB=y CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLAB_FREELIST_RANDOM is not set # CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SLAB_BUCKETS is not set # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_RANDOM_KMALLOC_CACHES is not set @@ -851,7 +859,7 @@ CONFIG_SPARSEMEM=y CONFIG_SPARSEMEM_EXTREME=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_HAVE_FAST_GUP=y +CONFIG_HAVE_GUP_FAST=y CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y @@ -880,6 +888,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set CONFIG_THP_SWAP=y # CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_PGTABLE_HAS_HUGE_LEAVES=y CONFIG_CMA=y CONFIG_CMA_DEBUGFS=y # CONFIG_CMA_SYSFS is not set @@ -911,6 +920,7 @@ CONFIG_LRU_GEN_WALKS_MMU=y CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_EXECMEM=y # # Data Access Monitoring @@ -1374,6 +1384,7 @@ CONFIG_BT_HCIUART_QCA=y CONFIG_BT_MTKSDIO=m CONFIG_BT_MTKUART=m # CONFIG_BT_NXPUART is not set +# CONFIG_BT_INTEL_PCIE is not set # end of Bluetooth device drivers # CONFIG_AF_RXRPC is not set @@ -1470,7 +1481,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16 # CONFIG_PCI_HOST_THUNDER_ECAM is not set # CONFIG_PCI_FTPCI100 is not set # CONFIG_PCI_HOST_GENERIC is not set -# CONFIG_PCIE_MICROCHIP_HOST is not set # CONFIG_PCI_XGENE is not set # CONFIG_PCIE_XILINX is not set @@ -1496,6 +1506,12 @@ CONFIG_PCI_MESON=y # Mobiveil-based PCIe controllers # # end of Mobiveil-based PCIe controllers + +# +# PLDA-based PCIe controllers +# +# CONFIG_PCIE_MICROCHIP_HOST is not set +# end of PLDA-based PCIe controllers # end of PCI controller drivers # @@ -1810,6 +1826,7 @@ CONFIG_EEPROM_93CX6=m # CONFIG_UACCE is not set # CONFIG_PVPANIC is not set # CONFIG_GP_PCI1XXXX is not set +# CONFIG_KEBA_CP500 is not set # end of Misc devices # @@ -2025,6 +2042,7 @@ CONFIG_VXLAN=m # CONFIG_GENEVE is not set # CONFIG_BAREUDP is not set # CONFIG_GTP is not set +# CONFIG_PFCP is not set # CONFIG_AMT is not set # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y @@ -2075,6 +2093,7 @@ CONFIG_NET_VENDOR_ASIX=y # CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_META is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set @@ -2138,6 +2157,7 @@ CONFIG_FIXED_PHY=y # # MII PHY device drivers # +# CONFIG_AIR_EN8811H_PHY is not set # CONFIG_AMD_PHY is not set CONFIG_MESON_GXL_PHY=y # CONFIG_ADIN_PHY is not set @@ -2320,6 +2340,7 @@ CONFIG_ATH10K_SDIO=m CONFIG_ATH10K_USB=m # CONFIG_ATH10K_DEBUG is not set # CONFIG_ATH10K_DEBUGFS is not set +CONFIG_ATH10K_LEDS=y CONFIG_WCN36XX=m # CONFIG_WCN36XX_DEBUGFS is not set # CONFIG_ATH11K is not set @@ -2880,6 +2901,7 @@ CONFIG_SPI_BITBANG=y # CONFIG_SPI_CADENCE is not set # CONFIG_SPI_CADENCE_QUADSPI is not set # CONFIG_SPI_CADENCE_XSPI is not set +# CONFIG_SPI_CH341 is not set # CONFIG_SPI_DESIGNWARE is not set CONFIG_SPI_GPIO=y # CONFIG_SPI_FSL_SPI is not set @@ -2890,7 +2912,6 @@ CONFIG_SPI_MESON_SPIFC=y # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PCI1XXXX is not set CONFIG_SPI_PL022=y -# CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_SC18IS602 is not set # CONFIG_SPI_SIFIVE is not set # CONFIG_SPI_SN_F_OSPI is not set @@ -3060,6 +3081,13 @@ CONFIG_GPIO_PCA953X=m # CONFIG_GPIO_SIM is not set # end of Virtual GPIO drivers +# +# GPIO Debugging utilities +# +# CONFIG_GPIO_SLOPPY_LOGIC_ANALYZER is not set +# CONFIG_GPIO_VIRTUSER is not set +# end of GPIO Debugging utilities + # CONFIG_W1 is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y @@ -3074,6 +3102,7 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_REBOOT_MODE=y CONFIG_SYSCON_REBOOT_MODE=y # CONFIG_NVMEM_REBOOT_MODE is not set +# CONFIG_POWER_SEQUENCING is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_POWER_SUPPLY_HWMON=y @@ -3092,6 +3121,7 @@ CONFIG_POWER_SUPPLY_HWMON=y # CONFIG_BATTERY_BQ27XXX is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set @@ -3128,7 +3158,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_AD7314 is not set # CONFIG_SENSORS_AD7414 is not set # CONFIG_SENSORS_AD7418 is not set -# CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set # CONFIG_SENSORS_ADM1029 is not set @@ -3200,7 +3229,6 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_MAX6620 is not set # CONFIG_SENSORS_MAX6621 is not set # CONFIG_SENSORS_MAX6639 is not set -# CONFIG_SENSORS_MAX6642 is not set # CONFIG_SENSORS_MAX6650 is not set # CONFIG_SENSORS_MAX6697 is not set # CONFIG_SENSORS_MAX31790 is not set @@ -3270,6 +3298,7 @@ CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_INA2XX is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_SPD5118 is not set # CONFIG_SENSORS_TC74 is not set # CONFIG_SENSORS_THMC50 is not set # CONFIG_SENSORS_TMP102 is not set @@ -3420,6 +3449,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_88PM800 is not set # CONFIG_MFD_88PM805 is not set # CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_88PM886_PMIC is not set # CONFIG_MFD_MAX14577 is not set # CONFIG_MFD_MAX77541 is not set # CONFIG_MFD_MAX77620 is not set @@ -3496,11 +3526,14 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_ROHM_BD718XX is not set # CONFIG_MFD_ROHM_BD71828 is not set # CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_ROHM_BD96801 is not set # CONFIG_MFD_STPMIC1 is not set # CONFIG_MFD_STMFX is not set # CONFIG_MFD_ATC260X_I2C is not set CONFIG_MFD_KHADAS_MCU=m # CONFIG_MFD_QCOM_PM8008 is not set +# CONFIG_MFD_CS40L50_I2C is not set +# CONFIG_MFD_CS40L50_SPI is not set # CONFIG_RAVE_SP_CORE is not set # CONFIG_MFD_INTEL_M10_BMC_SPI is not set # CONFIG_MFD_RSMU_I2C is not set @@ -3841,6 +3874,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m # # Chips&Media media platform drivers # +# CONFIG_VIDEO_E5010_JPEG_ENC is not set # # Intel media platform drivers @@ -3874,6 +3908,10 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m # Qualcomm media platform drivers # +# +# Raspberry Pi media platform drivers +# + # # Renesas media platform drivers # @@ -4083,6 +4121,8 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_DS90UB913 is not set # CONFIG_VIDEO_DS90UB953 is not set # CONFIG_VIDEO_DS90UB960 is not set +# CONFIG_VIDEO_MAX96714 is not set +# CONFIG_VIDEO_MAX96717 is not set # end of Video serializers and deserializers # @@ -4334,9 +4374,11 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DISPLAY_HELPER=y +CONFIG_DRM_BRIDGE_CONNECTOR=y +# CONFIG_DRM_DISPLAY_DP_AUX_CEC is not set +# CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is not set CONFIG_DRM_DISPLAY_HDMI_HELPER=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_DISPLAY_HDMI_STATE_HELPER=y CONFIG_DRM_GEM_DMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=m CONFIG_DRM_SCHED=y @@ -4388,11 +4430,13 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set # CONFIG_DRM_PANEL_DSI_CM is not set # CONFIG_DRM_PANEL_LVDS is not set +# CONFIG_DRM_PANEL_HIMAX_HX83102 is not set # CONFIG_DRM_PANEL_HIMAX_HX83112A is not set # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set +# CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set @@ -4405,8 +4449,10 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set +# CONFIG_DRM_PANEL_LINCOLNTECH_LCD197 is not set # CONFIG_DRM_PANEL_LG_LB035Q02 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_LG_SW43408 is not set # CONFIG_DRM_PANEL_MAGNACHIP_D53E6EA8966 is not set # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set @@ -4428,11 +4474,13 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set # CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set # CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set @@ -4545,10 +4593,12 @@ CONFIG_DRM_MESON_DW_MIPI_DSI=y # CONFIG_DRM_PL111 is not set CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m +CONFIG_DRM_PANTHOR=m # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_GUD is not set # CONFIG_DRM_SSD130X is not set # CONFIG_DRM_POWERVR is not set +# CONFIG_DRM_WERROR is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -4624,6 +4674,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_QCOM_WLED is not set # CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3509 is not set # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set @@ -4789,6 +4840,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_AK4458 is not set # CONFIG_SND_SOC_AK4554 is not set # CONFIG_SND_SOC_AK4613 is not set +# CONFIG_SND_SOC_AK4619 is not set # CONFIG_SND_SOC_AK4642 is not set # CONFIG_SND_SOC_AK5386 is not set # CONFIG_SND_SOC_AK5558 is not set @@ -4829,12 +4881,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_CS4341 is not set # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set +# CONFIG_SND_SOC_CS530X_I2C is not set # CONFIG_SND_SOC_CX2072X is not set # CONFIG_SND_SOC_DA7213 is not set # CONFIG_SND_SOC_DMIC is not set CONFIG_SND_SOC_HDMI_CODEC=y CONFIG_SND_SOC_ES7134=y # CONFIG_SND_SOC_ES7241 is not set +# CONFIG_SND_SOC_ES8311 is not set # CONFIG_SND_SOC_ES8316 is not set # CONFIG_SND_SOC_ES8326 is not set CONFIG_SND_SOC_ES8328=y @@ -4844,7 +4898,6 @@ CONFIG_SND_SOC_ES8328_I2C=y # CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_IDT821034 is not set -# CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98090 is not set CONFIG_SND_SOC_MAX98357A=y @@ -4870,10 +4923,11 @@ CONFIG_SND_SOC_MAX98357A=y # CONFIG_SND_SOC_PCM3168A_I2C is not set # CONFIG_SND_SOC_PCM3168A_SPI is not set CONFIG_SND_SOC_PCM5102A=m +CONFIG_SND_SOC_PCM512x=m CONFIG_SND_SOC_PCM512x_I2C=m # CONFIG_SND_SOC_PCM512x_SPI is not set +# CONFIG_SND_SOC_PCM6240 is not set # CONFIG_SND_SOC_PEB2466 is not set -# CONFIG_SND_SOC_RK3328 is not set # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set # CONFIG_SND_SOC_RT5640 is not set @@ -5093,6 +5147,7 @@ CONFIG_HID_TOPSEED=y # CONFIG_HID_U2FZERO is not set # CONFIG_HID_WACOM is not set CONFIG_HID_WIIMOTE=m +# CONFIG_HID_WINWING is not set CONFIG_HID_XINMO=y # CONFIG_HID_ZEROPLUS is not set CONFIG_HID_ZYDACRON=y @@ -5318,7 +5373,7 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set # CONFIG_USB_CHAOSKEY is not set -CONFIG_USB_ONBOARD_HUB=y +# CONFIG_USB_ONBOARD_DEV is not set # # USB Physical Layer drivers @@ -5505,6 +5560,7 @@ CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_RT4505 is not set # CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set +# CONFIG_LEDS_SY7802 is not set # # RGB LED drivers @@ -5538,8 +5594,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # CONFIG_LEDS_TRIGGER_PANIC is not set # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set -# CONFIG_LEDS_TRIGGER_AUDIO is not set # CONFIG_LEDS_TRIGGER_TTY is not set +# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set # # Simple LED drivers @@ -5594,6 +5650,7 @@ CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_S35390A is not set # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8111 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set # CONFIG_RTC_DRV_EM3027 is not set @@ -5695,7 +5752,6 @@ CONFIG_DMABUF_HEAPS_CMA=y # CONFIG_GREYBUS is not set # CONFIG_COMEDI is not set CONFIG_STAGING=y -# CONFIG_PRISM2_USB is not set CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m @@ -5757,14 +5813,15 @@ CONFIG_VIDEO_MESON_VDEC=m # CONFIG_LTE_GDM724X is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set -# CONFIG_PI433 is not set # CONFIG_XIL_AXIS_FIFO is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_VME_BUS is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set +# CONFIG_CZNIC_PLATFORMS is not set # CONFIG_MELLANOX_PLATFORM is not set # CONFIG_SURFACE_PLATFORMS is not set +CONFIG_ARM64_PLATFORM_DEVICES=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5778,6 +5835,7 @@ CONFIG_COMMON_CLK=y # CONFIG_LMK04832 is not set # CONFIG_COMMON_CLK_MAX9485 is not set +# CONFIG_COMMON_CLK_SCMI is not set CONFIG_COMMON_CLK_SCPI=y # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -5808,6 +5866,7 @@ CONFIG_COMMON_CLK_MESON_PHASE=y CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_SCLK_DIV=y CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y +CONFIG_COMMON_CLK_MESON_VCLK=y CONFIG_COMMON_CLK_MESON_CLKC_UTILS=y CONFIG_COMMON_CLK_MESON_AO_CLKC=y CONFIG_COMMON_CLK_MESON_EE_CLKC=y @@ -5817,6 +5876,8 @@ CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXG_AUDIO=y # CONFIG_COMMON_CLK_A1_PLL is not set # CONFIG_COMMON_CLK_A1_PERIPHERALS is not set +CONFIG_COMMON_CLK_C3_PLL=y +CONFIG_COMMON_CLK_C3_PERIPHERALS=y CONFIG_COMMON_CLK_G12A=y CONFIG_COMMON_CLK_S4_PLL=y CONFIG_COMMON_CLK_S4_PERIPHERALS=y @@ -5842,6 +5903,7 @@ CONFIG_ARM64_ERRATUM_858921=y CONFIG_MAILBOX=y CONFIG_ARM_MHU=y # CONFIG_ARM_MHU_V2 is not set +# CONFIG_ARM_MHU_V3 is not set CONFIG_PLATFORM_MHU=y # CONFIG_PL320_MBOX is not set # CONFIG_ALTERA_MBOX is not set @@ -6071,12 +6133,14 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7091R5 is not set # CONFIG_AD7091R8 is not set # CONFIG_AD7124 is not set +# CONFIG_AD7173 is not set # CONFIG_AD7192 is not set # CONFIG_AD7266 is not set # CONFIG_AD7280 is not set # CONFIG_AD7291 is not set # CONFIG_AD7292 is not set # CONFIG_AD7298 is not set +# CONFIG_AD7380 is not set # CONFIG_AD7476 is not set # CONFIG_AD7606_IFACE_PARALLEL is not set # CONFIG_AD7606_IFACE_SPI is not set @@ -6087,10 +6151,10 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 # CONFIG_AD7793 is not set # CONFIG_AD7887 is not set # CONFIG_AD7923 is not set +# CONFIG_AD7944 is not set # CONFIG_AD7949 is not set # CONFIG_AD799X is not set # CONFIG_AD9467 is not set -# CONFIG_ADI_AXI_ADC is not set # CONFIG_CC10001_ADC is not set # CONFIG_ENVELOPE_DETECTOR is not set # CONFIG_HI8435 is not set @@ -6130,6 +6194,7 @@ CONFIG_MESON_SARADC=y # CONFIG_TI_ADC128S052 is not set # CONFIG_TI_ADC161S626 is not set # CONFIG_TI_ADS1015 is not set +# CONFIG_TI_ADS1119 is not set # CONFIG_TI_ADS7924 is not set # CONFIG_TI_ADS1100 is not set # CONFIG_TI_ADS1298 is not set @@ -6181,6 +6246,7 @@ CONFIG_MESON_SARADC=y # CONFIG_ATLAS_EZO_SENSOR is not set # CONFIG_BME680 is not set # CONFIG_CCS811 is not set +# CONFIG_ENS160 is not set # CONFIG_IAQCORE is not set # CONFIG_PMS7003 is not set # CONFIG_SCD30_CORE is not set @@ -6223,6 +6289,7 @@ CONFIG_MESON_SARADC=y # CONFIG_AD5593R is not set # CONFIG_AD5504 is not set # CONFIG_AD5624R_SPI is not set +# CONFIG_AD9739A is not set # CONFIG_LTC2688 is not set # CONFIG_AD5686_SPI is not set # CONFIG_AD5696_I2C is not set @@ -6366,6 +6433,7 @@ CONFIG_MESON_SARADC=y # CONFIG_AL3010 is not set # CONFIG_AL3320A is not set # CONFIG_APDS9300 is not set +# CONFIG_APDS9306 is not set # CONFIG_APDS9960 is not set # CONFIG_AS73211 is not set # CONFIG_BH1750 is not set @@ -6410,6 +6478,7 @@ CONFIG_MESON_SARADC=y # CONFIG_VCNL4000 is not set # CONFIG_VCNL4035 is not set # CONFIG_VEML6030 is not set +# CONFIG_VEML6040 is not set # CONFIG_VEML6070 is not set # CONFIG_VEML6075 is not set # CONFIG_VL6180 is not set @@ -6559,12 +6628,12 @@ CONFIG_MESON_SARADC=y # CONFIG_NTB is not set CONFIG_PWM=y -CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_ATMEL_TCB is not set # CONFIG_PWM_CLK is not set # CONFIG_PWM_DWC is not set # CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_GPIO is not set CONFIG_PWM_MESON=y # CONFIG_PWM_PCA9685 is not set # CONFIG_PWM_XILINX is not set @@ -6579,7 +6648,9 @@ CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y CONFIG_ARM_GIC_V3_ITS=y CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_IRQ_MSI_LIB=y # CONFIG_AL_FIC is not set +# CONFIG_LAN966X_OIC is not set # CONFIG_XILINX_INTC is not set CONFIG_PARTITION_PERCPU=y CONFIG_MESON_IRQ_GPIO=y @@ -6793,9 +6864,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_NETFS_SUPPORT=y # CONFIG_NETFS_STATS is not set +# CONFIG_NETFS_DEBUG is not set CONFIG_FSCACHE=y # CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_DEBUG is not set # CONFIG_CACHEFILES is not set # end of Caches @@ -7056,6 +7127,7 @@ CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_ALGAPI2=y CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SIG=y CONFIG_CRYPTO_SIG2=y CONFIG_CRYPTO_SKCIPHER=y CONFIG_CRYPTO_SKCIPHER2=y @@ -7092,7 +7164,6 @@ CONFIG_CRYPTO_ECC=m CONFIG_CRYPTO_ECDH=m # CONFIG_CRYPTO_ECDSA is not set # CONFIG_CRYPTO_ECRDSA is not set -# CONFIG_CRYPTO_SM2 is not set # CONFIG_CRYPTO_CURVE25519 is not set # end of Public-key cryptography @@ -7386,13 +7457,13 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y -CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y CONFIG_SWIOTLB=y # CONFIG_SWIOTLB_DYNAMIC is not set CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y +CONFIG_DMA_NEED_SYNC=y # CONFIG_DMA_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y @@ -7411,7 +7482,6 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y -# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y @@ -7420,6 +7490,7 @@ CONFIG_NLATTR=y CONFIG_CLZ_TAB=y # CONFIG_IRQ_POLL is not set CONFIG_MPILIB=y +CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_HAVE_GENERIC_VDSO=y @@ -7540,6 +7611,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y @@ -7637,6 +7709,7 @@ CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set # CONFIG_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=y