From 6420e2ce080248b86e38377b0b59321c77f801c2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 15 Apr 2025 12:00:06 +0000 Subject: [PATCH] linux: update Amlogic items for Linux 6.14.y Signed-off-by: Christian Hewitt --- ...LOCAL-set-meson-gx-cma-pool-to-896MB.patch | 2 +- ...OCAL-set-meson-g12-cma-pool-to-896MB.patch | 2 +- ...m64-fix-Kodi-sysinfo-CPU-information.patch | 2 +- ...eson-add-Amlogic-Meson-GX-PM-Suspend.patch | 2 +- ...meson-add-support-for-GX-PM-and-Virt.patch | 2 +- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 2 +- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 2 +- ...meson-add-rtc-vrtc-aliases-to-Minix-.patch | 2 +- ...-assign-internal-PCM-chmap-ELD-IEC95.patch | 2 +- ...n-vdec-disable-MPEG1-MPEG2-hardware-.patch | 2 +- ...64-dts-amlogic-gx-switch-to-the-new-.patch | 365 ------------- ...4-dts-amlogic-gxbb-enable-UART-RX-a.patch} | 6 +- ...64-dts-amlogic-axg-switch-to-the-new.patch | 76 --- ...4-dts-amlogic-gxl-enable-UART-RX-an.patch} | 6 +- ...64-dts-amlogic-g12-switch-to-the-new.patch | 499 ------------------ ...4-dts-amlogic-g12-enable-UART-RX-an.patch} | 6 +- ...trl-meson-define-the-pull-up-down-r.patch} | 4 +- ...indings-iio-adc-amlogic-meson-sarad.patch} | 4 +- ...adc-meson-add-support-for-the-GXLX-.patch} | 4 +- ...4-dts-amlogic-gxlx-s905l-p271-add-s.patch} | 4 +- ...dio-mux-meson-gxl-set-28th-bit-in-e.patch} | 4 +- ...mlogic-meson8b-usb2-Use-FIELD_PREP-.patch} | 4 +- ...mlogic-meson8b-usb2-Use-the-regmap_.patch} | 4 +- ...ndings-vendor-prefixes-Add-Titan-Mi.patch} | 4 +- ...ndings-auxdisplay-Add-Titan-Micro-E.patch} | 4 +- ...ABI-document-tm1628-attribute-displ.patch} | 4 +- ...splay-add-support-for-Titanmec-TM16.patch} | 4 +- ...-dts-meson-gxl-s905w-tx3-mini-add-s.patch} | 4 +- ...AINERS-Add-entry-for-tm1628-auxdisp.patch} | 4 +- ...-si2168-increase-cmd-execution-time.patch} | 4 +- ...-meson-vdec-esparser-check-parsing-.patch} | 4 +- ...-meson-vdec-implement-10bit-bitstre.patch} | 4 +- ...ia-meson-vdec-add-HEVC-decode-codec.patch} | 4 +- ...ndings-usb-dwc2-allow-device-sub-no.patch} | 4 +- ...eson-Avoid-use-after-free-issues-wi.patch} | 4 +- ...eson-fix-resource-cleanup-in-meson_.patch} | 4 +- ...-meson-meson-card-utils-use-of_prope.patch | 42 ++ ...t-drm-meson-vclk-fix-calculation-of.patch} | 4 +- ...-unsigned-long-long-for-frequency-t.patch} | 4 +- ...-meson-vdec-reintroduce-wiggle-room.patch} | 4 +- ...n-vdec-fix-memory-leak-of-new_frame.patch} | 4 +- ...dec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch} | 4 +- ...on-add-Odroid-C2-HiFi-Shield-boards.patch} | 4 +- ...-gxl-implement-meson_gxl_phy_resume.patch} | 4 +- ...-support-for-2560x1440-resolution-o.patch} | 4 +- ...setup-after-resumption-to-fix-hdmi-.patch} | 4 +- ...eron-off-dw_hdmi-only-if-dw_hdmi-en.patch} | 4 +- ...on-set-p212-p23x-q20x-SDIO-to-100MH.patch} | 12 +- ...on-remove-SDIO-node-from-Khadas-VIM.patch} | 8 +- ...on-add-UHS-SDIO-capabilities-to-p21.patch} | 12 +- ...rm-amlogic-add-support-for-Tanix-TX.patch} | 4 +- ...on-add-initial-device-tree-for-Tani.patch} | 4 +- ...on-add-7-segment-display-to-Tanix-T.patch} | 4 +- ...fix-power-transition-timeout-warnin.patch} | 4 +- projects/Amlogic/linux/linux.aarch64.conf | 12 +- 55 files changed, 154 insertions(+), 1046 deletions(-) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.15-arm64-dts-amlogic-gx-switch-to-the-new-.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0014-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch => amlogic-0011-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch} (91%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.15-arm64-dts-amlogic-axg-switch-to-the-new.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0015-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch => amlogic-0012-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch} (92%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.15-arm64-dts-amlogic-g12-switch-to-the-new.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0016-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch => amlogic-0013-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0017-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch => amlogic-0014-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0018-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch => amlogic-0015-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0019-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch => amlogic-0016-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0020-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch => amlogic-0017-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0021-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch => amlogic-0018-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0022-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch => amlogic-0019-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0023-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch => amlogic-0020-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0024-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch => amlogic-0021-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0025-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch => amlogic-0022-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0026-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch => amlogic-0023-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0027-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch => amlogic-0024-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0028-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch => amlogic-0025-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0029-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch => amlogic-0026-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0030-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch => amlogic-0027-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0031-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch => amlogic-0028-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0032-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch => amlogic-0029-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0033-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch => amlogic-0030-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0034-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch => amlogic-0031-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0035-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch => amlogic-0032-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0036-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch => amlogic-0033-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch} (97%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-ASoC-meson-meson-card-utils-use-of_prope.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0037-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch => amlogic-0035-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0038-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch => amlogic-0036-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0039-WIP-media-meson-vdec-reintroduce-wiggle-room.patch => amlogic-0037-WIP-media-meson-vdec-reintroduce-wiggle-room.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0040-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch => amlogic-0038-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0041-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch => amlogic-0039-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0042-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch => amlogic-0040-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0043-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch => amlogic-0041-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0044-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch => amlogic-0042-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0045-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch => amlogic-0043-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0046-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch => amlogic-0044-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch => amlogic-0045-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0048-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch => amlogic-0046-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch} (81%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0049-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch => amlogic-0047-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch} (81%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0050-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch => amlogic-0048-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0051-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch => amlogic-0049-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0052-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch => amlogic-0050-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0053-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch => amlogic-0051-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch} (93%) 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 7a3f96d248..5925993b54 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 5bb8805228fcb342a09ae2093775d8ca9825eef7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 01/53] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 01/51] 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 7a2c906b89..e14a5b302d 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 61ec51fc6355b44c6a67bd31dfae62d1ef49bde1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 02/53] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 02/51] LOCAL: set meson-g12 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-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 06171098f7..154d30b3aa 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 8ad1d87fdd6ef19e36698ed3196da4290d539327 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 03/53] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 03/51] 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 b97f485667..b5b19018ed 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 541a3e64dce42c72d208016abcb91200ae6c893c Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 04/53] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 04/51] 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 c64fc24773..b030422148 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 f0cd0ee46866bf5c51e5e9ae659bf65a00a52b17 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 05/53] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 05/51] 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 e42fa8f243..d093606649 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 11f6cc8d5b113befe40a069fcd3b4d14253440d1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 06/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 06/51] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 0b0d0fe9b7..a01291afbb 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 faaef1d48296fd78ad60dc6f8d76a133ed67fb09 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 07/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 07/51] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index aabc483b47..5a2f0fae9f 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 af394a3409915c1d7d022a779476f65cd6876c39 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 08/53] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix +Subject: [PATCH 08/51] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch index 17b784647b..773cde4537 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ASoC-meson-assign-internal-PCM-chmap-ELD-IEC95.patch @@ -1,7 +1,7 @@ From 6169c8539c94c04523469ca0c9a0618881eb7163 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 09/53] LOCAL: ASoC: meson: assign internal PCM +Subject: [PATCH 09/51] LOCAL: ASoC: meson: assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with an HDMI codec the kctls diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch index 406ae98929..80f58f3bc8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-media-meson-vdec-disable-MPEG1-MPEG2-hardware-.patch @@ -1,7 +1,7 @@ From b38f002a46b824e6da63514b82fe965af1272d44 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 10/53] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 10/51] LOCAL: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.15-arm64-dts-amlogic-gx-switch-to-the-new-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.15-arm64-dts-amlogic-gx-switch-to-the-new-.patch deleted file mode 100644 index 99bf13c5cd..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.15-arm64-dts-amlogic-gx-switch-to-the-new-.patch +++ /dev/null @@ -1,365 +0,0 @@ -From 125cefb6ba538033a69eb17870cf87e99e9a15e6 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Fri, 27 Dec 2024 22:25:12 +0100 -Subject: [PATCH 11/53] FROMGIT(6.15): arm64: dts: amlogic: gx: switch to the - new PWM controller binding - -Use the new PWM controller binding which now relies on passing all -clock inputs available on the SoC (instead of passing the "wanted" -clock input for a given board). - -Signed-off-by: Martin Blumenstingl ---- - .../dts/amlogic/meson-gx-libretech-pc.dtsi | 6 ----- - .../boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 -- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 +++--- - .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 -- - .../dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 -- - .../boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 -- - .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 -- - .../boot/dts/amlogic/meson-gxbb-wetek.dtsi | 2 -- - arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 +++++++++++++++++++ - .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 2 -- - .../meson-gxl-s905w-jethome-jethub-j80.dts | 2 -- - .../meson-gxl-s905x-hwacom-amazetv.dts | 2 -- - .../amlogic/meson-gxl-s905x-khadas-vim.dts | 2 -- - .../amlogic/meson-gxl-s905x-nexbox-a95x.dts | 2 -- - .../dts/amlogic/meson-gxl-s905x-p212.dtsi | 2 -- - arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 +++++++++++++++++++ - .../dts/amlogic/meson-gxm-khadas-vim2.dts | 4 --- - .../boot/dts/amlogic/meson-gxm-rbox-pro.dts | 2 -- - 18 files changed, 54 insertions(+), 40 deletions(-) - -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 d38c3a224fbe..2da49cfbde77 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi -@@ -345,24 +345,18 @@ rtc: rtc@51 { - &pwm_AO_ab { - pinctrl-0 = <&pwm_ao_a_3_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_ab { - pinctrl-0 = <&pwm_b_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_ef { - pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - status = "okay"; - }; - -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 45ccddd1aaf0..6da1316d97c6 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -240,8 +240,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index b702a7f7bcf5..260628cf218e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -333,14 +333,14 @@ i2c_A: i2c@8500 { - }; - - pwm_ab: pwm@8550 { -- compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; -+ compatible = "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x08550 0x0 0x10>; - #pwm-cells = <3>; - status = "disabled"; - }; - - pwm_cd: pwm@8650 { -- compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; -+ compatible = "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x08650 0x0 0x10>; - #pwm-cells = <3>; - status = "disabled"; -@@ -355,7 +355,7 @@ saradc: adc@8680 { - }; - - pwm_ef: pwm@86c0 { -- compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; -+ compatible = "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x086c0 0x0 0x10>; - #pwm-cells = <3>; - status = "disabled"; -@@ -507,7 +507,7 @@ i2c_AO: i2c@500 { - }; - - pwm_AO_ab: pwm@550 { -- compatible = "amlogic,meson-gx-ao-pwm", "amlogic,meson-gxbb-ao-pwm"; -+ compatible = "amlogic,meson-gxbb-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x00550 0x0 0x10>; - #pwm-cells = <3>; - status = "disabled"; -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 cf2e2ef81680..2ecc6ebd5a43 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts -@@ -298,8 +298,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -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 7d7dde93fff3..c09da40ff7b0 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts -@@ -241,8 +241,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* Wireless SDIO Module */ -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -index 1736bd2e96e2..6f67364fd63f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi -@@ -150,8 +150,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* Wireless SDIO Module */ -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 3807a184810b..6ff567225fee 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi -@@ -222,8 +222,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -index deb295227189..bfedfc1472ec 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi -@@ -185,8 +185,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index ed00e67e6923..8ebce7114a60 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -@@ -739,6 +739,31 @@ mux { - }; - }; - -+&pwm_ab { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ -+&pwm_AO_ab { -+ clocks = <&xtal>, <&clkc CLKID_CLK81>; -+}; -+ -+&pwm_cd { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ -+&pwm_ef { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ - &pwrc { - resets = <&reset RESET_VIU>, - <&reset RESET_VENC>, -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 c5e2306ad7a4..ca7c4e8e7cac 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-p241.dts -@@ -280,8 +280,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* This is connected to the Bluetooth module: */ -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts -index 2b94b6e5285e..4ca90ac947b7 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-jethome-jethub-j80.dts -@@ -116,8 +116,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts -index 89fe5110f7a2..62a2da766a00 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts -@@ -115,8 +115,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* SD card */ -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 0741d34945bb..e137ebd48c5e 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 -@@ -213,8 +213,6 @@ &pwm_AO_ab { - status = "okay"; - pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; - pinctrl-names = "default"; -- clocks = <&xtal> , <&xtal>; -- clock-names = "clkin0", "clkin1" ; - }; - - &pwm_ef { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts -index c79f9f2099bf..236cedec9f19 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts -@@ -145,8 +145,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* Wireless SDIO Module */ -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index b52a830efcce..05a0d4de3ad7 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -101,8 +101,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -index f58d1790de1c..2dc2fdaecf9f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -@@ -809,6 +809,31 @@ internal_phy: ethernet-phy@8 { - }; - }; - -+&pwm_ab { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ -+&pwm_AO_ab { -+ clocks = <&xtal>, <&clkc CLKID_CLK81>; -+}; -+ -+&pwm_cd { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ -+&pwm_ef { -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; -+}; -+ - &pwrc { - resets = <&reset RESET_VIU>, - <&reset RESET_VENC>, -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 544c757f8bb7..8a89940869b0 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -@@ -291,16 +291,12 @@ &pwm_AO_ab { - status = "okay"; - pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - &sd_emmc_a { -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 7356d3b628b1..ecaf678b23dd 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts -@@ -192,8 +192,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&clkc CLKID_FCLK_DIV4>; -- clock-names = "clkin0"; - }; - - /* Wireless SDIO Module */ --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch index 7b42f7ae99..ad57b2e942 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-FROMGIT-6.16-arm64-dts-amlogic-gxbb-enable-UART-RX-a.patch @@ -1,7 +1,7 @@ -From 272dfa2c3bac7e33de0ea9ed9f4aae955973c6ad Mon Sep 17 00:00:00 2001 +From 3eca81d6c8551f3f4ed83e6943ccc86fe1b0130e Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 19:58:51 +0100 -Subject: [PATCH 14/53] FROMGIT(6.16): arm64: dts: amlogic: gxbb: enable UART +Subject: [PATCH 11/51] FROMGIT(6.16): arm64: dts: amlogic: gxbb: enable UART RX and TX pull up by default Some boards have noise on the UART RX line when the UART pins are not @@ -17,7 +17,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index 8ebce7114a60..c4a9f855e5de 100644 +index ed00e67e6923..e45f629bd71a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -105,7 +105,7 @@ uart_ao_a_pins: uart_ao_a { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.15-arm64-dts-amlogic-axg-switch-to-the-new.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.15-arm64-dts-amlogic-axg-switch-to-the-new.patch deleted file mode 100644 index 976195643c..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.15-arm64-dts-amlogic-axg-switch-to-the-new.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 5ce556e64d2be8040826a7044089c10a817f3ced Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Fri, 27 Dec 2024 22:25:13 +0100 -Subject: [PATCH 12/53] FROMGIT(6.15): arm64: dts: amlogic: axg: switch to the - new PWM controller binding - -Use the new PWM controller binding which now relies on passing all -clock inputs available on the SoC (instead of passing the "wanted" -clock input for a given board). - -Signed-off-by: Martin Blumenstingl ---- - arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 ++++++++++++++++++---- - 1 file changed, 20 insertions(+), 4 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -index e9b22868983d..a6924d246bb1 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -@@ -1693,8 +1693,12 @@ sec_AO: ao-secure@140 { - }; - - pwm_AO_cd: pwm@2000 { -- compatible = "amlogic,meson-axg-ao-pwm"; -+ compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x02000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc_AO CLKID_AO_CLK81>, -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV5>; - #pwm-cells = <3>; - status = "disabled"; - }; -@@ -1728,8 +1732,12 @@ i2c_AO: i2c@5000 { - }; - - pwm_AO_ab: pwm@7000 { -- compatible = "amlogic,meson-axg-ao-pwm"; -+ compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x07000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc_AO CLKID_AO_CLK81>, -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV5>; - #pwm-cells = <3>; - status = "disabled"; - }; -@@ -1806,15 +1814,23 @@ watchdog@f0d0 { - }; - - pwm_ab: pwm@1b000 { -- compatible = "amlogic,meson-axg-ee-pwm"; -+ compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x1b000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc CLKID_FCLK_DIV5>, -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; - #pwm-cells = <3>; - status = "disabled"; - }; - - pwm_cd: pwm@1a000 { -- compatible = "amlogic,meson-axg-ee-pwm"; -+ compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2"; - reg = <0x0 0x1a000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc CLKID_FCLK_DIV5>, -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; - #pwm-cells = <3>; - status = "disabled"; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch index 8bf2e39272..2806bff5ef 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.16-arm64-dts-amlogic-gxl-enable-UART-RX-an.patch @@ -1,7 +1,7 @@ -From 4b9863b988e55077859cf5bd399c3b44ec4cbc92 Mon Sep 17 00:00:00 2001 +From f0e1b70a0267605a1dd9f22c9ff7cf59bb837d67 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 19:58:52 +0100 -Subject: [PATCH 15/53] FROMGIT(6.16): arm64: dts: amlogic: gxl: enable UART RX +Subject: [PATCH 12/51] FROMGIT(6.16): arm64: dts: amlogic: gxl: enable UART RX and TX pull up by default Some boards have noise on the UART RX line when the UART pins are not @@ -17,7 +17,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi -index 2dc2fdaecf9f..460c46cfad6a 100644 +index f58d1790de1c..d4497dc7d76b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -163,7 +163,7 @@ uart_ao_a_pins: uart_ao_a { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.15-arm64-dts-amlogic-g12-switch-to-the-new.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.15-arm64-dts-amlogic-g12-switch-to-the-new.patch deleted file mode 100644 index 7d439635de..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.15-arm64-dts-amlogic-g12-switch-to-the-new.patch +++ /dev/null @@ -1,499 +0,0 @@ -From 4e19e8bc168c2345c7ad7321c49a5da0e0e85f08 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Fri, 27 Dec 2024 22:25:14 +0100 -Subject: [PATCH 13/53] FROMGIT(6.15): arm64: dts: amlogic: g12: switch to the - new PWM controller binding - -Use the new PWM controller binding which now relies on passing all -clock inputs available on the SoC (instead of passing the "wanted" -clock input for a given board). - -Signed-off-by: Martin Blumenstingl ---- - .../boot/dts/amlogic/meson-g12-common.dtsi | 33 ++++++++++++++++--- - .../boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 --- - .../dts/amlogic/meson-g12a-radxa-zero.dts | 4 --- - .../boot/dts/amlogic/meson-g12a-sei510.dts | 4 --- - .../boot/dts/amlogic/meson-g12a-u200.dts | 2 -- - .../boot/dts/amlogic/meson-g12a-x96-max.dts | 4 --- - .../amlogic/meson-g12b-a311d-libretech-cc.dts | 2 -- - .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 4 --- - .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 --- - .../dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 --- - .../boot/dts/amlogic/meson-g12b-odroid.dtsi | 4 --- - .../dts/amlogic/meson-g12b-radxa-zero2.dts | 8 ----- - .../boot/dts/amlogic/meson-g12b-w400.dtsi | 6 ---- - .../amlogic/meson-libretech-cottonwood.dtsi | 6 ---- - .../boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 6 ---- - .../boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 -- - .../dts/amlogic/meson-sm1-khadas-vim3l.dts | 2 -- - .../boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 -- - .../boot/dts/amlogic/meson-sm1-sei610.dts | 6 ---- - 19 files changed, 28 insertions(+), 79 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 2a7f91b2a7cb..9b6593555912 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -2060,8 +2060,11 @@ cecb_AO: cec@280 { - }; - - pwm_AO_cd: pwm@2000 { -- compatible = "amlogic,meson-g12a-ao-pwm-cd"; -+ compatible = "amlogic,meson-g12-pwm-v2", -+ "amlogic,meson8-pwm-v2"; - reg = <0x0 0x2000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc_AO CLKID_AO_CLK81>; - #pwm-cells = <3>; - status = "disabled"; - }; -@@ -2099,8 +2102,13 @@ i2c_AO: i2c@5000 { - }; - - pwm_AO_ab: pwm@7000 { -- compatible = "amlogic,meson-g12a-ao-pwm-ab"; -+ compatible = "amlogic,meson-g12-pwm-v2", -+ "amlogic,meson8-pwm-v2"; - reg = <0x0 0x7000 0x0 0x20>; -+ clocks = <&xtal>, -+ <&clkc_AO CLKID_AO_CLK81>, -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV5>; - #pwm-cells = <3>; - status = "disabled"; - }; -@@ -2301,22 +2309,37 @@ spifc: spi@14000 { - }; - - pwm_ef: pwm@19000 { -- compatible = "amlogic,meson-g12a-ee-pwm"; -+ compatible = "amlogic,meson-g12-pwm-v2", -+ "amlogic,meson8-pwm-v2"; - reg = <0x0 0x19000 0x0 0x20>; -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; - #pwm-cells = <3>; - status = "disabled"; - }; - - pwm_cd: pwm@1a000 { -- compatible = "amlogic,meson-g12a-ee-pwm"; -+ compatible = "amlogic,meson-g12-pwm-v2", -+ "amlogic,meson8-pwm-v2"; - reg = <0x0 0x1a000 0x0 0x20>; -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; - #pwm-cells = <3>; - status = "disabled"; - }; - - pwm_ab: pwm@1b000 { -- compatible = "amlogic,meson-g12a-ee-pwm"; -+ compatible = "amlogic,meson-g12-pwm-v2", -+ "amlogic,meson8-pwm-v2"; - reg = <0x0 0x1b000 0x0 0x20>; -+ clocks = <&xtal>, -+ <>, /* unknown/untested, the datasheet calls it "vid_pll" */ -+ <&clkc CLKID_FCLK_DIV4>, -+ <&clkc CLKID_FCLK_DIV3>; - #pwm-cells = <3>; - status = "disabled"; - }; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts -index a457b3f4397b..9aa36f17ffa2 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts -@@ -346,8 +346,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -355,8 +353,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &pdm { -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 c779a5da7d1e..952b8d02e5c2 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -284,8 +284,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -293,8 +291,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -index ea51341f031b..52fbc5103e45 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts -@@ -389,8 +389,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -398,8 +396,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &pdm { -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts -index f70a46967e2b..5407049d2647 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts -@@ -502,8 +502,6 @@ &i2c3 { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - 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 32f98a192494..01da83658ae3 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts -@@ -328,8 +328,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -363,8 +361,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &uart_A { -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts -index 65b963d794cd..adedc1340c78 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts -@@ -116,6 +116,4 @@ &cpu103 { - - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>; -- clocks = <&xtal>, <&xtal>; -- clock-names = "clkin0", "clkin1"; - }; -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 08c33ec7e9f1..92e8b26ecccc 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi -@@ -257,8 +257,6 @@ &pcie { - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - - status = "okay"; - }; -@@ -273,8 +271,6 @@ &pwm_ef { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - - status = "okay"; - }; -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -index d4e1990b5f26..54663c55a20e 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -@@ -367,8 +367,6 @@ &pwm_ab { - status = "okay"; - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &pwm_ef { -@@ -380,8 +378,6 @@ &pwm_ef { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi -index 16dd409051b4..48650bad230d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi -@@ -92,16 +92,12 @@ &cpu103 { - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -index 09d959aefb18..7e8964bacfce 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi -@@ -327,16 +327,12 @@ hdmi_tx_tmds_out: endpoint { - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -index 39feba7f2d08..fc05ecf90714 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts -@@ -379,32 +379,24 @@ &ir { - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_ef { - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_AO_ab { - pinctrl-0 = <&pwm_ao_a_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi -index 4cb6930ffb19..a7a0fc264cdc 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi -@@ -304,24 +304,18 @@ &ir { - &pwm_ab { - pinctrl-0 = <&pwm_a_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - - &pwm_ef { - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi -index 929e4720ae76..ac9c4c2673b1 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi -@@ -458,24 +458,18 @@ &pwm_AO_cd { - status = "okay"; - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - }; - - &pwm_ab { - status = "okay"; - pinctrl-0 = <&pwm_b_x7_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - }; - - &pwm_cd { - status = "okay"; - pinctrl-0 = <&pwm_d_x3_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi -index d1fa8b8bf795..a3463149db3d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi -@@ -199,15 +199,11 @@ &pwm_AO_ab { - status = "okay"; - pinctrl-0 = <&pwm_ao_a_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -215,8 +211,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &saradc { -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -index 81dce862902a..40db95f64636 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -@@ -367,8 +367,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts -index 9c0b544e2209..5d75ad3f3e46 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts -@@ -78,8 +78,6 @@ &cpu3 { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -index 7b0e9817a615..ad8d07883760 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi -@@ -392,8 +392,6 @@ &ir { - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -index 2e3397e55da2..37d7f64b6d5d 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts -@@ -435,15 +435,11 @@ &pwm_AO_ab { - status = "okay"; - pinctrl-0 = <&pwm_ao_a_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &pwm_AO_cd { - pinctrl-0 = <&pwm_ao_d_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin1"; - status = "okay"; - }; - -@@ -451,8 +447,6 @@ &pwm_ef { - status = "okay"; - pinctrl-0 = <&pwm_e_pins>; - pinctrl-names = "default"; -- clocks = <&xtal>; -- clock-names = "clkin0"; - }; - - &saradc { --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch index 1c9ef8cecd..a710b7823b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.16-arm64-dts-amlogic-g12-enable-UART-RX-an.patch @@ -1,7 +1,7 @@ -From 4742b8a4579c54b61a6c55d4f936d9feada98a5f Mon Sep 17 00:00:00 2001 +From 1f4b636dc055b01d41fd3510a0374b2cdb9ed40c Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 19:58:53 +0100 -Subject: [PATCH 16/53] FROMGIT(6.16): arm64: dts: amlogic: g12: enable UART RX +Subject: [PATCH 13/51] FROMGIT(6.16): arm64: dts: amlogic: g12: enable UART RX and TX pull up by default Some boards have noise on the UART RX line when the UART pins are not @@ -17,7 +17,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 9b6593555912..f8ca2ecab179 100644 +index 2a7f91b2a7cb..5a54076375fc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -1503,7 +1503,7 @@ mux { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch index 3f8a7488e0..c274eed78f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.16-pinctrl-meson-define-the-pull-up-down-r.patch @@ -1,7 +1,7 @@ -From 775eba531ae4c19de23f1b649d84a0bcb744dff7 Mon Sep 17 00:00:00 2001 +From 27768c0407ff0215c11d484b7ab05feabde7a7b8 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 20:01:32 +0100 -Subject: [PATCH 17/53] FROMGIT(6.16): pinctrl: meson: define the pull up/down +Subject: [PATCH 14/51] FROMGIT(6.16): pinctrl: meson: define the pull up/down resistor value as 60 kOhm The public datasheets of the following Amlogic SoCs describe a typical diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch index 882d6b0928..b367c54421 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.16-dt-bindings-iio-adc-amlogic-meson-sarad.patch @@ -1,7 +1,7 @@ -From ef3a1eb8be168c22dec884b4686eede433903e8f Mon Sep 17 00:00:00 2001 +From 1cab497fa17c6ed946a166bb99ccbd7676826c2e Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Tue, 31 Dec 2024 20:42:06 +0100 -Subject: [PATCH 18/53] FROMGIT(6.16): dt-bindings: iio: adc: +Subject: [PATCH 15/51] FROMGIT(6.16): dt-bindings: iio: adc: amlogic,meson-saradc: Add GXLX SoC compatible Add a compatible string for the GXLX SoC. It's very similar to GXL but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch index 1828cf4aa6..46d52e62db 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.16-iio-adc-meson-add-support-for-the-GXLX-.patch @@ -1,7 +1,7 @@ -From b307f9e14e29454c68869127ad7c6f98e0aa8730 Mon Sep 17 00:00:00 2001 +From 0cbeda74d6d647f313b00e6bfd423de76805f747 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 23 Mar 2024 20:44:41 +0100 -Subject: [PATCH 19/53] FROMGIT(6.16): iio: adc: meson: add support for the +Subject: [PATCH 16/51] FROMGIT(6.16): iio: adc: meson: add support for the GXLX SoC The SARADC IP on the GXLX SoC itself is identical to the one found on diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch index a0c885e927..da85a02633 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.16-arm64-dts-amlogic-gxlx-s905l-p271-add-s.patch @@ -1,7 +1,7 @@ -From 09b587b581c62586964c4f2df134a9e9719ec2da Mon Sep 17 00:00:00 2001 +From 96bda6fd0ab17afd599d8b823292c3587dc072a5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Jan 2025 07:16:49 +0000 -Subject: [PATCH 20/53] FROMGIT(6.16): arm64: dts: amlogic: gxlx-s905l-p271: +Subject: [PATCH 17/51] FROMGIT(6.16): arm64: dts: amlogic: gxlx-s905l-p271: add saradc compatible Add the saradac node using the meson-gxlx-saradc compatible to ensure diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch index e615145966..acab53045f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMLIST-v2-net-mdio-mux-meson-gxl-set-28th-bit-in-e.patch @@ -1,7 +1,7 @@ -From 3c4b397f63f9f3e5c8fef9376edd0bf555c2a51d Mon Sep 17 00:00:00 2001 +From 2bb51b4f2f12406ee3145127c77523c2602b7ba1 Mon Sep 17 00:00:00 2001 From: Da Xue Date: Fri, 24 May 2024 15:17:37 +0000 -Subject: [PATCH 21/53] FROMLIST(v2): net: mdio: mux-meson-gxl: set 28th bit in +Subject: [PATCH 18/51] FROMLIST(v2): net: mdio: mux-meson-gxl: set 28th bit in eth_reg2 This bit is necessary to enable packets on the interface. Without this diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch index 697b1c07c8..694f2af79d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-FIELD_PREP-.patch @@ -1,7 +1,7 @@ -From 90d4b883b6e8082b13f32a44be186460dd6ba36f Mon Sep 17 00:00:00 2001 +From f34935b97e04a2d7493e65734d90fc1e3ee5cc4b Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 20:07:11 +0100 -Subject: [PATCH 22/53] FROMLIST(v2): phy: amlogic: meson8b-usb2: Use +Subject: [PATCH 19/51] FROMLIST(v2): phy: amlogic: meson8b-usb2: Use FIELD_PREP instead of _SHIFT macros This simplifies the code by re-using the FIELD_PREP helper. No diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch index 4974120c31..5ce2bd2da4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMLIST-v2-phy-amlogic-meson8b-usb2-Use-the-regmap_.patch @@ -1,7 +1,7 @@ -From 845c35b942345fc124d813a391db72ac744419d6 Mon Sep 17 00:00:00 2001 +From df3e619072dae02707312b265d64f82ac9adc7b2 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 29 Mar 2025 20:07:12 +0100 -Subject: [PATCH 23/53] FROMLIST(v2): phy: amlogic: meson8b-usb2: Use the +Subject: [PATCH 20/51] FROMLIST(v2): phy: amlogic: meson8b-usb2: Use the regmap_{clear,set}_bits helpers These require less code, reduce the chance of typos and overall make the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-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 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-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 ca9eed291d..80bfee9257 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-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 9991b884224088ef2f192e2f9611bb9f007533e7 Mon Sep 17 00:00:00 2001 +From 6d3b1774ee807a5240f72d2c87febe0c65c317ad 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 24/53] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 21/51] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan Micro Electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-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-0025-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 de67b4554c..ba022d160d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-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 22cd2782096126e9496eb97106d2d34cd2d752a9 Mon Sep 17 00:00:00 2001 +From 8cdf6ddcdc863c058f7d2f2b772406c8cda9bb7c Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 25/53] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro +Subject: [PATCH 22/51] 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-0026-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-0026-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 20bc869426..82233c297f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-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 7f379bd661917cdf3cc0be846a706c8df68dab19 Mon Sep 17 00:00:00 2001 +From 6484382755ef7a31a5cf7e8e2e02cbe3ab9852a4 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 26/53] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 23/51] 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-0027-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-0027-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 efc2093816..2d06629343 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-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 95b3984ca0cd5d0cfb6d0a829fa472591bca4c64 Mon Sep 17 00:00:00 2001 +From 434a2f57588a7051e4c68046be339f7d3770e3d4 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 27/53] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 24/51] 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-0028-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-0028-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 81b20d3c2a..d4d336985b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-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 4985271dd36e87078095c932dfd4feb429179491 Mon Sep 17 00:00:00 2001 +From 6f0afab88e64f7af3a3e07c2dc78f04920bab8b7 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 28/53] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add +Subject: [PATCH 25/51] 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-0029-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 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-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 950d665561..341a343739 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-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 ac79a3571d08885f87788167d24cc802f36cc81c Mon Sep 17 00:00:00 2001 +From 261f695262ad45848fd464b411410aba8d2ca44e Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 29/53] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 26/51] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch index 663b76f7b0..21b3e0f8f4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMLIST-v2-media-si2168-increase-cmd-execution-time.patch @@ -1,7 +1,7 @@ -From cd867a48c76f919098003d5c7a756005b98ae735 Mon Sep 17 00:00:00 2001 +From 753ad3063981d401a92388a143d22369775cdc0f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 7 Feb 2025 04:29:08 +0000 -Subject: [PATCH 30/53] FROMLIST(v2): media: si2168: increase cmd execution +Subject: [PATCH 27/51] FROMLIST(v2): media: si2168: increase cmd execution timeout value Testing with a MyGica T230C v2 USB device (0572:c68a) shows occasional diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-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 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-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 efd58f6312..2e2c31bd57 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-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 21069f953585bee3300f645785296b2dc457cdb3 Mon Sep 17 00:00:00 2001 +From dc7b5f9513efe9a081126d82f9681ed94d195523 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 31/53] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 28/51] FROMLIST(v1): media: meson: vdec: esparser: check parsing state with hardware write pointer Also check the hardware write pointer to check if ES Parser has stalled. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-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 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-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 f8bd28b649..88960343d0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-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 71b8f6ca86a34d894993b2aa3f4edaf53cea10b8 Mon Sep 17 00:00:00 2001 +From e883c21fdc846fe8a7f5d24645fda420d9cd1cf6 Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 32/53] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 29/51] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-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-0033-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 710ab21f77..8ed964c6c3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-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 16e696992950b690a74ddea431ecd792a745d9fc Mon Sep 17 00:00:00 2001 +From 4914cd2636248ed0b02b2ca746c4b4d7a203f74c Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 33/53] FROMLIST(v2): media: meson: vdec: add HEVC decode codec +Subject: [PATCH 30/51] 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. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch index 1ef30d043c..159eaa85ca 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMLIST-v1-dt-bindings-usb-dwc2-allow-device-sub-no.patch @@ -1,7 +1,7 @@ -From e6631facd47ddeef3ddee7ddcdad50b4daf1ff08 Mon Sep 17 00:00:00 2001 +From 84a5ee50a437ade0f8d0dac3faa6fc20b043c8f3 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Wed, 5 Jun 2024 11:15:11 +0200 -Subject: [PATCH 34/53] FROMLIST(v1): dt-bindings: usb: dwc2: allow device +Subject: [PATCH 31/51] FROMLIST(v1): dt-bindings: usb: dwc2: allow device sub-nodes Allow the '#address-cells', '#size-cells' and subnodes as defined in diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch index e233e63d31..5cbe4f00ac 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMLIST-v1-drm-meson-Avoid-use-after-free-issues-wi.patch @@ -1,7 +1,7 @@ -From 5de8d70aea800ab286364e0e07fd82ac7969e88d Mon Sep 17 00:00:00 2001 +From feee6a25cfea5f02068b1d8b8aaa1f8a912c5640 Mon Sep 17 00:00:00 2001 From: Zhang Kunbo Date: Wed, 6 Nov 2024 02:45:48 +0000 -Subject: [PATCH 35/53] FROMLIST(v1): drm/meson: Avoid use-after-free issues +Subject: [PATCH 32/51] FROMLIST(v1): drm/meson: Avoid use-after-free issues with crtc It's dangerous to call drm_crtc_init_with_planes() whose second diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch index c1fe1f41cf..ba6d5906cd 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMLIST-v1-drm-meson-fix-resource-cleanup-in-meson_.patch @@ -1,7 +1,7 @@ -From 6b6e71f868f03d004f27b96daf1b2ceb967fa4e4 Mon Sep 17 00:00:00 2001 +From ac0c47e3468d631992aaeb949a85667eb67b6191 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 9 Apr 2025 23:44:22 +0200 -Subject: [PATCH 36/53] FROMLIST(v1): drm/meson: fix resource cleanup in +Subject: [PATCH 33/51] FROMLIST(v1): drm/meson: fix resource cleanup in meson_drv_bind_master() on error meson_drv_bind_master() does not free resources in the order they are diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-ASoC-meson-meson-card-utils-use-of_prope.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-ASoC-meson-meson-card-utils-use-of_prope.patch new file mode 100644 index 0000000000..f1bdf32876 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMLIST-v1-ASoC-meson-meson-card-utils-use-of_prope.patch @@ -0,0 +1,42 @@ +From 26b3645eb68d787fdea261e2c7f5eade2e0d0b8f Mon Sep 17 00:00:00 2001 +From: Martin Blumenstingl +Date: Sat, 19 Apr 2025 23:34:48 +0200 +Subject: [PATCH 34/51] FROMLIST(v1): ASoC: meson: meson-card-utils: use + of_property_present() for DT parsing + +Commit c141ecc3cecd ("of: Warn when of_property_read_bool() is used on +non-boolean properties") added a warning when trying to parse a property +with a value (boolean properties are defined as: absent = false, present +without any value = true). This causes a warning from meson-card-utils. + +meson-card-utils needs to know about the existence of the +"audio-routing" and/or "audio-widgets" properties in order to properly +parse them. Switch to of_property_present() in order to silence the +following warning messages during boot: + OF: /sound: Read of boolean property 'audio-routing' with a value. + OF: /sound: Read of boolean property 'audio-widgets' with a value. + +Fixes: 7864a79f37b5 ("ASoC: meson: add axg sound card support") +Tested-by: Christian Hewitt +Cc: stable@vger.kernel.org +Signed-off-by: Martin Blumenstingl +--- + sound/soc/meson/meson-card-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c +index 1a4ef124e4e2..ad38c74166a4 100644 +--- a/sound/soc/meson/meson-card-utils.c ++++ b/sound/soc/meson/meson-card-utils.c +@@ -231,7 +231,7 @@ static int meson_card_parse_of_optional(struct snd_soc_card *card, + const char *p)) + { + /* If property is not provided, don't fail ... */ +- if (!of_property_read_bool(card->dev->of_node, propname)) ++ if (!of_property_present(card->dev->of_node, propname)) + return 0; + + /* ... but do fail if it is provided and the parsing fails */ +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch index cd0f550b18..8796f8a094 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMLIST-v1-Revert-drm-meson-vclk-fix-calculation-of.patch @@ -1,7 +1,7 @@ -From 045135fc517b39872fca082639ee75a37bd53409 Mon Sep 17 00:00:00 2001 +From cea22ff6abfc0d053eba4fe6eecb39060451c2c9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Jan 2025 23:45:46 +0000 -Subject: [PATCH 37/53] FROMLIST(v1): Revert "drm/meson: vclk: fix calculation +Subject: [PATCH 35/51] FROMLIST(v1): Revert "drm/meson: vclk: fix calculation of 59.94 fractional rates" This reverts commit bfbc68e4d8695497f858a45a142665e22a512ea3. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch index 57f3e7bb89..9ec660550b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-WIP-drm-meson-use-unsigned-long-long-for-frequency-t.patch @@ -1,7 +1,7 @@ -From 0b829ab99985c9326b81c97e19b9e36bc094b1e5 Mon Sep 17 00:00:00 2001 +From 8498067827a5ad84f3a716aa02fc30fee1d2b5f0 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 5 Apr 2025 04:13:19 +0000 -Subject: [PATCH 38/53] WIP: drm/meson: use unsigned long long for frequency +Subject: [PATCH 36/51] WIP: drm/meson: use unsigned long long for frequency types Signed-off-by: Martin Blumenstingl diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-reintroduce-wiggle-room.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-reintroduce-wiggle-room.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-reintroduce-wiggle-room.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-reintroduce-wiggle-room.patch index fe90bc4d11..44ccd1681d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-reintroduce-wiggle-room.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-WIP-media-meson-vdec-reintroduce-wiggle-room.patch @@ -1,7 +1,7 @@ -From 1af16e49bc86ed4f7f07b2219f80ec958c6c5914 Mon Sep 17 00:00:00 2001 +From 730b88bfa86446ef847e53252bcfef02c9169e93 Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Tue, 2 Apr 2024 14:22:52 +0000 -Subject: [PATCH 39/53] WIP: media: meson: vdec: reintroduce wiggle room +Subject: [PATCH 37/51] WIP: media: meson: vdec: reintroduce wiggle room Without the wiggle room, it happens that matching offsets can't be found. This results in non-matches and afterwards in frame drops in userspace apps. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch index 215da6e5a0..1096ed7a14 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -1,7 +1,7 @@ -From b23e2786837b9bd3680e4d5e74eb5c39e5fac331 Mon Sep 17 00:00:00 2001 +From e4125158db00f8488e4e6cbafed72f1e7e19b2c6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Mar 2023 01:13:15 +0000 -Subject: [PATCH 40/53] WIP: media: meson: vdec: fix memory leak of 'new_frame' +Subject: [PATCH 38/51] WIP: media: meson: vdec: fix memory leak of 'new_frame' Reported-by: kernel test robot Reported-by: Dan Carpenter diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch index d976bad6d1..0f9f2596a7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-WIP-media-meson-vdec-fix-V4L2_BUF_FLAG_-KEY-P-B-FRAM.patch @@ -1,7 +1,7 @@ -From c1017889ef5c1840da96add89cdc7ca489f675cf Mon Sep 17 00:00:00 2001 +From 15ec62d05962392265d7964474c8d749f9dc1673 Mon Sep 17 00:00:00 2001 From: Andreas Baierl Date: Thu, 20 Feb 2025 23:59:14 +0000 -Subject: [PATCH 41/53] WIP: media: meson: vdec: fix +Subject: [PATCH 39/51] WIP: media: meson: vdec: fix V4L2_BUF_FLAG_{KEY|P|B}FRAME ffmpeg needs the keyframe flag to be set correctly, else diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch index 6f4bcd5539..67d75401c6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-WIP-arm64-dts-meson-add-Odroid-C2-HiFi-Shield-boards.patch @@ -1,7 +1,7 @@ -From 69f53715337f45b98c8e257be114486b81770611 Mon Sep 17 00:00:00 2001 +From 483b88c4236ce0b2f5eb36308bb6b3222712cf08 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 26 May 2024 12:53:07 +0000 -Subject: [PATCH 42/53] WIP: arm64: dts: meson: add Odroid-C2 HiFi-Shield +Subject: [PATCH 40/51] WIP: arm64: dts: meson: add Odroid-C2 HiFi-Shield boards Add experimental device-tree files for Odroid C2 with HiFi-Shield+ (pcm5102a) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch index d5056aac40..63dc81ab11 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-WIP-net-phy-meson-gxl-implement-meson_gxl_phy_resume.patch @@ -1,7 +1,7 @@ -From 91ae28555ff89b9aecc14f821cff5744be225ff8 Mon Sep 17 00:00:00 2001 +From 51aef4d4d9062c5c9c3ccbc95a6d0acf78edaabd Mon Sep 17 00:00:00 2001 From: Da Xue Date: Tue, 8 Aug 2023 01:00:15 -0400 -Subject: [PATCH 43/53] WIP: net: phy: meson-gxl: implement +Subject: [PATCH 41/51] WIP: net: phy: meson-gxl: implement meson_gxl_phy_resume() While testing the suspend/resume functionality, we found the ethernet diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch index 9989aa3870..cd1d0a937f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-WIP-drm-meson-add-support-for-2560x1440-resolution-o.patch @@ -1,7 +1,7 @@ -From 538cca691167d4a225ebbbfbca11f7e4f5a3de4a Mon Sep 17 00:00:00 2001 +From d9032ded4dfc151a1ea5733e92dd351b814fd3bf Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Thu, 10 Sep 2020 11:01:33 +0900 -Subject: [PATCH 44/53] WIP: drm/meson: add support for 2560x1440 resolution +Subject: [PATCH 42/51] WIP: drm/meson: add support for 2560x1440 resolution output Add support for Quad HD (QHD) 2560x1440 resolution output. Timings diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch index 2dad79cbb3..6179c3c2a8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-WIP-drm-meson-do-setup-after-resumption-to-fix-hdmi-.patch @@ -1,7 +1,7 @@ -From 93a7c586594e03c1cd45ce029586fdaf1088be8f Mon Sep 17 00:00:00 2001 +From 9abde365a972976762155220b275cc5986e12f14 Mon Sep 17 00:00:00 2001 From: Luke Lu Date: Mon, 21 Aug 2023 10:50:04 +0000 -Subject: [PATCH 45/53] WIP: drm/meson: do setup after resumption to fix hdmi +Subject: [PATCH 43/51] WIP: drm/meson: do setup after resumption to fix hdmi output Some HDMI displays connected to gxl-based boards go black after diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch index 8595b77e8f..defd25ed25 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-WIP-drm-meson-poweron-off-dw_hdmi-only-if-dw_hdmi-en.patch @@ -1,7 +1,7 @@ -From eeaee862f75804c9ce3784efc473e25ada398a0e Mon Sep 17 00:00:00 2001 +From c469a3a9512d67f1dd656d1d0fb84cc82d57d380 Mon Sep 17 00:00:00 2001 From: Luke Lu Date: Wed, 13 Dec 2023 03:47:44 +0000 -Subject: [PATCH 46/53] WIP: drm/meson: poweron/off dw_hdmi only if dw_hdmi +Subject: [PATCH 44/51] WIP: drm/meson: poweron/off dw_hdmi only if dw_hdmi enabled dw_hdmi_poweron() assumes that hdmi->curr_conn is valid. Calling diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index b22d226cf4..e94d2c226f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From 5ccf7bfa59e8b0eb43282ae496648f25bb0220d1 Mon Sep 17 00:00:00 2001 +From d32d823a70587d632369aca5e8774d8c6c9f94d5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 47/53] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 45/51] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to 100MHz Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but @@ -79,10 +79,10 @@ Signed-off-by: Christian Hewitt 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index 6da1316d97c6..f6ef4fc4a85c 100644 +index 45ccddd1aaf0..bcc3d2e9e81f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -258,7 +258,7 @@ &sd_emmc_a { +@@ -260,7 +260,7 @@ &sd_emmc_a { bus-width = <4>; cap-sd-highspeed; @@ -92,10 +92,10 @@ index 6da1316d97c6..f6ef4fc4a85c 100644 non-removable; disable-wp; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index 05a0d4de3ad7..ccaadb497880 100644 +index b52a830efcce..edfbd882fd47 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -119,7 +119,7 @@ &sd_emmc_a { +@@ -121,7 +121,7 @@ &sd_emmc_a { bus-width = <4>; cap-sd-highspeed; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 81% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index 806e2dd54f..951f25a81a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From e79b340acba76cac9cc30d74f736934d67349657 Mon Sep 17 00:00:00 2001 +From 57d5576b53b15d4e65ec27c0cc76778b5d8d2a9a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 48/53] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 46/51] WIP: arm64: dts: meson: remove SDIO node from Khadas VIM1 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index e137ebd48c5e..563e6e909363 100644 +index 0741d34945bb..18223afde3e7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -@@ -219,10 +219,6 @@ &pwm_ef { +@@ -221,10 +221,6 @@ &pwm_ef { pinctrl-0 = <&pwm_e_pins>, <&pwm_f_clk_pins>; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 81% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index d0380bfec7..105f340a55 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From c7d8fd9b653f357b6c8fa10126bcd50a9c1a2504 Mon Sep 17 00:00:00 2001 +From 4988cc0bea195656a8c9fa84c0cc5a55f450890f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 49/53] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 47/51] WIP: arm64: dts: meson: add UHS SDIO capabilities to p212/p23x/q20x Add UHS capabilities to the SDIO node to enable 100MHz speeds. @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 2 files changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index f6ef4fc4a85c..b3385f71bb48 100644 +index bcc3d2e9e81f..34f20a6ad38f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -@@ -258,6 +258,10 @@ &sd_emmc_a { +@@ -260,6 +260,10 @@ &sd_emmc_a { bus-width = <4>; cap-sd-highspeed; @@ -28,10 +28,10 @@ index f6ef4fc4a85c..b3385f71bb48 100644 non-removable; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -index ccaadb497880..59539eca8f42 100644 +index edfbd882fd47..c74308499786 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi -@@ -119,6 +119,10 @@ &sd_emmc_a { +@@ -121,6 +121,10 @@ &sd_emmc_a { bus-width = <4>; cap-sd-highspeed; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch index 05e734efe2..74828a2d98 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch @@ -1,7 +1,7 @@ -From 5a279aa776957fd34c69b17102402f30db5f589f Mon Sep 17 00:00:00 2001 +From 6bc6c1f6d8d280f7d86ce376079f65d8f17cceee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 09:59:58 +0000 -Subject: [PATCH 50/53] WIP: dt-bindings: arm: amlogic: add support for Tanix +Subject: [PATCH 48/51] WIP: dt-bindings: arm: amlogic: add support for Tanix TX9 Pro The Oranth Tanix TX9 Pro is an Android STB using the Amlogic S912 chip diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch index f00f741382..09337feb79 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch @@ -1,7 +1,7 @@ -From 2bf7b1b2ce42510ba84ba3b22a78cc0f72b4b033 Mon Sep 17 00:00:00 2001 +From 1f9e333a442bb030d227ef0afb4290cbd27f6a82 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:01:14 +0000 -Subject: [PATCH 51/53] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 49/51] WIP: arm64: dts: meson: add initial device-tree for Tanix TX9 Pro Oranth Tanix TX9 Pro is based on the Amlogic Q200 reference design with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch index 94eb7b3a92..3a6d5a0ea6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch @@ -1,7 +1,7 @@ -From ab3e08d71ff989e3b1369e5ce518834f2793d63a Mon Sep 17 00:00:00 2001 +From 44c76bc403938f997751bc14858e0d7c514d1eeb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:11:39 +0000 -Subject: [PATCH 52/53] WIP: arm64: dts: meson: add 7-segment display to Tanix +Subject: [PATCH 50/51] WIP: arm64: dts: meson: add 7-segment display to Tanix TX9 Pro Add support for the 7-segment VFD display of the device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch index 54918342a0..a2cf4968c0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-WIP-drm-panfrost-fix-power-transition-timeout-warnin.patch @@ -1,7 +1,7 @@ -From bcacd41042e57e3783771b19608519fae7c3a3bd Mon Sep 17 00:00:00 2001 +From 24333ce109de3cd43052ca420d250d84468b821c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 27 Jan 2025 17:52:10 +0000 -Subject: [PATCH 53/53] WIP: drm/panfrost: fix power transition timeout +Subject: [PATCH 51/51] WIP: drm/panfrost: fix power transition timeout warnings (again) *** THIS IS NOT PROVEN *** diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index c059e1b937..d39326116d 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -20,6 +20,7 @@ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -1178,6 +1179,7 @@ CONFIG_NETFILTER_XT_SET=m # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_CT is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set # CONFIG_NETFILTER_XT_TARGET_HL is not set # CONFIG_NETFILTER_XT_TARGET_HMARK is not set @@ -1189,11 +1191,13 @@ CONFIG_NETFILTER_XT_NAT=m # CONFIG_NETFILTER_XT_TARGET_NETMAP is not set # CONFIG_NETFILTER_XT_TARGET_NFLOG is not set # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m # CONFIG_NETFILTER_XT_TARGET_TEE is not set # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set @@ -1515,6 +1519,7 @@ CONFIG_BT_MTK=m CONFIG_BT_HCIBTUSB=m # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set CONFIG_BT_HCIBTUSB_POLL_SYNC=y +# CONFIG_BT_HCIBTUSB_AUTO_ISOC_ALT is not set CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_MTK=y CONFIG_BT_HCIBTUSB_RTL=y @@ -5608,6 +5613,7 @@ CONFIG_USB_SERIAL_PL2303=m # CONFIG_USB_LINK_LAYER_TEST is not set # CONFIG_USB_CHAOSKEY is not set CONFIG_USB_ONBOARD_DEV=y +# CONFIG_USB_ONBOARD_DEV_USB5744 is not set # # USB Physical Layer drivers @@ -6104,8 +6110,8 @@ CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXG_AUDIO=y # CONFIG_COMMON_CLK_A1_PLL is not set # CONFIG_COMMON_CLK_A1_PERIPHERALS is not set -CONFIG_COMMON_CLK_C3_PLL=y -CONFIG_COMMON_CLK_C3_PERIPHERALS=y +# CONFIG_COMMON_CLK_C3_PLL is not set +# CONFIG_COMMON_CLK_C3_PERIPHERALS is not set CONFIG_COMMON_CLK_G12A=y CONFIG_COMMON_CLK_S4_PLL=y CONFIG_COMMON_CLK_S4_PERIPHERALS=y @@ -6123,7 +6129,7 @@ CONFIG_TIMER_PROBE=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y -CONFIG_FSL_ERRATUM_A008585=y +# CONFIG_FSL_ERRATUM_A008585 is not set # CONFIG_HISILICON_ERRATUM_161010101 is not set CONFIG_ARM64_ERRATUM_858921=y # CONFIG_ARM_TIMER_SP804 is not set