diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c0e8047cc8..3c134abe6c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="8bbe7c640d76724e9cfd8aa130b8d36ad6db77a9" # 6.5.8 - PKG_SHA256="9d6f2b0bfd3571b7fe2cebe2537ea9cc627293e1c4c9c0b3e7cd0b15629e5f87" + PKG_VERSION="ffc253263a1375a65fa6c9f62a893e9767fbebfa" # 6.6 + PKG_SHA256="2fa48537a32d233ec8f8f0ba36fdd19c07a9ee78a574034876b39939429ced84" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 878e113364..7a5683c2b1 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 7ed334706ae8e3f5d84261523bc686e6093a1a47 Mon Sep 17 00:00:00 2001 +From 6afe9e1f72b5b6a8088e06e677df69af563da7de Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 01/43] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 01/41] 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 5f0d23407f..34d866c8a5 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 24c355f2c8dfec913313d2f0c9b53732c0c90476 Mon Sep 17 00:00:00 2001 +From b43e58e6d606414c65fa1cbe91bbabcb6dccc92e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 02/43] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 02/41] LOCAL: set meson-g12 cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,10 +11,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 0c49655cc90c..73947bbb2c2c 100644 +index ff68b911b729..f7f8df88d464 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -116,7 +116,7 @@ secmon_reserved_bl32: secmon@5300000 { +@@ -117,7 +117,7 @@ secmon_reserved_bl32: secmon@5300000 { linux,cma { compatible = "shared-dma-pool"; reusable; 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 3b78abcda4..d5b48f5d5e 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 4a3f07cb10adfe827f26cc1d3e292711b2b9ec5b Mon Sep 17 00:00:00 2001 +From 71908cf37c0985a0807af0997518615998e624ba Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 03/43] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 03/41] 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 b676d120a9..f6f5284ddf 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 76ec846213989506d9db7f06a26c03c2f9d9b5c0 Mon Sep 17 00:00:00 2001 +From 7a0b8b90cf643983e6e5cded5a0cdaba04485024 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 04/43] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 04/41] 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 aa53c5c5ec..b354e36c0a 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 7742f613c3849735639dad015eed16a067a21ee5 Mon Sep 17 00:00:00 2001 +From 740e1962fd1667772186f5ff5d1298ccdcc926f1 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 05/43] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 05/41] 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 cace00dea5..e3a39bfc2e 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 5e26cbef52883c53b10c4ef593781e4ee3e384ee Mon Sep 17 00:00:00 2001 +From 0c3583f1c9c959c6211c4c9d956bd973c955bcd3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 06/43] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 06/41] 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 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 02f81839d4e3..2f88f78de5b7 100644 +index fea65f20523a..dacbca73279c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -29,6 +29,8 @@ button-function { 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 7a16ec76c4..8aa0f867e6 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 fd1e2fb37e52b336d0a1de845a5b929b7f6a63ee Mon Sep 17 00:00:00 2001 +From 1e017589a33d2bf5be5f3c2d9985950c3723fcd7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 07/43] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 07/41] 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 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index 74897a154891..be3e91bbfb2f 100644 +index 860f307494c5..cee27e7222c8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -18,6 +18,8 @@ / { 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 8a81107b26..1c59bf724e 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 c51b7f87b994f233b47509194cb86b6b35b9a6e3 Mon Sep 17 00:00:00 2001 +From 6fc5f33e5e637279ff0f5576c6b3f31d8906d15e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 08/43] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix +Subject: [PATCH 08/41] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch index 90ddef2cfd..cc52f83235 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch @@ -1,7 +1,7 @@ -From 06cadd3f5f4fc0698c32fe8f3dde6e9d26f6ac7e Mon Sep 17 00:00:00 2001 +From 4debf07727dd1a4bd8c13120529de73cfa6d1f35 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 09/43] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls +Subject: [PATCH 09/41] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec @@ -25,10 +25,10 @@ Signed-off-by: Anssi Hannula 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c -index 9c121a921b04..1df845a9d0f5 100644 +index a11cd7d6295f..94269e485873 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c -@@ -2540,7 +2540,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, +@@ -2547,7 +2547,10 @@ int snd_pcm_add_chmap_ctls(struct snd_pcm *pcm, int stream, knew.name = "Playback Channel Map"; else knew.name = "Capture Channel Map"; @@ -41,10 +41,10 @@ index 9c121a921b04..1df845a9d0f5 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 d661bc9255f9..51a2dba502f3 100644 +index 09eef6042aad..71b44385d235 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c -@@ -819,7 +819,8 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, +@@ -801,7 +801,8 @@ static int hdmi_codec_pcm_new(struct snd_soc_pcm_runtime *rtd, if (!kctl) return -ENOMEM; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 16c29c5a31..238fdb3d55 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -1,7 +1,7 @@ -From d7d4030a59fa2bc12d489e923fdf48dc99dd7c55 Mon Sep 17 00:00:00 2001 +From b985e435372a2870b8175e3a93623f274b14adfa Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 10/43] LOCAL: usb: hub: disable autosuspend for Genesys Logic +Subject: [PATCH 10/41] LOCAL: usb: hub: disable autosuspend for Genesys Logic Hubs Disable autosuspend in Genesys Logic hubs to allow USB devices on the @@ -17,10 +17,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index f2c561ae4bfe..da29cbd06cb0 100644 +index 0ff47eeffb49..fd94382c3fcc 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5945,7 +5945,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5903,7 +5903,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-bananapi-sw.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-bananapi-sw.patch deleted file mode 100644 index c993474fa3..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-bananapi-sw.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b48494ce7c123893cf20ff9a4b113dd2a2765526 Mon Sep 17 00:00:00 2001 -From: Krzysztof Kozlowski -Date: Tue, 25 Jul 2023 16:27:03 +0200 -Subject: [PATCH 11/43] FROMGIT(6.6): arm64: dts: amlogic: meson-g12b-bananapi: - switch to enable-gpios - -The recommended name for enable GPIOs property in regulator-gpio is -enable-gpios. This is also required by bindings: - - meson-g12b-bananapi-cm4-cm4io.dtb: regulator-vddio-c: Unevaluated properties are not allowed ('enable-gpio' was unexpected) - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Neil Armstrong -Link: https://lore.kernel.org/r/20230725142703.157547-1-krzysztof.kozlowski@linaro.org -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -index 97e522921b06..86adc1423385 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -@@ -56,7 +56,7 @@ vddio_c: regulator-vddio-c { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - -- enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; -+ enable-gpios = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; - enable-active-high; - regulator-always-on; - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch index aee928300f..026e807d59 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch @@ -1,7 +1,7 @@ -From 8f7ceadbc56efe95ab3ae35668fa8a7c00550b7b Mon Sep 17 00:00:00 2001 +From ba393a7d0fdd07caaa5f7f13ff9384d1acf0568f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 18/43] FROMGIT(6.7): arm64: dts: meson: add audio playback to +Subject: [PATCH 11/41] FROMGIT(6.7): arm64: dts: meson: add audio playback to p200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.6-arm64-dts-amlogic-drop-redundant-status-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.6-arm64-dts-amlogic-drop-redundant-status-.patch deleted file mode 100644 index 1ead6b4c07..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.6-arm64-dts-amlogic-drop-redundant-status-.patch +++ /dev/null @@ -1,461 +0,0 @@ -From 47e5a1fab175890d0fd23d93774a1cab527577c2 Mon Sep 17 00:00:00 2001 -From: Krzysztof Kozlowski -Date: Mon, 31 Jul 2023 11:36:15 +0200 -Subject: [PATCH 12/43] FROMGIT(6.6): arm64: dts: amlogic: drop redundant - status=okay in sound nodes - -status=okay is by default. - -Signed-off-by: Krzysztof Kozlowski -Reviewed-by: Neil Armstrong -Link: https://lore.kernel.org/r/20230731093615.148949-1-krzysztof.kozlowski@linaro.org -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 1 - - arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 -- - arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 1 - - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 1 - - arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 1 - - 34 files changed, 35 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts -index 359589d1dfa9..df16eead2c80 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-axg-s400.dts -@@ -280,7 +280,6 @@ sound { - assigned-clock-rates = <589824000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 cf0a9be83fc4..fcd7e1d8e16f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -145,7 +145,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -index 4fb31c2ba31c..0ad0c2b7dfef 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -@@ -209,7 +209,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 b2bb94981838..8237aa1f05e9 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts -@@ -166,7 +166,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 1fa6e75abd21..bb73e10b5e74 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts -@@ -55,7 +55,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 afe375fa83ca..6eeedd54ab91 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts -@@ -56,7 +56,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts -index 5d96c1449050..3e826095e792 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts -@@ -45,7 +45,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 24d0442dffb2..802b0256f1cb 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -78,7 +78,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 70919f40d597..e26f3e3258e1 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts -@@ -46,7 +46,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 0c7892600d56..098a3af6d381 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts -@@ -40,7 +40,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 4e84ab87cc7d..5e7b9273b062 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi -@@ -201,7 +201,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index dafc841f7c16..18f7b730289e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -137,8 +137,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; -- - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; - }; -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 7d94160f5802..1fd2e56e6b08 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -@@ -142,7 +142,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 63137ce3cb9d..4aab1ab705b4 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts -@@ -149,7 +149,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -index 01356437a077..e6d2de7c45a9 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts -@@ -184,7 +184,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 66daf3af34c3..e8303089bff6 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -@@ -116,7 +116,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 58733017eda8..af9ea32a2876 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts -@@ -23,7 +23,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 505ffcd8eb76..e1b74b174915 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts -@@ -56,7 +56,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 213a0705ebdc..a29b49f051ae 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 -@@ -130,7 +130,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 ff906becd2ab..c0d6eb55100a 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -@@ -135,7 +135,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 2f88f78de5b7..dacbca73279c 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 -@@ -76,7 +76,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 6c4e68e0e625..2825db91e462 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 -@@ -167,7 +167,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 82bfabfbd39c..27093e6ac9e2 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 -@@ -149,7 +149,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 be3e91bbfb2f..cee27e7222c8 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -@@ -159,7 +159,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 236c0a144142..7d525bdb0e06 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts -@@ -94,7 +94,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -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 50137aafab10..50d49aec41bd 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts -@@ -109,7 +109,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi -index c9705941e4ab..514a6dd4b124 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi -@@ -189,7 +189,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 d1debccdc1c2..7991fafed05c 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 -@@ -29,7 +29,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 c94f2870b78b..6e34fd80ed71 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air.dts -@@ -29,7 +29,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 0f6660e68e72..85d7e7110596 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts -@@ -29,7 +29,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 2fce44939f45..cdb80e0a7718 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -@@ -181,7 +181,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -index 9068a334ea57..cf4f78e6bd21 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -@@ -247,7 +247,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -index 7e1a74046ba5..fda0630c235b 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 -@@ -29,7 +29,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; -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 cd93d798f2a3..9ea969255b4f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts -@@ -29,7 +29,6 @@ sound { - assigned-clock-rates = <294912000>, - <270950400>, - <393216000>; -- status = "okay"; - - dai-link-0 { - sound-dai = <&frddr_a>; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch index 0bd57fab75..78fa8866c7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-p2.patch @@ -1,7 +1,7 @@ -From 073f530305d96215ad32f58c4936269e4f84213a Mon Sep 17 00:00:00 2001 +From 833c06b7da2e381d2b87949cb76fce198d4102c8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 19/43] FROMGIT(6.7): arm64: dts: meson: add audio playback to +Subject: [PATCH 12/41] FROMGIT(6.7): arm64: dts: meson: add audio playback to p201 Add initial audio support limited to HDMI i2s. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-odroid-n2-f.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-odroid-n2-f.patch deleted file mode 100644 index b93d8482cd..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.6-arm64-dts-amlogic-meson-g12b-odroid-n2-f.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2ae5f353e77d31ebfa781130be1e93a753071fb2 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Thu, 6 Jul 2023 10:00:19 +0200 -Subject: [PATCH 13/43] FROMGIT(6.6): arm64: dts: amlogic: - meson-g12b-odroid-n2: fix usb hub hog name - -This fixes the following dtschema check error: -arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-plus.dtb: pinctrl@40: bank@40: Unevaluated properties are not allowed ('hog-0' was unexpected) - -Link: https://lore.kernel.org/r/20230706-topic-amlogic-upstream-dt-fixes-take3-v1-1-63ed070eeab2@linaro.org -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 802b0256f1cb..08fde513bac9 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -240,7 +240,7 @@ &gpio { - * This signal should be handled by a USB specific power sequence - * in order to reset the Hub when USB bus is powered down. - */ -- hog-0 { -+ usb-hub-hog { - gpio-hog; - gpios = ; - output-high; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch index 1533c41716..752709bba2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.7-arm64-dts-meson-add-audio-playback-to-u2.patch @@ -1,7 +1,7 @@ -From 72f7b2729f6c1b8518aa3def2ba508cf605e7a73 Mon Sep 17 00:00:00 2001 +From d53d631f08dd12cb841a10850e2f3efdc36d1d6f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 20/43] FROMGIT(6.7): arm64: dts: meson: add audio playback to +Subject: [PATCH 13/41] FROMGIT(6.7): arm64: dts: meson: add audio playback to u200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.6-arm64-dts-amlogic-meson-g12-common-chang.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.6-arm64-dts-amlogic-meson-g12-common-chang.patch deleted file mode 100644 index 6d87c93db5..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.6-arm64-dts-amlogic-meson-g12-common-chang.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 748a3e4d0c02e0ca21e205de1b6eeaf586aee511 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Thu, 6 Jul 2023 10:00:20 +0200 -Subject: [PATCH 14/43] FROMGIT(6.6): arm64: dts: amlogic: meson-g12-common: - change aobus-pinctrl node name - -Bindings expects name to be "pinctrl", fix it. - -Link: https://lore.kernel.org/r/20230706-topic-amlogic-upstream-dt-fixes-take3-v1-2-63ed070eeab2@linaro.org -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 73947bbb2c2c..d54fc71cbadf 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -1733,7 +1733,7 @@ clkc_AO: clock-controller { - clock-names = "xtal", "mpeg-clk"; - }; - -- ao_pinctrl: pinctrl@14 { -+ ao_pinctrl: pinctrl { - compatible = "amlogic,meson-g12a-aobus-pinctrl"; - #address-cells = <2>; - #size-cells = <2>; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch index 00af63cecf..dc0953f4af 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.7-arm64-dts-meson-u200-fix-spdif-output-pi.patch @@ -1,7 +1,7 @@ -From a9342bba1ef3048b49e4ea26e0a4953e9464c7db Mon Sep 17 00:00:00 2001 +From 07540de878a712ea0b204c4f2a8fc766eb2b6842 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 11 Sep 2023 17:45:37 +0200 -Subject: [PATCH 21/43] FROMGIT(6.7): arm64: dts: meson: u200: fix spdif output +Subject: [PATCH 14/41] FROMGIT(6.7): arm64: dts: meson: u200: fix spdif output pin u200 outputs spdif on GPIOAO_10, not GPIOH_4 which is used for the LCD diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.6-arm64-dts-amlogic-drop-cooling-min-max-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.6-arm64-dts-amlogic-drop-cooling-min-max-s.patch deleted file mode 100644 index 8ee5221a46..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.6-arm64-dts-amlogic-drop-cooling-min-max-s.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 689b44b3b594719cf8e87486481140507e7fdd84 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Thu, 6 Jul 2023 10:00:21 +0200 -Subject: [PATCH 15/43] FROMGIT(6.6): arm64: dts: amlogic: drop - cooling-[min|max]-state from pwm-fan - -Drop the invalid cooling-min-state & cooling-max-state from the -pwm-fan node defined in the bananapi dtsi and odroid-hc4 DT. - -Link: https://lore.kernel.org/r/20230706-topic-amlogic-upstream-dt-fixes-take3-v1-3-63ed070eeab2@linaro.org -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 -- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -index 83709787eb91..42f30112b56a 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -@@ -47,8 +47,6 @@ emmc_pwrseq: emmc-pwrseq { - fan0: pwm-fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; -- cooling-min-state = <0>; -- cooling-max-state = <3>; - cooling-levels = <0 120 170 220>; - pwms = <&pwm_cd 1 40000 0>; - }; -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index 74088e7280fe..846a2d6c20e5 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -19,8 +19,6 @@ aliases { - fan0: pwm-fan { - compatible = "pwm-fan"; - #cooling-cells = <2>; -- cooling-min-state = <0>; -- cooling-max-state = <3>; - cooling-levels = <0 120 170 220>; - pwms = <&pwm_cd 1 40000 0>; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch index 73cbeb2e9f..73a75f95ce 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.7-arm64-dts-meson-u200-add-missing-audio-c.patch @@ -1,7 +1,7 @@ -From 4d0ee6623fbd3433db6abd7aa3fd67796ca1c31e Mon Sep 17 00:00:00 2001 +From 71128149d3bcae9cbe7f4ec7902e2c5727f629af Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 11 Sep 2023 17:45:38 +0200 -Subject: [PATCH 22/43] FROMGIT(6.7): arm64: dts: meson: u200: add missing +Subject: [PATCH 15/41] FROMGIT(6.7): arm64: dts: meson: u200: add missing audio clock controller The audio subsystem will not work if the audio clock controller is not diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.6-soc-amlogic-use-name-instead-of-index-as.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.6-soc-amlogic-use-name-instead-of-index-as.patch deleted file mode 100644 index 4c2147bc27..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.6-soc-amlogic-use-name-instead-of-index-as.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7664c1312c44e7319e9d2e470a8dfbb4408a5979 Mon Sep 17 00:00:00 2001 -From: Xianwei Zhao -Date: Fri, 7 Jul 2023 08:37:07 +0800 -Subject: [PATCH 16/43] FROMGIT(6.6): soc: amlogic: use name instead of index - as criterion - -The variate 'index' could be equal to zero in some SoCs. Such as C3 SoC, -PWRC_C3_NNA_ID be defined zero. Use 'name' instead of 'index' as criterion. - -Signed-off-by: Xianwei Zhao -Reviewed-by: Neil Armstrong -Reviewed-by: Dmitry Rokosov -Link: https://lore.kernel.org/r/20230707003710.2667989-2-xianwei.zhao@amlogic.com -Signed-off-by: Neil Armstrong ---- - drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soc/amlogic/meson-secure-pwrc.c b/drivers/soc/amlogic/meson-secure-pwrc.c -index 25b4b71df9b8..c11d65a3e3d9 100644 ---- a/drivers/soc/amlogic/meson-secure-pwrc.c -+++ b/drivers/soc/amlogic/meson-secure-pwrc.c -@@ -179,7 +179,7 @@ static int meson_secure_pwrc_probe(struct platform_device *pdev) - for (i = 0 ; i < match->count ; ++i) { - struct meson_secure_pwrc_domain *dom = &pwrc->domains[i]; - -- if (!match->domains[i].index) -+ if (!match->domains[i].name) - continue; - - dom->pwrc = pwrc; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch index fb3d3666e9..a882f2a0db 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.7-arm64-dts-meson-u200-add-spdifout-b-rout.patch @@ -1,7 +1,7 @@ -From 46dbe836bcf858bc4c540822ea5441cbecb69e13 Mon Sep 17 00:00:00 2001 +From 63377f9080cfcdbc8129fa969c1758c5086df61b Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 11 Sep 2023 17:45:39 +0200 -Subject: [PATCH 23/43] FROMGIT(6.7): arm64: dts: meson: u200: add spdifout b +Subject: [PATCH 16/41] FROMGIT(6.7): arm64: dts: meson: u200: add spdifout b routes spdifout B remains untested as it can only feed the HDMI controller, which diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.6-soc-amlogic-Explicitly-include-correct-D.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.6-soc-amlogic-Explicitly-include-correct-D.patch deleted file mode 100644 index b3a9bde351..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.6-soc-amlogic-Explicitly-include-correct-D.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8762341551da23759d32abde5a78aa98c61cbac2 Mon Sep 17 00:00:00 2001 -From: Rob Herring -Date: Fri, 14 Jul 2023 11:51:23 -0600 -Subject: [PATCH 17/43] FROMGIT(6.6): soc: amlogic: Explicitly include correct - DT includes - -The DT of_device.h and of_platform.h date back to the separate -of_platform_bus_type before it as merged into the regular platform bus. -As part of that merge prepping Arm DT support 13 years ago, they -"temporarily" include each other. They also include platform_device.h -and of.h. As a result, there's a pretty much random mix of those include -files used throughout the tree. In order to detangle these headers and -replace the implicit includes with struct declarations, users need to -explicitly include the correct includes. - -Signed-off-by: Rob Herring -Reviewed-by: Neil Armstrong -Link: https://lore.kernel.org/r/20230714175124.4066972-1-robh@kernel.org -Signed-off-by: Neil Armstrong ---- - drivers/soc/amlogic/meson-canvas.c | 1 + - drivers/soc/amlogic/meson-ee-pwrc.c | 3 +-- - drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 3 +-- - drivers/soc/amlogic/meson-secure-pwrc.c | 2 +- - 4 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c -index 383b0cfc584e..b6e06c4d2117 100644 ---- a/drivers/soc/amlogic/meson-canvas.c -+++ b/drivers/soc/amlogic/meson-canvas.c -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/soc/amlogic/meson-ee-pwrc.c -index f54acffc83f9..cfb796d40d9d 100644 ---- a/drivers/soc/amlogic/meson-ee-pwrc.c -+++ b/drivers/soc/amlogic/meson-ee-pwrc.c -@@ -4,13 +4,12 @@ - * Author: Neil Armstrong - */ - --#include - #include - #include - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c -index 5d4f12800d93..33df520eab95 100644 ---- a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c -+++ b/drivers/soc/amlogic/meson-gx-pwrc-vpu.c -@@ -5,13 +5,12 @@ - * SPDX-License-Identifier: GPL-2.0+ - */ - --#include - #include - #include - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/drivers/soc/amlogic/meson-secure-pwrc.c b/drivers/soc/amlogic/meson-secure-pwrc.c -index c11d65a3e3d9..9aa7b1a123e6 100644 ---- a/drivers/soc/amlogic/meson-secure-pwrc.c -+++ b/drivers/soc/amlogic/meson-secure-pwrc.c -@@ -7,7 +7,7 @@ - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include --#include -+#include - #include - #include - #include --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch index 21bee4a80a..e586fe22fe 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.7-arm64-dts-meson-u200-use-TDM-C-for-HDMI.patch @@ -1,7 +1,7 @@ -From fb9192dbe6b129934ea723aa22692676152f366b Mon Sep 17 00:00:00 2001 +From b61d92fb849afa52c59af8323da76b33381549e1 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 11 Sep 2023 17:45:40 +0200 -Subject: [PATCH 24/43] FROMGIT(6.7): arm64: dts: meson: u200: use TDM C for +Subject: [PATCH 17/41] FROMGIT(6.7): arm64: dts: meson: u200: use TDM C for HDMI On the u200, TDM B is wired to the onboard AD82584F i2c speaker codec. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch index fc587414a3..b6c9fca92f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.7-arm64-dts-meson-u200-add-onboard-devices.patch @@ -1,7 +1,7 @@ -From 89c446cddb72204357772318f37eb9ad1d31f833 Mon Sep 17 00:00:00 2001 +From f2276f72a3b5581a3297d1c18c36d7a68f704606 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 11 Sep 2023 17:45:41 +0200 -Subject: [PATCH 25/43] FROMGIT(6.7): arm64: dts: meson: u200: add onboard +Subject: [PATCH 18/41] FROMGIT(6.7): arm64: dts: meson: u200: add onboard devices Add missing audio devices found on the u200 PCB. This includes diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch new file mode 100644 index 0000000000..4176069741 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.7-arm64-dts-meson-g12-name-spdifout-consis.patch @@ -0,0 +1,187 @@ +From 45299195b2d6efb09decf03fb29540085584d627 Mon Sep 17 00:00:00 2001 +From: Jerome Brunet +Date: Mon, 25 Sep 2023 15:53:26 +0200 +Subject: [PATCH 19/41] FROMGIT(6.7): arm64: dts: meson: g12: name spdifout + consistently + +g12 and sm1 are fairly similar when it comes to audio. +Both have 2 spdif outputs. While the 2nd output is named "spdifout_b" for +both, the 1st one is named 'spdifout' for g12 and 'spdifout_a' for sm1. + +Use 'spdifout_a' for both instead. + +This change does not fix any particular problem. The intent is just to make +it easier to have a common card definitions for platform designs using both +SoC families, when spdifout is used. + +Signed-off-by: Jerome Brunet +--- + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 10 +++++----- + 5 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi +index 6a1f4dcf6488..9b9d0d2863aa 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi +@@ -272,12 +272,12 @@ spdifin: audio-controller@400 { + status = "disabled"; + }; + +- spdifout: audio-controller@480 { ++ spdifout_a: audio-controller@480 { + compatible = "amlogic,g12a-spdifout", + "amlogic,axg-spdifout"; + reg = <0x0 0x480 0x0 0x50>; + #sound-dai-cells = <0>; +- sound-name-prefix = "SPDIFOUT"; ++ sound-name-prefix = "SPDIFOUT_A"; + clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>, + <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>; + clock-names = "pclk", "mclk"; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +index 7310e192efe7..8355ddd7e9ae 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +@@ -189,9 +189,9 @@ sound { + "TDMOUT_C IN 1", "FRDDR_B OUT 2", + "TDMOUT_C IN 2", "FRDDR_C OUT 2", + "TDM_C Playback", "TDMOUT_C OUT", +- "SPDIFOUT IN 0", "FRDDR_A OUT 3", +- "SPDIFOUT IN 1", "FRDDR_B OUT 3", +- "SPDIFOUT IN 2", "FRDDR_C OUT 3", ++ "SPDIFOUT_A IN 0", "FRDDR_A OUT 3", ++ "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", ++ "SPDIFOUT_A IN 2", "FRDDR_C OUT 3", + "SPDIFOUT_B IN 0", "FRDDR_A OUT 4", + "SPDIFOUT_B IN 1", "FRDDR_B OUT 4", + "SPDIFOUT_B IN 2", "FRDDR_C OUT 4", +@@ -324,7 +324,7 @@ codec-1 { + + /* spdif hdmi and coax output */ + dai-link-9 { +- sound-dai = <&spdifout>; ++ sound-dai = <&spdifout_a>; + + codec-0 { + sound-dai = <&spdif_dit>; +@@ -546,7 +546,7 @@ &spdifin { + status = "okay"; + }; + +-&spdifout { ++&spdifout_a { + pinctrl-0 = <&spdif_ao_out_pins>; + pinctrl-names = "default"; + status = "okay"; +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 7ca904f5acbb..4969a76460fa 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +@@ -155,9 +155,9 @@ sound { + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", +- "SPDIFOUT IN 0", "FRDDR_A OUT 3", +- "SPDIFOUT IN 1", "FRDDR_B OUT 3", +- "SPDIFOUT IN 2", "FRDDR_C OUT 3"; ++ "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>, +@@ -196,7 +196,7 @@ codec { + + /* spdif hdmi or toslink interface */ + dai-link-4 { +- sound-dai = <&spdifout>; ++ sound-dai = <&spdifout_a>; + + codec-0 { + sound-dai = <&spdif_dit>; +@@ -456,7 +456,7 @@ &sd_emmc_c { + vqmmc-supply = <&flash_1v8>; + }; + +-&spdifout { ++&spdifout_a { + pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-names = "default"; + status = "okay"; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts +index 3e826095e792..8fc2e143cb54 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts +@@ -34,9 +34,9 @@ sound { + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", +- "SPDIFOUT IN 0", "FRDDR_A OUT 3", +- "SPDIFOUT IN 1", "FRDDR_B OUT 3", +- "SPDIFOUT IN 2", "FRDDR_C OUT 3"; ++ "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>, +@@ -75,7 +75,7 @@ codec { + + /* spdif hdmi or toslink interface */ + dai-link-4 { +- sound-dai = <&spdifout>; ++ sound-dai = <&spdifout_a>; + + codec-0 { + sound-dai = <&spdif_dit>; +@@ -139,7 +139,7 @@ rtc: rtc@51 { + }; + }; + +-&spdifout { ++&spdifout_a { + pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-names = "default"; + status = "okay"; +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 098a3af6d381..ce548b373296 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +@@ -29,9 +29,9 @@ sound { + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", +- "SPDIFOUT IN 0", "FRDDR_A OUT 3", +- "SPDIFOUT IN 1", "FRDDR_B OUT 3", +- "SPDIFOUT IN 2", "FRDDR_C OUT 3"; ++ "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>, +@@ -70,7 +70,7 @@ codec { + + /* spdif hdmi or toslink interface */ + dai-link-4 { +- sound-dai = <&spdifout>; ++ sound-dai = <&spdifout_a>; + + codec-0 { + sound-dai = <&spdif_dit>; +@@ -125,7 +125,7 @@ &ir { + linux,rc-map-name = "rc-khadas"; + }; + +-&spdifout { ++&spdifout_a { + pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-names = "default"; + status = "okay"; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-ASoC-meson-axg-extend-TDM-maximum-sample.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-ASoC-meson-axg-extend-TDM-maximum-sample.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch index 36c8356735..ccdddc8e10 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-ASoC-meson-axg-extend-TDM-maximum-sample.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.7-ASoC-meson-axg-extend-TDM-maximum-sample.patch @@ -1,7 +1,7 @@ -From 17f79dce029ddbdf73e902c8b2967a086722f67d Mon Sep 17 00:00:00 2001 +From 2def978be083a51a830916e6e9773bafb4336f33 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Thu, 7 Sep 2023 11:09:10 +0200 -Subject: [PATCH 36/43] FROMLIST(v1): ASoC: meson: axg: extend TDM maximum +Subject: [PATCH 20/41] FROMGIT(6.7): ASoC: meson: axg: extend TDM maximum sample rate to 384kHz The TDM HW on the axg SoC families and derivatives actually supports diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index da45ebe49c..d4535520ff 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From 1134f4b513a880a1bfcfc97fa5f8fddde514ca62 Mon Sep 17 00:00:00 2001 +From dd37d023ae1ccbdf3d8bb96ef209bd32ad8742f1 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 26/43] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 21/41] 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 af60bf1a6664..1d2d7aaa2663 100644 +index 573578db9509..0022fb4a36ed 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1375,6 +1375,8 @@ patternProperties: +@@ -1383,6 +1383,8 @@ patternProperties: description: Texas Instruments "^tianma,.*": description: Tianma Micro-electronics Co., Ltd. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index e9701a5db3..83dee6ca6a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From b7330b4386011cb37e93bdc2967f678abe0adb8b Mon Sep 17 00:00:00 2001 +From ff3ca6ccd23f301066f0e84f69a8d02127263edb Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 27/43] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro +Subject: [PATCH 22/41] 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-0028-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 849f9ae885..1bce0dbd09 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 9d4a3d9491b99c1696c8e1a75218b3bfc63e5150 Mon Sep 17 00:00:00 2001 +From 9dec15af4585a5957523dbcc1943f4897c73e38a Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 28/43] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 23/41] 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-0029-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index ccf077f257..624b49dbdb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 151a6cb7e6d4815cae5b01f791888124bd739771 Mon Sep 17 00:00:00 2001 +From ff7dd59e1598ce3d29f51b095be42f8ec73c3954 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 29/43] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 24/41] FROMLIST(v5): auxdisplay: add support for Titanmec TM1628 7 segment display controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index 1d7bd2f092..6ba12298bd 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From be7269a4d8a2c843a9454311c1f18217ce773e1a Mon Sep 17 00:00:00 2001 +From 4e864ed37bdfd4ba8a2581ee032425565989c145 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 30/43] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add +Subject: [PATCH 25/41] 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-0031-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 77% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index 0ff2cabe71..a5bed488a8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From cf1fd062b0e594116df411cd040dbcf049aa9cc6 Mon Sep 17 00:00:00 2001 +From ab7deebd236cc78134692021439f175a3bcf5a9a Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 31/43] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 26/41] 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 4cc6bf79fdd8..b61c8eb9024c 100644 +index dd5de540ec0b..d1b1ce8f5ebe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -21491,6 +21491,13 @@ W: http://sourceforge.net/projects/tlan/ +@@ -21693,6 +21693,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-0032-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index 5386c7cd4a..31b20538b4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 130f5d2805eaa0c9970203e39942a07e69e2ee07 Mon Sep 17 00:00:00 2001 +From 5263c9b4b4386aa55dc40dada82f8aae4f184317 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 32/43] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 27/41] 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 51a2dba502f3..d165ec6a1469 100644 +index 71b44385d235..2e4c69efa4ee 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -184,84 +184,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index 90f428f212..73fb4fd6ab 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From 8ababb71c85795505e6c1d879867c6b2c104fd7b Mon Sep 17 00:00:00 2001 +From b6c37f6642a56bc9b9b6e4c2b8cb52d8bf187e20 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 33/43] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 28/41] 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. @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 7b15fc54efe4..1904d58875ad 100644 +index 4632346f04a9..baf0dba3c418 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c -@@ -300,6 +300,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) +@@ -299,6 +299,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) u32 num_dst_bufs = 0; u32 offset; u32 pad_size; @@ -24,7 +24,7 @@ index 7b15fc54efe4..1904d58875ad 100644 /* * When max ref frame is held by VP9, this should be -= 3 to prevent a -@@ -353,15 +354,21 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) +@@ -352,15 +353,21 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) } pad_size = esparser_pad_start_code(core, vb, payload_size); diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index 7189702d01..12b183b010 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From ba5f1cc660cc77359935f1e0d8ecb8a74b3016bc Mon Sep 17 00:00:00 2001 +From 7f5ef3d93ad43e02e8dbf6303664b1d793918a6d Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 34/43] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 29/41] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU @@ -441,10 +441,10 @@ index 394df5761556..8e3bbf0db4b3 100644 /* No frame is actually processed */ vp9->cur_frame = NULL; diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 1904d58875ad..3cd29ab4f979 100644 +index baf0dba3c418..ef6dd05d89c8 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c -@@ -320,6 +320,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) +@@ -319,6 +319,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) if (esparser_vififo_get_free_space(sess) < payload_size || atomic_read(&sess->esparser_queued_bufs) >= num_dst_bufs) return -EAGAIN; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index be09963cca..43aeded58e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 82d94e2317b8a56b5b0873848bdde2aea61e6ecb Mon Sep 17 00:00:00 2001 +From 6bd258290dd548acfe4834f7ebc7de4831ba074e Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 35/43] FROMLIST(v2): media: meson: vdec: add HEVC decode codec +Subject: [PATCH 30/41] 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. @@ -1520,10 +1520,10 @@ index 000000000000..f2f9b2464df1 + +#endif diff --git a/drivers/staging/media/meson/vdec/esparser.c b/drivers/staging/media/meson/vdec/esparser.c -index 3cd29ab4f979..6988348ce714 100644 +index ef6dd05d89c8..97dbe1a0290d 100644 --- a/drivers/staging/media/meson/vdec/esparser.c +++ b/drivers/staging/media/meson/vdec/esparser.c -@@ -310,7 +310,8 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) +@@ -309,7 +309,8 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf) * they could pause when there is no capture buffer available and * resume on this notification. */ @@ -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 88c9d72e1c83..ea2aa0e8cf0b 100644 +index 70c9fd7c8bc5..90543b4b0cd2 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -11,10 +11,23 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch new file mode 100644 index 0000000000..d50d4c0f5d --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-arm64-dts-amlogic-Used-onboard-usb-hub-r.patch @@ -0,0 +1,72 @@ +From c73788f92a21b049f7ae84526cdd08cb2c602e7a Mon Sep 17 00:00:00 2001 +From: Anand Moon +Date: Tue, 10 Oct 2023 08:54:43 +0530 +Subject: [PATCH 31/41] FROMLIST(v1): 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 91c9769fda20..9e671444eca6 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-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch new file mode 100644 index 0000000000..37685e0bda --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-arm64-dts-VIM3-Set-the-rates-of-the-cloc.patch @@ -0,0 +1,31 @@ +From 9143815458210fd7c4139b60ec68f43f9ee6f243 Mon Sep 17 00:00:00 2001 +From: Tomeu Vizoso +Date: Mon, 16 Oct 2023 10:02:03 +0200 +Subject: [PATCH 32/41] FROMLIST(v1): arm64: dts: VIM3: Set the rates of the + clocks for the NPU + +Otherwise they are left at 24MHz and the NPU runs very slowly. + +Signed-off-by: Tomeu Vizoso +Suggested-by: Lucas Stach +--- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +index f7f8df88d464..a960d07f9af3 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +@@ -2502,6 +2502,9 @@ npu: npu@ff100000 { + clocks = <&clkc CLKID_NNA_CORE_CLK>, + <&clkc CLKID_NNA_AXI_CLK>; + clock-names = "core", "bus"; ++ assigned-clocks = <&clkc CLKID_NNA_CORE_CLK>, ++ <&clkc CLKID_NNA_AXI_CLK>; ++ assigned-clock-rates = <800000000>, <800000000>; + resets = <&reset RESET_NNA>; + status = "disabled"; + }; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-pmdomain-amlogic-Fix-mask-for-the-second.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-pmdomain-amlogic-Fix-mask-for-the-second.patch new file mode 100644 index 0000000000..b2d91d0d27 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-pmdomain-amlogic-Fix-mask-for-the-second.patch @@ -0,0 +1,31 @@ +From b6516692a447924f5aca081ca5ec5645a88cfc99 Mon Sep 17 00:00:00 2001 +From: Tomeu Vizoso +Date: Mon, 16 Oct 2023 10:02:04 +0200 +Subject: [PATCH 33/41] FROMLIST(v1): pmdomain: amlogic: Fix mask for the + second NNA mem PD domain + +Without this change, the NPU hangs when the 8th NN core is used. + +It matches what the out-of-tree driver does. + +Signed-off-by: Tomeu Vizoso +--- + drivers/pmdomain/amlogic/meson-ee-pwrc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/pmdomain/amlogic/meson-ee-pwrc.c b/drivers/pmdomain/amlogic/meson-ee-pwrc.c +index cfb796d40d9d..0dd71cd814c5 100644 +--- a/drivers/pmdomain/amlogic/meson-ee-pwrc.c ++++ b/drivers/pmdomain/amlogic/meson-ee-pwrc.c +@@ -228,7 +228,7 @@ static struct meson_ee_pwrc_mem_domain sm1_pwrc_mem_audio[] = { + + static struct meson_ee_pwrc_mem_domain g12a_pwrc_mem_nna[] = { + { G12A_HHI_NANOQ_MEM_PD_REG0, GENMASK(31, 0) }, +- { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(23, 0) }, ++ { G12A_HHI_NANOQ_MEM_PD_REG1, GENMASK(31, 0) }, + }; + + #define VPU_PD(__name, __top_pd, __mem, __is_pwr_off, __resets, __clks) \ +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-mmc-meson-gx-Remove-setting-of-CMD_CFG_E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-mmc-meson-gx-Remove-setting-of-CMD_CFG_E.patch new file mode 100644 index 0000000000..f3a1bb218c --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v2-mmc-meson-gx-Remove-setting-of-CMD_CFG_E.patch @@ -0,0 +1,34 @@ +From dc37a4f15253cd5a88c973ab041c56ad1e3166a7 Mon Sep 17 00:00:00 2001 +From: Rong Chen +Date: Thu, 26 Oct 2023 15:31:56 +0800 +Subject: [PATCH 34/41] FROMLIST(v2): mmc: meson-gx: Remove setting of + CMD_CFG_ERROR + +For the t7 and older SoC families, the CMD_CFG_ERROR has no effect. +Starting from SoC family C3, setting this bit without SG LINK data +address will cause the controller to generate an IRQ and stop working. + +To fix it, don't set the bit CMD_CFG_ERROR anymore. + +Fixes: 18f92bc02f17 ("mmc: meson-gx: make sure the descriptor is stopped on errors") +Signed-off-by: Rong Chen +Reviewed-by: Jerome Brunet +--- + drivers/mmc/host/meson-gx-mmc.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c +index 9837dab096e6..c7c067b9415a 100644 +--- a/drivers/mmc/host/meson-gx-mmc.c ++++ b/drivers/mmc/host/meson-gx-mmc.c +@@ -801,7 +801,6 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd) + + cmd_cfg |= FIELD_PREP(CMD_CFG_CMD_INDEX_MASK, cmd->opcode); + cmd_cfg |= CMD_CFG_OWNER; /* owned by CPU */ +- cmd_cfg |= CMD_CFG_ERROR; /* stop in case of error */ + + meson_mmc_set_response_bits(cmd, &cmd_cfg); + +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch index f4f6349774..19a58e8255 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-arm64-dts-meson-radxa-zero2-add-pwm-fan-.patch @@ -1,8 +1,8 @@ -From fa5e98eb6b18be104fe6a4cace6cdf5833f8d311 Mon Sep 17 00:00:00 2001 +From e256ec3b18d14d1ff1d57bede8aa92e4b5d1d5cc Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 43/43] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan - support +Subject: [PATCH 35/41] 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 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch index 35263319f6..e8d53d4bb1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch @@ -1,7 +1,7 @@ -From 2cdc76b17304782027b42f1b3474ee00a9c863a0 Mon Sep 17 00:00:00 2001 +From 45437e5468366aa728e145e1cab8485af3141c21 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 37/43] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 36/41] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke @@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 110 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_platform.c b/drivers/staging/media/meson/vdec/vdec_platform.c -index ea2aa0e8cf0b..1c0d188929dc 100644 +index 90543b4b0cd2..083adf0d07d9 100644 --- a/drivers/staging/media/meson/vdec/vdec_platform.c +++ b/drivers/staging/media/meson/vdec/vdec_platform.c @@ -39,28 +39,6 @@ static const struct amvdec_format vdec_formats_gxbb[] = { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index bc0305dd92..d3abc71835 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From b0bd15f554a3749fb608e9efc89a2356ff7ae5f2 Mon Sep 17 00:00:00 2001 +From 7b8c6282bd2047b55d2da9e76523eb8b5fde4855 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 38/43] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 37/41] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to 100MHz Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index c1671fa15e..61474de362 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From 49923992b6ff340aea7bcda59686f8d93c306814 Mon Sep 17 00:00:00 2001 +From 8a8bfb5b66f73e5e1e826f1ec66861349107879d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 39/43] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 38/41] WIP: arm64: dts: meson: add UHS SDIO capabilities to p212/p23x/q20x Add UHS capabilities to the SDIO node to enable 100MHz speeds. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index d114c609a2..6b8ddca4c5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From 3b01be747f02ecd49f1c8f186081f898206b8585 Mon Sep 17 00:00:00 2001 +From 48ff2bb4767bedc319ed39b260b4d7428e03d655 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 40/43] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 39/41] WIP: arm64: dts: meson: remove SDIO node from Khadas VIM1 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch index 69d87dbb58..81ba75d70e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -1,7 +1,7 @@ -From 06ec0d138e5f9c85063a157f35a0d5bdb45a3317 Mon Sep 17 00:00:00 2001 +From 46a35ec2a76dbbeff597e177e362a2ad624ed5c3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Feb 2023 08:28:00 +0000 -Subject: [PATCH 41/43] WIP: arm64: dts: meson: p23x-q20x: fix usb init - don't +Subject: [PATCH 40/41] WIP: arm64: dts: meson: p23x-q20x: fix usb init - don't force otg Forcing OTG in the p23x-q20x dtsi causes USB problems on multiple boards: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch index 81820e0da8..9ad16aecc7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch @@ -1,7 +1,7 @@ -From 9f26e8cb1a24072df4f66a90f76960482a396a75 Mon Sep 17 00:00:00 2001 +From 070f58b39370084cd65b5c0f50333dd01ed2ea33 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 7 Mar 2023 13:17:16 +0000 -Subject: [PATCH 42/43] WIP: arm64: dts: meson: add WiFi/BT support to BananaPi +Subject: [PATCH 41/41] WIP: arm64: dts: meson: add WiFi/BT support to BananaPi M5 The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 952a35a49d..579f855579 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.5.7 Kernel Configuration +# Linux/arm64 6.6.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-libreelec-linux-gnu-gcc-13.2.0 (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -148,6 +148,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y # end of Scheduler features CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y @@ -241,7 +242,6 @@ CONFIG_KCMP=y CONFIG_RSEQ=y CONFIG_CACHESTAT_SYSCALL=y # CONFIG_DEBUG_RSEQ is not set -CONFIG_EMBEDDED=y CONFIG_HAVE_PERF_EVENTS=y # CONFIG_PC104 is not set @@ -254,6 +254,14 @@ CONFIG_PERF_EVENTS=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y + +# +# Kexec and crash features +# +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_CRASH_DUMP is not set +# end of Kexec and crash features # end of General setup CONFIG_ARM64=y @@ -275,7 +283,6 @@ CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SMP=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y @@ -407,9 +414,12 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -# CONFIG_KEXEC is not set -# CONFIG_KEXEC_FILE is not set -# CONFIG_CRASH_DUMP is not set +CONFIG_ARCH_SUPPORTS_KEXEC=y +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y # CONFIG_XEN is not set CONFIG_ARCH_FORCE_MAX_ORDER=10 CONFIG_UNMAP_KERNEL_AT_EL0=y @@ -430,7 +440,6 @@ CONFIG_ARMV8_DEPRECATED=y # CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y -CONFIG_AS_HAS_LDAPR=y CONFIG_AS_HAS_LSE_ATOMICS=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_USE_LSE_ATOMICS=y @@ -455,6 +464,7 @@ CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y CONFIG_AS_HAS_ARMV8_3=y CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y +CONFIG_AS_HAS_LDAPR=y # end of ARMv8.3 architectural features # @@ -647,6 +657,7 @@ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_HUGE_VMAP=y CONFIG_HAVE_ARCH_HUGE_VMALLOC=y 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_HAVE_SOFTIRQ_ON_OWN_STACK=y @@ -820,6 +831,7 @@ CONFIG_SLAB_MERGE_DEFAULT=y # CONFIG_SLAB_FREELIST_HARDENED is not set # CONFIG_SLUB_STATS is not set CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set # end of SLAB allocator options # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set @@ -834,6 +846,7 @@ CONFIG_MEMORY_ISOLATION=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y # CONFIG_MEMORY_HOTPLUG is not set +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y CONFIG_COMPACTION=y @@ -875,6 +888,7 @@ CONFIG_VM_EVENT_COUNTERS=y # CONFIG_GUP_TEST is not set # CONFIG_DMAPOOL_TEST is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_MEMFD_CREATE=y CONFIG_SECRETMEM=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set @@ -894,6 +908,7 @@ CONFIG_NET=y CONFIG_COMPAT_NETLINK_MESSAGES=y CONFIG_NET_INGRESS=y CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y CONFIG_SKB_EXTENSIONS=y # @@ -1422,6 +1437,7 @@ CONFIG_PCI_QUIRKS=y # CONFIG_PCI_IOV is not set # CONFIG_PCI_PRI is not set # CONFIG_PCI_PASID is not set +# CONFIG_PCI_DYNAMIC_OF_NODES is not set # CONFIG_PCIE_BUS_TUNE_OFF is not set CONFIG_PCIE_BUS_DEFAULT=y # CONFIG_PCIE_BUS_SAFE is not set @@ -1536,6 +1552,11 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y # CONFIG_MHI_BUS_EP is not set # end of Bus devices +# +# Cache Drivers +# +# end of Cache Drivers + # CONFIG_CONNECTOR is not set # @@ -1958,6 +1979,7 @@ CONFIG_ATA_BMDMA=y # CONFIG_PATA_LEGACY is not set CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set +CONFIG_MD_BITMAP_FILE=y # CONFIG_BCACHE is not set # CONFIG_BLK_DEV_DM is not set # CONFIG_TARGET_CORE is not set @@ -1991,6 +2013,7 @@ CONFIG_MACVLAN=m # CONFIG_MACSEC is not set CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE_DYNAMIC=y +# CONFIG_NETCONSOLE_EXTENDED_LOG is not set CONFIG_NETPOLL=y CONFIG_NET_POLL_CONTROLLER=y CONFIG_TUN=y @@ -2119,6 +2142,7 @@ CONFIG_ICPLUS_PHY=y # CONFIG_LSI_ET1011C_PHY is not set CONFIG_MARVELL_PHY=y # CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MARVELL_88Q2XXX_PHY is not set # CONFIG_MARVELL_88X2222_PHY is not set # CONFIG_MAXLINEAR_GPHY is not set # CONFIG_MEDIATEK_GE_PHY is not set @@ -2920,6 +2944,7 @@ CONFIG_PINCTRL_MESON_AXG_PMX=y CONFIG_PINCTRL_MESON_G12A=y CONFIG_PINCTRL_MESON_A1=y CONFIG_PINCTRL_MESON_S4=y +CONFIG_PINCTRL_AMLOGIC_C3=y # # Renesas pinctrl drivers @@ -2964,6 +2989,7 @@ CONFIG_GPIO_GENERIC_PLATFORM=y # # CONFIG_GPIO_ADNP is not set # CONFIG_GPIO_FXL6408 is not set +# CONFIG_GPIO_DS4520 is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set # CONFIG_GPIO_MAX732X is not set @@ -3117,6 +3143,7 @@ CONFIG_SENSORS_ARM_SCPI=y # CONFIG_SENSORS_G762 is not set CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_HS3001 is not set # CONFIG_SENSORS_IIO_HWMON is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set @@ -3206,7 +3233,6 @@ CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SCH5627 is not set # CONFIG_SENSORS_SCH5636 is not set # CONFIG_SENSORS_STTS751 is not set -# CONFIG_SENSORS_SMM665 is not set # CONFIG_SENSORS_ADC128D818 is not set # CONFIG_SENSORS_ADS7828 is not set # CONFIG_SENSORS_ADS7871 is not set @@ -3340,6 +3366,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set # CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_CS42L43_I2C is not set # CONFIG_MFD_MADERA is not set # CONFIG_MFD_MAX5970 is not set # CONFIG_PMIC_DA903X is not set @@ -3460,6 +3487,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_AW37503 is not set # CONFIG_REGULATOR_DA9121 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_DA9211 is not set @@ -3475,6 +3503,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_LTC3589 is not set # CONFIG_REGULATOR_LTC3676 is not set # CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX77857 is not set # CONFIG_REGULATOR_MAX8649 is not set # CONFIG_REGULATOR_MAX8660 is not set # CONFIG_REGULATOR_MAX8893 is not set @@ -3512,6 +3541,7 @@ CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_RTQ2134 is not set # CONFIG_REGULATOR_RTMV20 is not set # CONFIG_REGULATOR_RTQ6752 is not set +# CONFIG_REGULATOR_RTQ2208 is not set # CONFIG_REGULATOR_S2MPA01 is not set # CONFIG_REGULATOR_S2MPS11 is not set # CONFIG_REGULATOR_S5M8767 is not set @@ -3888,6 +3918,7 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_AD5820 is not set # CONFIG_VIDEO_AK7375 is not set # CONFIG_VIDEO_DW9714 is not set +# CONFIG_VIDEO_DW9719 is not set # CONFIG_VIDEO_DW9768 is not set # CONFIG_VIDEO_DW9807_VCM is not set # end of Lens drivers @@ -4004,6 +4035,14 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_THS7303 is not set # end of Miscellaneous helper chips +# +# Video serializers and deserializers +# +# CONFIG_VIDEO_DS90UB913 is not set +# CONFIG_VIDEO_DS90UB953 is not set +# CONFIG_VIDEO_DS90UB960 is not set +# end of Video serializers and deserializers + # # Media SPI Adapters # @@ -4232,6 +4271,15 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_VIDEO_CMDLINE=y CONFIG_VIDEO_NOMODESET=y +CONFIG_AUXDISPLAY=y +# CONFIG_HD44780 is not set +# CONFIG_IMG_ASCII_LCD is not set +# CONFIG_HT16K33 is not set +# CONFIG_LCD2S is not set +CONFIG_TM1628=m +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set @@ -4355,6 +4403,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set # CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set # CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set +# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set @@ -4362,6 +4411,7 @@ CONFIG_DRM_PANEL=y # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set # CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set +# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels @@ -4417,6 +4467,7 @@ CONFIG_DRM_DW_HDMI_I2S_AUDIO=y CONFIG_DRM_DW_MIPI_DSI=y # end of Display Interface Bridges +# CONFIG_DRM_LOONGSON is not set CONFIG_DRM_ETNAVIV=y CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_HIBMC is not set @@ -4452,26 +4503,7 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # # Frame buffer Devices # -CONFIG_FB_NOTIFY=y CONFIG_FB=y -# CONFIG_FIRMWARE_EDID is not set -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_IMAGEBLIT=y -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SYS_HELPERS=y -CONFIG_FB_SYS_HELPERS_DEFERRED=y -CONFIG_FB_MODE_HELPERS=y -# CONFIG_FB_TILEBLITTING is not set - -# -# Frame buffer hardware drivers -# # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_ARMCLCD is not set @@ -4508,6 +4540,25 @@ CONFIG_FB_MODE_HELPERS=y CONFIG_FB_SIMPLE=y # CONFIG_FB_SSD1307 is not set # CONFIG_FB_SM712 is not set +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_DEVICE=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_DMAMEM_HELPERS=y +CONFIG_FB_IOMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set # end of Frame buffer Devices # @@ -4689,8 +4740,10 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_AK5386 is not set # CONFIG_SND_SOC_AK5558 is not set # CONFIG_SND_SOC_ALC5623 is not set +# CONFIG_SND_SOC_AUDIO_IIO_AUX is not set # CONFIG_SND_SOC_AW8738 is not set # CONFIG_SND_SOC_AW88395 is not set +# CONFIG_SND_SOC_AW88261 is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CHV3_CODEC is not set @@ -4905,6 +4958,7 @@ CONFIG_HID_EZKEY=y # CONFIG_HID_GFRM is not set # CONFIG_HID_GLORIOUS is not set # CONFIG_HID_HOLTEK is not set +# CONFIG_HID_GOOGLE_STADIA_FF is not set # CONFIG_HID_VIVALDI is not set # CONFIG_HID_GT683R is not set # CONFIG_HID_KEYTOUCH is not set @@ -5355,6 +5409,7 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_LP8860 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PCA995X is not set # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_PWM=y # CONFIG_LEDS_REGULATOR is not set @@ -5513,7 +5568,6 @@ CONFIG_RTC_DRV_DS3232_HWMON=y # CONFIG_RTC_DRV_M48T35 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set # CONFIG_RTC_DRV_RP5C01 is not set # CONFIG_RTC_DRV_OPTEE is not set # CONFIG_RTC_DRV_ZYNQMP is not set @@ -5549,15 +5603,6 @@ CONFIG_DMABUF_HEAPS_SYSTEM=y CONFIG_DMABUF_HEAPS_CMA=y # end of DMABUF options -CONFIG_AUXDISPLAY=y -# CONFIG_HD44780 is not set -# CONFIG_IMG_ASCII_LCD is not set -# CONFIG_HT16K33 is not set -# CONFIG_LCD2S is not set -CONFIG_TM1628=m -# CONFIG_CHARLCD_BL_OFF is not set -# CONFIG_CHARLCD_BL_ON is not set -CONFIG_CHARLCD_BL_FLASH=y # CONFIG_UIO is not set # CONFIG_VFIO is not set # CONFIG_VIRT_DRIVERS is not set @@ -5676,6 +5721,7 @@ CONFIG_COMMON_CLK_SCPI=y CONFIG_COMMON_CLK_PWM=y # CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI521XX is not set +# CONFIG_COMMON_CLK_VC3 is not set # CONFIG_COMMON_CLK_VC5 is not set # CONFIG_COMMON_CLK_VC7 is not set CONFIG_COMMON_CLK_FIXED_MMIO=y @@ -5690,6 +5736,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_CLKC_UTILS=y CONFIG_COMMON_CLK_MESON_AO_CLKC=y CONFIG_COMMON_CLK_MESON_EE_CLKC=y CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y @@ -6089,6 +6136,7 @@ CONFIG_MESON_SARADC=y # CONFIG_MAX5522 is not set # CONFIG_MAX5821 is not set # CONFIG_MCP4725 is not set +# CONFIG_MCP4728 is not set # CONFIG_MCP4922 is not set # CONFIG_TI_DAC082S085 is not set # CONFIG_TI_DAC5571 is not set @@ -6346,6 +6394,7 @@ CONFIG_MESON_SARADC=y # # Proximity and distance sensors # +# CONFIG_IRSD200 is not set # CONFIG_ISL29501 is not set # CONFIG_LIDAR_LITE_V2 is not set # CONFIG_MB1232 is not set @@ -6466,6 +6515,7 @@ CONFIG_PHY_MESON_AXG_MIPI_DPHY=y # CONFIG_ARM_CCN is not set # CONFIG_ARM_CMN is not set # CONFIG_ARM_PMU is not set +# CONFIG_ARM_SMMU_V3_PMU is not set # CONFIG_ARM_DSU_PMU is not set # CONFIG_ARM_SPE_PMU is not set # CONFIG_HISI_PCIE_PMU is not set @@ -6542,6 +6592,7 @@ CONFIG_PM_OPP=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y +CONFIG_BUFFER_HEAD=y CONFIG_LEGACY_DIRECT_IO=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -6553,7 +6604,7 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_REISERFS_FS_XATTR is not set @@ -6610,6 +6661,7 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS_XINO_AUTO is not set # CONFIG_OVERLAY_FS_METACOPY is not set +# CONFIG_OVERLAY_FS_DEBUG is not set # # Caches @@ -6663,9 +6715,9 @@ CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set +# CONFIG_TMPFS_QUOTA is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y # end of Pseudo filesystems @@ -6740,8 +6792,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_SUNRPC_SWAP=y CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_KRB5_CRYPTOSYSTEM=y -# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set # CONFIG_SUNRPC_DEBUG is not set @@ -6813,6 +6863,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_MAC_ROMANIAN is not set # CONFIG_NLS_MAC_TURKISH is not set CONFIG_NLS_UTF8=y +CONFIG_NLS_UCS2_UTILS=y # CONFIG_DLM is not set # CONFIG_UNICODE is not set CONFIG_IO_WQ=y @@ -6857,6 +6908,13 @@ CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y # CONFIG_ZERO_CALL_USED_REGS is not set # end of Memory initialization +# +# Hardening of kernel data structures +# +# CONFIG_LIST_HARDENED is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + CONFIG_RANDSTRUCT_NONE=y # CONFIG_RANDSTRUCT_FULL is not set # CONFIG_RANDSTRUCT_PERFORMANCE is not set @@ -7209,13 +7267,13 @@ 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_RESTRICTED_POOL is not set CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_CMA=y -# CONFIG_DMA_PERNUMA_CMA is not set # # Default contiguous memory area size: @@ -7434,7 +7492,6 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_PLIST is not set # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set # CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures