From 266ffa3db7dc09362feb83e8ab74947398f6a61a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 23 Feb 2023 21:28:34 +0100 Subject: [PATCH 001/157] linux (RPi): update to 6.1.13-e9b8fd9 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index bd973bc51a..bcfce430eb 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="df7cc0b7ce879a5b551b2db026b3ddad8ae78b26" # 6.1.12 - PKG_SHA256="f4bd86147b58cbc25b00fd77719ce700d630e5e078df5b56b136418d3aaaf313" + PKG_VERSION="e9b8fd92399bd707bde31e3464472c1b06f5e2a0" # 6.1.13 + PKG_SHA256="03e9ea79733623301a56c4d04d2d8f8c7670c7130b38db67cad7c3279a24e149" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From cd68b48986e3a04516eafbad7b1dfee6325f83a4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 23 Feb 2023 21:28:34 +0100 Subject: [PATCH 002/157] linux (RPi): config options for 6.1.13-e9b8fd9 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 9 ++++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index fc97a57d11..20d9a442ba 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.6 Kernel Configuration +# Linux/arm 6.1.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3579,7 +3579,6 @@ CONFIG_DVB_SP2=m CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set -# CONFIG_DRM_USE_DYNAMIC_DEBUG is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 05fd0bdba5..9e2cf79fa3 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.6 Kernel Configuration +# Linux/arm 6.1.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3811,7 +3811,6 @@ CONFIG_DVB_SP2=m CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set -# CONFIG_DRM_USE_DYNAMIC_DEBUG is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index e27b28501f..d79c0bfed7 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.6 Kernel Configuration +# Linux/arm64 6.1.13 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -2447,7 +2447,11 @@ CONFIG_RTL_CARDS=m # CONFIG_RTL8192CU is not set CONFIG_RTL8XXXU=m CONFIG_RTL8XXXU_UNTESTED=y -# CONFIG_RTW88 is not set +CONFIG_RTW88=m +# CONFIG_RTW88_8822BE is not set +# CONFIG_RTW88_8822CE is not set +# CONFIG_RTW88_8723DE is not set +# CONFIG_RTW88_8821CE is not set # CONFIG_RTW89 is not set CONFIG_WLAN_VENDOR_RSI=y # CONFIG_RSI_91X is not set @@ -4399,7 +4403,6 @@ CONFIG_DVB_SP2=m CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y # CONFIG_DRM_DEBUG_MM is not set -# CONFIG_DRM_USE_DYNAMIC_DEBUG is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set From c69b7674a7ab19af16cbd871a88693eeb7fed94c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 25 Feb 2023 09:46:34 +0100 Subject: [PATCH 003/157] linux (RPi): update to 6.1.13-4161eac Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index bcfce430eb..822d6149cf 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="e9b8fd92399bd707bde31e3464472c1b06f5e2a0" # 6.1.13 - PKG_SHA256="03e9ea79733623301a56c4d04d2d8f8c7670c7130b38db67cad7c3279a24e149" + PKG_VERSION="4161eac00a3c1c2e756e0210005080bc90494577" # 6.1.13 + PKG_SHA256="a8bcfcf1b9fafb7f99781f40fb334c6afffcc9c90fa034ff8e50a8c9e40442e6" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From d7d581451a0eeb53d30996c6d2899aba414d0efa Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 1 Mar 2023 19:08:24 +0100 Subject: [PATCH 004/157] linux (RPi): add CONFIG_SND_SOC_MA120X0P=m This is needed for the Hifiberry AMP3 soundcard Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi2/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 20d9a442ba..06ae1188d9 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -4072,7 +4072,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y # CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_MA120X0P is not set +CONFIG_SND_SOC_MA120X0P=m # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98357A is not set # CONFIG_SND_SOC_MAX98504 is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 9e2cf79fa3..252d771412 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -4305,7 +4305,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y # CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_MA120X0P is not set +CONFIG_SND_SOC_MA120X0P=m # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98357A is not set # CONFIG_SND_SOC_MAX98504 is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index d79c0bfed7..3951b3b883 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -4993,7 +4993,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y # CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_MA120X0P is not set +CONFIG_SND_SOC_MA120X0P=m # CONFIG_SND_SOC_MAX98088 is not set # CONFIG_SND_SOC_MAX98357A is not set # CONFIG_SND_SOC_MAX98504 is not set From a720cd39f57e09afb6e78aa120bb93452434f794 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 2 Mar 2023 14:51:01 +0100 Subject: [PATCH 005/157] linux (RPi): update to 6.1.14-0c9bfdb Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 822d6149cf..46ae8a6022 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="4161eac00a3c1c2e756e0210005080bc90494577" # 6.1.13 - PKG_SHA256="a8bcfcf1b9fafb7f99781f40fb334c6afffcc9c90fa034ff8e50a8c9e40442e6" + PKG_VERSION="0c9bfdb7d67b1b81079d14f17a50fc1a35242c85" # 6.1.14 + PKG_SHA256="f85e20a4b4c9f5a67101264b5f7af7a2d14ee4bcfb3f1ec07c73f518b9daadbb" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 258e4b9b3d267e8e36393a429105af5c20c2d058 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Mar 2023 07:19:40 +0000 Subject: [PATCH 006/157] scripts: add bananapi-cm4io to uboot_helper --- scripts/uboot_helper | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/uboot_helper b/scripts/uboot_helper index cd2c75fc90..7e7bd3b731 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -164,6 +164,10 @@ devices = \ 'dtb': '', 'config': 'p212_defconfig' }, + 'bananapi-cm4io': { + 'dtb': 'meson-g12b-bananapi-cm4-cm4io.dtb', + 'config': 'bananapi-cm4io_defconfig' + }, 'bananapi-m2s': { 'dtb': 'meson-g12b-a311d-bananapi-m2s.dtb', 'config': 'bananapi-m2s_defconfig' From b91fd79e4a71dfb31176dd5d21aa7dfa4547abfb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Mar 2023 15:51:14 +0000 Subject: [PATCH 007/157] amlogic-boot-fip: bump to include bananapi-cm4io --- packages/tools/amlogic-boot-fip/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/amlogic-boot-fip/package.mk b/packages/tools/amlogic-boot-fip/package.mk index dd237c255e..cbc7a96655 100644 --- a/packages/tools/amlogic-boot-fip/package.mk +++ b/packages/tools/amlogic-boot-fip/package.mk @@ -3,8 +3,8 @@ PKG_NAME="amlogic-boot-fip" PKG_LICENSE="nonfree" -PKG_VERSION="955a8ae91630038d50342814bae1b055c75707db" -PKG_SHA256="32dbcf80440b406f00783bfc1ffacb721ac829c7c12624c594474ecf48a77db8" +PKG_VERSION="e96b6a694380ff07d5a9e4be644ffe254bd18512" +PKG_SHA256="2cc06bc7d5647fd8c0025181fa42c4a8ef0ed16b918a1fa2060ea83c22e47b20" PKG_SITE="https://github.com/LibreELEC/amlogic-boot-fip" PKG_URL="https://github.com/LibreELEC/amlogic-boot-fip/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Firmware Image Package (FIP) sources used to sign Amlogic u-boot binaries in LibreELEC images" From 1f23cfa05659349c6e89fe30d5a0c048a47d98a1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Mar 2023 07:40:07 +0000 Subject: [PATCH 008/157] u-boot: update Amlogic patches for bananapi-cm4io --- ...son64-prevent-stdout-stderr-on-video.patch | 2 +- ...son64-remove-amlogic-so-fdtdir-finds.patch | 2 +- ...gic-odroid-n2-remove-amlogic-prefix-.patch | 2 +- ...ts-meson-nanopi-k2-readd-PHY-reset-p.patch | 2 +- ...rt-WeTek-Hub-Play2-DTs-from-Linux-5..patch | 2 +- ...snps-reset-on-WeTek-devices-to-fix-E.patch | 2 +- ...ic-add-board-files-for-wetek-gxbb-de.patch | 2 +- ...ards-amlogic-add-WeTek-Hub-defconfig.patch | 2 +- ...ds-amlogic-add-WeTek-Play2-defconfig.patch | 2 +- ...-ARM-dts-add-support-for-Radxa-Zero2.patch | 2 +- ...ds-amlogic-add-Radxa-Zero2-defconfig.patch | 2 +- ...oards-amlogic-update-for-Radxa-Zero2.patch | 2 +- ...mport-Beelink-GT1-DT-from-Linux-5.21.patch | 2 +- ...ds-amlogic-add-Beelink-GT1-defconfig.patch | 2 +- ...oards-amlogic-update-for-Beelink-GT1.patch | 2 +- ...-ARM-dts-convert-bananapi-m5-to-dtsi.patch | 2 +- ...-dts-add-support-for-BananaPi-M2-Pro.patch | 2 +- ...boards-add-BananaPi-M2-Pro-defconfig.patch | 2 +- ...s-amlogic-update-for-BananaPi-M2-Pro.patch | 2 +- ...IP-boards-add-BananaPi-M2S-defconfig.patch | 2 +- ...ards-amlogic-update-for-BananaPi-M2S.patch | 2 +- ...ARM-dts-add-support-for-BananaPi-M2S.patch | 2 +- ...-boards-add-BananaPi-CM4IO-defconfig.patch | 102 +++ ...ds-amlogic-update-for-BananaPi-CM4IO.patch | 43 ++ ...M-dts-add-support-for-BananaPi-CM4IO.patch | 611 ++++++++++++++++++ 25 files changed, 778 insertions(+), 22 deletions(-) create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0023-WIP-boards-add-BananaPi-CM4IO-defconfig.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0024-WIP-docs-boards-amlogic-update-for-BananaPi-CM4IO.patch create mode 100644 projects/Amlogic/patches/u-boot/u-boot-0025-WIP-ARM-dts-add-support-for-BananaPi-CM4IO.patch diff --git a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch index a5bdb26d5d..b92bd7c9d3 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0001-LOCAL-configs-meson64-prevent-stdout-stderr-on-video.patch @@ -1,7 +1,7 @@ From 95ed57b0ca24cde1d7547878101c62f552cb1160 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 13 Nov 2020 02:09:36 +0000 -Subject: [PATCH 01/22] LOCAL: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 01/25] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr diff --git a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch index 8b93165b7c..8c85e55e06 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0002-LOCAL-configs-meson64-remove-amlogic-so-fdtdir-finds.patch @@ -1,7 +1,7 @@ From d16384b766e1704470f678589e01d288fbb94960 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 06:52:50 +0000 -Subject: [PATCH 02/22] LOCAL: configs: meson64: remove /amlogic so fdtdir +Subject: [PATCH 02/25] LOCAL: configs: meson64: remove /amlogic so fdtdir finds LE boot files --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch index bcebc030c5..4318a856fd 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0003-LOCAL-board-amlogic-odroid-n2-remove-amlogic-prefix-.patch @@ -1,7 +1,7 @@ From a9fc1d56916fbcf4e00a1dd7543c9f53d697477a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 3 Aug 2021 18:42:55 +0000 -Subject: [PATCH 03/22] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ +Subject: [PATCH 03/25] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix for dtb path Remove the /amlogic/ prefix to align with current LE dtb locations. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch b/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch index c94e8c8e84..48d3c44170 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0004-BACKPORT-arm64-dts-meson-nanopi-k2-readd-PHY-reset-p.patch @@ -1,7 +1,7 @@ From 7d8355053316d3f760a5ac14156e77e27aa5f6d5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 25 Oct 2022 14:24:21 +0000 -Subject: [PATCH 04/22] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset +Subject: [PATCH 04/25] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset properties The sync of device-tree/bindings in 11a48a5a18c6 ("Linux 5.6-rc2") causes diff --git a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch index cb830c8ede..99623e0f1b 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0005-WIP-ARM-dts-import-WeTek-Hub-Play2-DTs-from-Linux-5..patch @@ -1,7 +1,7 @@ From f72090a5d057a18fa8bceec0400c212012f56126 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:19:43 +0000 -Subject: [PATCH 05/22] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux +Subject: [PATCH 05/25] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux 5.19 Import the WeTek common dtsi and Hub/Play2 device-trees. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch index c29d217a9b..66a9adb836 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0006-WIP-ARM-dts-use-snps-reset-on-WeTek-devices-to-fix-E.patch @@ -1,7 +1,7 @@ From 4df4197e1eb7e257d0c4dda60a7ff427fbd47c6f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 20 Apr 2021 05:29:19 +0000 -Subject: [PATCH 06/22] WIP: ARM: dts: use snps,reset on WeTek devices to fix +Subject: [PATCH 06/25] WIP: ARM: dts: use snps,reset on WeTek devices to fix Ethernet The sync of the device tree and dt-bindings from Linux v5.6-rc2 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch index 9f9800b6dd..2eabb458a0 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0007-WIP-boards-amlogic-add-board-files-for-wetek-gxbb-de.patch @@ -1,7 +1,7 @@ From cec8965a83baea925ac82ca0be5dac3cc1823915 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 22 Apr 2021 05:45:29 +0000 -Subject: [PATCH 07/22] WIP: boards: amlogic: add board files for wetek-gxbb +Subject: [PATCH 07/25] WIP: boards: amlogic: add board files for wetek-gxbb devices These support the WeTek Hub and Play2 devices. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch index 0dce3407b3..d62818443d 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch @@ -1,7 +1,7 @@ From 8b7dfec310b69a5b7cafacbe11a3ca36b497c78c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Feb 2021 06:03:00 +0000 -Subject: [PATCH 08/22] WIP: boards: amlogic: add WeTek Hub defconfig +Subject: [PATCH 08/25] WIP: boards: amlogic: add WeTek Hub defconfig Signed-of-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch index 41b94fd28a..b1f195ac43 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch @@ -1,7 +1,7 @@ From e45b57304c28592eae3ad386559abb6dd3a7a802 Mon Sep 17 00:00:00 2001 From: chewitt Date: Sat, 27 Feb 2021 06:04:00 +0000 -Subject: [PATCH 09/22] WIP: boards: amlogic: add WeTek Play2 defconfig +Subject: [PATCH 09/25] WIP: boards: amlogic: add WeTek Play2 defconfig Signed-off-by: Christian Hewittt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch index 3c3b36f534..09452595e5 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0010-WIP-ARM-dts-add-support-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ From 7a49690898b3af72646df09784b8cdd9b1b593fd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:17:23 +0000 -Subject: [PATCH 10/22] WIP: ARM: dts: add support for Radxa Zero2 +Subject: [PATCH 10/25] WIP: ARM: dts: add support for Radxa Zero2 Import the initial dts (WIP) from chewitt/amlogic-5.16.y diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch index 547babb8a7..69390eb7b0 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch @@ -1,7 +1,7 @@ From e7babbfd6c66c20e81e9d728a6a4384a9a5885dd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:23:29 +0000 -Subject: [PATCH 11/22] WIP: boards: amlogic: add Radxa Zero2 defconfig +Subject: [PATCH 11/25] WIP: boards: amlogic: add Radxa Zero2 defconfig Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch index e1d7cead98..2e3512026d 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0012-WIP-doc-boards-amlogic-update-for-Radxa-Zero2.patch @@ -1,7 +1,7 @@ From 2fc65ac09a5698b9e2060890de1cd3310a237658 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 15 Jan 2022 06:35:47 +0000 -Subject: [PATCH 12/22] WIP: doc: boards: amlogic: update for Radxa Zero2 +Subject: [PATCH 12/25] WIP: doc: boards: amlogic: update for Radxa Zero2 Add documentation bits for the Radxa Zero2 diff --git a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch index 786a26d81c..f7849a49cc 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0013-WIP-ARM-dts-import-Beelink-GT1-DT-from-Linux-5.21.patch @@ -1,7 +1,7 @@ From 7ce3779954032f9ac2591a02df06282115032cb3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 7 Jul 2022 10:24:03 +0000 -Subject: [PATCH 13/22] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 +Subject: [PATCH 13/25] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 Import the Beelink GT1 device-tree. diff --git a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch index 24bdcda648..02cd8f219e 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch @@ -1,7 +1,7 @@ From 7416bc16b956d7b9b2761ac5511c6b51ac8b4ca1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 7 Jul 2022 10:27:01 +0000 -Subject: [PATCH 14/22] WIP: boards: amlogic: add Beelink GT1 defconfig +Subject: [PATCH 14/25] WIP: boards: amlogic: add Beelink GT1 defconfig Add a board config for Beelink GT1 devices diff --git a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch index 5b3f11a276..cb665c950f 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0015-WIP-doc-boards-amlogic-update-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ From 5c21b65a0efdae590e0d0ecd1191078725e4abf4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 14 Jul 2022 19:38:41 +0000 -Subject: [PATCH 15/22] WIP: doc: boards: amlogic: update for Beelink GT1 +Subject: [PATCH 15/25] WIP: doc: boards: amlogic: update for Beelink GT1 Add documentation bits for the Beelink GT1 and GT1-Ultimate diff --git a/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch b/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch index eef144642c..12adc25d00 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch @@ -1,7 +1,7 @@ From 0addaf5179afa1c985f493035a1dca8f1b23a4ed Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 05:37:13 +0000 -Subject: [PATCH 16/22] WIP: ARM: dts: convert bananapi-m5 to dtsi +Subject: [PATCH 16/25] WIP: ARM: dts: convert bananapi-m5 to dtsi Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch b/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch index aa2db89932..dba403571e 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch @@ -1,7 +1,7 @@ From dbf80e3d843cb58b9098d7c0e24c9ab1208003a7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 05:38:46 +0000 -Subject: [PATCH 17/22] WIP: ARM: dts: add support for BananaPi M2-Pro +Subject: [PATCH 17/25] WIP: ARM: dts: add support for BananaPi M2-Pro Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch index e17be8f0c5..bef33bfec7 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch @@ -1,7 +1,7 @@ From 0be895d75648124c0bd8d7fce1fe61c3dbacbe5f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 05:41:36 +0000 -Subject: [PATCH 18/22] WIP: boards: add BananaPi M2-Pro defconfig +Subject: [PATCH 18/25] WIP: boards: add BananaPi M2-Pro defconfig Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch index 03ad4f5c60..5d4ee92349 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch @@ -1,7 +1,7 @@ From b4870c47202687c6a6880b449c97a2e32ec3d278 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 05:49:44 +0000 -Subject: [PATCH 19/22] WIP: docs: boards: amlogic: update for BananaPi M2-Pro +Subject: [PATCH 19/25] WIP: docs: boards: amlogic: update for BananaPi M2-Pro Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch index 82df4f88b2..44382c6285 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch @@ -1,7 +1,7 @@ From 665eff902425685a2278e393a89452276e4ea665 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 18 Feb 2023 08:06:04 +0000 -Subject: [PATCH 20/22] WIP: boards: add BananaPi M2S defconfig +Subject: [PATCH 20/25] WIP: boards: add BananaPi M2S defconfig Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch index 68e1d2aa95..48e5d9b269 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch @@ -1,7 +1,7 @@ From e1484036ca5e032a9039ed2f361f2b123a8efd64 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 18 Feb 2023 08:08:42 +0000 -Subject: [PATCH 21/22] WIP: docs: boards: amlogic: update for BananaPi M2S +Subject: [PATCH 21/25] WIP: docs: boards: amlogic: update for BananaPi M2S Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch b/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch index fe9a7d6e12..6f76ea5cd2 100644 --- a/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch +++ b/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch @@ -1,7 +1,7 @@ From 821819ff0d9185954b251d5fd197b5b67cdd08d3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 18 Feb 2023 07:59:25 +0000 -Subject: [PATCH 22/22] WIP: ARM: dts: add support for BananaPi M2S +Subject: [PATCH 22/25] WIP: ARM: dts: add support for BananaPi M2S Import the device-tree from Linux 6.x diff --git a/projects/Amlogic/patches/u-boot/u-boot-0023-WIP-boards-add-BananaPi-CM4IO-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0023-WIP-boards-add-BananaPi-CM4IO-defconfig.patch new file mode 100644 index 0000000000..c5432bbd81 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0023-WIP-boards-add-BananaPi-CM4IO-defconfig.patch @@ -0,0 +1,102 @@ +From 27b889069d184c4b6678d8dc46eef0788e385823 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 4 Mar 2023 07:33:24 +0000 +Subject: [PATCH 23/25] WIP: boards: add BananaPi CM4IO defconfig + +Signed-off-by: Christian Hewitt +--- + configs/bananapi-cm4io_defconfig | 82 ++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 configs/bananapi-cm4io_defconfig + +diff --git a/configs/bananapi-cm4io_defconfig b/configs/bananapi-cm4io_defconfig +new file mode 100644 +index 0000000000..22442a9351 +--- /dev/null ++++ b/configs/bananapi-cm4io_defconfig +@@ -0,0 +1,82 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MESON=y ++CONFIG_SYS_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-bananapi-cm4-cm4io" ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING=" bpi-cm4io" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=y ++CONFIG_AHCI=y ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_REMAKE_ELF=y ++CONFIG_OF_BOARD_SETUP=y ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_GPIO=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_PCI=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_REGULATOR=y ++CONFIG_OF_CONTROL=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_ADC=y ++CONFIG_SARADC_MESON=y ++CONFIG_AHCI_PCI=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_PHY_REALTEK=y ++CONFIG_DM_MDIO=y ++CONFIG_DM_MDIO_MUX=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MDIO_MUX_MESON_G12A=y ++CONFIG_PCI=y ++CONFIG_PCIE_DW_MESON=y ++CONFIG_MESON_G12A_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_G12A=y ++CONFIG_POWER_DOMAIN=y ++CONFIG_MESON_EE_POWER_DOMAIN=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DM_REGULATOR_GPIO=y ++CONFIG_DM_RESET=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_DWC3_MESON_G12A=y ++CONFIG_USB_KEYBOARD=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e ++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_DM_VIDEO=y ++# CONFIG_VIDEO_BPP8 is not set ++# CONFIG_VIDEO_BPP16 is not set ++CONFIG_SYS_WHITE_ON_BLACK=y ++CONFIG_VIDEO_MESON=y ++CONFIG_VIDEO_DT_SIMPLEFB=y ++CONFIG_SPLASH_SCREEN=y ++CONFIG_SPLASH_SCREEN_ALIGN=y ++CONFIG_VIDEO_BMP_RLE8=y ++CONFIG_BMP_16BPP=y ++CONFIG_BMP_24BPP=y ++CONFIG_BMP_32BPP=y ++CONFIG_OF_LIBFDT_OVERLAY=y +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0024-WIP-docs-boards-amlogic-update-for-BananaPi-CM4IO.patch b/projects/Amlogic/patches/u-boot/u-boot-0024-WIP-docs-boards-amlogic-update-for-BananaPi-CM4IO.patch new file mode 100644 index 0000000000..1772917a93 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0024-WIP-docs-boards-amlogic-update-for-BananaPi-CM4IO.patch @@ -0,0 +1,43 @@ +From 80343fe9cb591f3448de8fdf2e33c60bb37af68f Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 4 Mar 2023 07:35:49 +0000 +Subject: [PATCH 24/25] WIP: docs: boards: amlogic: update for BananaPi CM4IO + +Signed-off-by: Christian Hewitt +--- + board/amlogic/w400/MAINTAINERS | 2 ++ + doc/board/amlogic/index.rst | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS +index d4b4d4f91d..7d9bea8454 100644 +--- a/board/amlogic/w400/MAINTAINERS ++++ b/board/amlogic/w400/MAINTAINERS +@@ -3,8 +3,10 @@ M: Neil Armstrong + S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/w400/ ++F: configs/bananapi-cm4io_defconfig + F: configs/bananapi-m2s_defconfig + F: configs/radxa-zero2_defconfig + F: doc/board/amlogic/w400.rst ++F: doc/board/amlogic/bananapi-cm4io.rst + F: doc/board/amlogic/bananapi-m2s.rst + F: doc/board/amlogic/radxa-zero2.rst +diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst +index fd8d4185f8..f15c86b9ff 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -20,7 +20,8 @@ This matrix concerns the actual source code version. + | | P200 | LibreTech-CC v1 | Libretech-PC | | Radxa Zero | GT-King/Pro | Odroid-C4 | + | | P201 | LibreTech-AC v2 | WeTek Core2 | | | GSKing-X | Odroid-HC4 | + | | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | +-| | | | | | | BPI-M2S | BPi-M5 | ++| | | | | | | BPI-CM4IO | BPi-M5 | ++| | | | | | | BPI-M2S | | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-- +2.34.1 + diff --git a/projects/Amlogic/patches/u-boot/u-boot-0025-WIP-ARM-dts-add-support-for-BananaPi-CM4IO.patch b/projects/Amlogic/patches/u-boot/u-boot-0025-WIP-ARM-dts-add-support-for-BananaPi-CM4IO.patch new file mode 100644 index 0000000000..64875d989f --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0025-WIP-ARM-dts-add-support-for-BananaPi-CM4IO.patch @@ -0,0 +1,611 @@ +From dd543d9ffb5b860ad4e4e733b596236e2ed0ad7f Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Sat, 4 Mar 2023 07:39:41 +0000 +Subject: [PATCH 25/25] WIP: ARM: dts: add support for BananaPi CM4IO + +Import the device-tree from Linux 6.x + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/Makefile | 1 + + .../meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi | 7 + + .../arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++ + arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 388 ++++++++++++++++++ + 4 files changed, 561 insertions(+) + create mode 100644 arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts + create mode 100644 arch/arm/dts/meson-g12b-bananapi-cm4.dtsi + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 788fec93a3..9348093806 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -198,6 +198,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ + meson-g12a-u200.dtb \ + meson-g12b-a311d-bananapi-m2s.dtb \ + meson-g12b-a311d-khadas-vim3.dtb \ ++ meson-g12b-bananapi-cm4-cm4io.dtb \ + meson-g12b-gtking.dtb \ + meson-g12b-gtking-pro.dtb \ + meson-g12b-gsking-x.dtb \ +diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi +new file mode 100644 +index 0000000000..236f2468dc +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io-u-boot.dtsi +@@ -0,0 +1,7 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS. ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" +diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts +new file mode 100644 +index 0000000000..2c4a5b3f1b +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts +@@ -0,0 +1,165 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-bananapi-cm4.dtsi" ++#include ++#include ++#include ++ ++/ { ++ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module"; ++ ++ aliases { ++ ethernet0 = ðmac; ++ i2c0 = &i2c1; ++ i2c1 = &i2c3; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1710000>; ++ ++ button-function { ++ label = "Function"; ++ linux,code = ; ++ press-threshold-microvolt = <10000>; ++ }; ++ }; ++ ++ hdmi_connector: hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-CM4IO"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 0", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 0", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 0", ++ "TDM_B Playback", "TDMOUT_B OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-4 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&cecb_AO { ++ status = "okay"; ++}; ++ ++ðmac { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++/* CSI port */ ++&i2c1 { ++ status = "okay"; ++}; ++ ++/* DSI port for touchscreen */ ++&i2c3 { ++ status = "okay"; ++}; ++ ++/* miniPCIe port with USB + SIM slot */ ++&pcie { ++ status = "okay"; ++}; ++ ++&sd_emmc_b { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++/* Peripheral Only USB-C port */ ++&usb { ++ dr_mode = "peripheral"; ++ ++ status = "okay"; ++}; +diff --git a/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi b/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi +new file mode 100644 +index 0000000000..dc0988c826 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi-cm4.dtsi +@@ -0,0 +1,388 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++#include "meson-g12b-a311d.dtsi" ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ rtc1 = &vrtc; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ dc_in: regulator-dc-in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vddio_c: regulator-vddio-c { ++ compatible = "regulator-gpio"; ++ regulator-name = "VDDIO_C"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ ++ enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ ++ gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>; ++ gpios-states = <1>; ++ ++ states = <1800000 0>, ++ <3300000 1>; ++ }; ++ ++ vddao_1v8: regulator-vddao-1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_3v3: regulator-vddao-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ /* ++ * MP8756GD DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ /* ++ * SY8120B1ABC DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu100 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu101 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu102 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu103 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++/* Ethernet to be enabled in baseboard DT */ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++/* HDMI to be enabled in baseboard DT */ ++&hdmi_tx { ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&dc_in>; ++}; ++ ++/* "Camera" I2C bus */ ++&i2c1 { ++ pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* Main I2C bus */ ++&i2c2 { ++ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* "ID" I2C bus */ ++&i2c3 { ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pcie { ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++ ++ status = "okay"; ++}; ++ ++&pwm_ef { ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ ++ status = "okay"; ++}; ++ ++&saradc { ++ vref-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++/* on-module SDIO WiFi */ ++&sd_emmc_a { ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_3v3>; ++ ++ status = "okay"; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card to be enabled in baseboard DT */ ++&sd_emmc_b { ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* on-module eMMC */ ++&sd_emmc_c { ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++/* on-module UART BT */ ++&uart_A { ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&uart_AO { ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&usb { ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +-- +2.34.1 + From 72692fa9f1028e52f39307264235b996492dce2d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 28 Feb 2023 19:26:08 +0000 Subject: [PATCH 009/157] linux: update Amlogic Linux 6.1.x patches --- packages/linux/package.mk | 4 +- ...LOCAL-set-meson-gx-cma-pool-to-896MB.patch | 4 +- ...OCAL-set-meson-g12-cma-pool-to-896MB.patch | 4 +- ...m64-fix-Kodi-sysinfo-CPU-information.patch | 4 +- ...eson-add-Amlogic-Meson-GX-PM-Suspend.patch | 4 +- ...meson-add-support-for-GX-PM-and-Virt.patch | 4 +- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 4 +- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 4 +- ...meson-add-rtc-vrtc-aliases-to-Minix-.patch | 4 +- ...n-internal-PCM-chmap-ELD-IEC958-kctl.patch | 4 +- ...sable-autosuspend-for-Genesys-Logic-.patch | 8 +- ...L-of-partial-revert-of-fdt.c-changes.patch | 4 +- ...-meson-meson_venc-Relax-the-support.patch} | 4 +- ...m-meson-fix-1px-pink-line-on-GXM-whe.patch | 38 ++ ...t-arm64-dts-meson-sm1-odroid-hc4-di.patch} | 4 +- ...-dts-meson-remove-CPU-opps-below-1G.patch} | 4 +- ...-dts-meson-add-Broadcom-WiFi-to-P21.patch} | 4 +- ...-dts-meson-move-pwm_ef-node-in-P212.patch} | 4 +- ...-dts-meson-remove-WiFi-BT-nodes-fro.patch} | 4 +- ...-dts-meson-add-audio-playback-to-S9.patch} | 4 +- ...ndings-reset-meson-g12a-Add-missing.patch} | 4 +- ...ndings-power-Add-G12A-NNA-power-dom.patch} | 4 +- ...mlogic-meson-pwrc-Add-NNA-power-dom.patch} | 4 +- ...-dts-Add-DT-node-for-the-VIPNano-QI.patch} | 4 +- ...tnaviv-Add-nn_core_count-to-chip-fe.patch} | 4 +- ...m-etnaviv-Warn-when-probing-on-NPUs.patch} | 4 +- ...tnaviv-add-HWDB-entry-for-VIPNano-Q.patch} | 4 +- ...-dts-Fix-NPU-power-domain-reference.patch} | 4 +- ...eson-mpll-Switch-from-.round_rate-t.patch} | 4 +- ...eson-dualdiv-switch-from-.round_rat.patch} | 4 +- ...eson-sclk-div-switch-from-.round_ra.patch} | 4 +- ...eson-clk-cpu-dyndiv-switch-from-.ro.patch} | 4 +- ...-dts-amlogic-meson-sm1-odroid-hc4-f.patch} | 4 +- ...-dts-meson-make-dts-use-gpio-fan-ma.patch} | 4 +- ...-dts-meson-radxa-zero-allow-usb-otg.patch} | 4 +- ...-dts-meson-bananapi-m5-switch-VDDIO.patch} | 4 +- ...indings-arm-amlogic-add-support-for-.patch | 28 - ...-dts-meson-meson-sm1-bananapi-m5-co.patch} | 4 +- ...indings-arm-amlogic-add-support-for-.patch | 28 +- ...-dts-meson-add-support-for-BananaPi.patch} | 4 +- ...indings-arm-amlogic-add-support-for-.patch | 30 + ...-dts-meson-add-support-for-Radxa-Ze.patch} | 4 +- ...ndings-net-add-amlogic-gxl-mdio-mul.patch} | 4 +- ...dio-add-amlogic-gxl-mdio-mux-suppor.patch} | 4 +- ...mc-meson-gx-remove-meson_mmc_get_cd.patch} | 4 +- ...-meson-vdec-remove-redundant-if-sta.patch} | 4 +- ...ndings-media-rc-add-rc-dreambox-bin.patch} | 4 +- ...-rc-add-common-keymap-for-Dreambox-.patch} | 4 +- ...ndings-media-rc-add-rc-beelink-mxii.patch} | 4 +- ...ia-rc-add-Beelink-Mini-MXIII-keymap.patch} | 4 +- ...-dts-meson-gxbb-kii-pro-sort-and-ti.patch} | 4 +- ...-dts-meson-gxbb-kii-pro-complete-th.patch} | 4 +- ...-dts-meson-gxbb-kii-pro-add-initial.patch} | 4 +- ...indings-arm-amlogic-Document-the-boa.patch | 39 ++ ...4-dts-amlogic-Add-initial-support-fo.patch | 610 ++++++++++++++++++ ...1-mmc-meson-gx-fix-deferred-probing.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 +- ...hdmi-codec-reorder-channel-allocati.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-serial-amlogic-meson-uart-Ad.patch} | 4 +- ...erial-meson-Add-a-new-compatible-st.patch} | 4 +- ...-dts-meson-g12-common-Use-the-G12A-.patch} | 4 +- ...dec-disable-MPEG1-MPEG2-hardware-de.patch} | 4 +- ...on-set-p212-p23x-q20x-SDIO-to-100MH.patch} | 4 +- ...on-add-UHS-SDIO-capabilities-to-p21.patch} | 4 +- ...on-remove-SDIO-node-from-Khadas-VIM.patch} | 4 +- ...ts-meson-add-audio-playback-to-p201.patch} | 4 +- ...ts-meson-add-audio-playback-to-p200.patch} | 4 +- ...ts-meson-add-audio-playback-to-u200.patch} | 4 +- ...on-add-Headphone-output-to-Beelink-.patch} | 4 +- ...rm-amlogic-add-support-for-the-Tani.patch} | 6 +- ...on-add-support-for-the-Tanix-TX5-Ma.patch} | 6 +- ...on-add-multiple-MeCool-device-trees.patch} | 10 +- ...rm-amlogic-add-support-for-Minix-NE.patch} | 6 +- ...on-add-initial-device-tree-for-Mini.patch} | 8 +- ...eson-add-rtc-vrtc-aliases-to-Minix-.patch} | 4 +- ...rm-amlogic-add-support-for-Beelink-.patch} | 6 +- ...on-add-support-for-Beelink-Mini-MXI.patch} | 8 +- ...-keymap-for-MeCool-M8S-Pro-W-remote.patch} | 4 +- ...rm-amlogic-add-support-for-MeCool-M.patch} | 6 +- ...son-add-RTL8822CS-bluetooth-to-X96-A.patch | 37 -- ...on-add-support-for-MeCool-M8S-Pro-W.patch} | 4 +- ...ngs-arm-amlogic-add-Vero-4K-binding.patch} | 6 +- ...-meson-add-support-for-OSMC-Vero-4K.patch} | 8 +- ...son-sm1-x96-air-add-RTL8822CS-WiFi-a.patch | 62 ++ ...a-rc-add-keymap-for-Venz-V10-remote.patch} | 4 +- ...rm-amlogic-add-S905L-and-Venz-V10-b.patch} | 6 +- ...-dts-meson-add-support-for-Venz-V10.patch} | 8 +- ...ngs-vendor-prefixes-add-tbee-prefix.patch} | 4 +- ...gs-arm-amlogic-add-TBee-Box-binding.patch} | 6 +- ...-dts-meson-add-support-for-TBee-Box.patch} | 8 +- ...arm-amlogic-add-Beelink-GT1-binding.patch} | 6 +- ...s-meson-add-support-for-Beelink-GT1.patch} | 8 +- ...on-add-vcc_5v-regulator-to-WeTek-dt.patch} | 4 +- ...on-add-audio-lineout-to-WeTek-Play2.patch} | 4 +- ...logic-fix-cvbs-disable-on-WeTek-Hub.patch} | 4 +- ...dings-add-compatible-for-es8323-i2c.patch} | 4 +- ...-ASoC-codecs-add-support-for-ES8323.patch} | 4 +- ...dt-bindings-add-dream-vendor-prefix.patch} | 4 +- ...rm-amlogic-add-support-for-Dreambox.patch} | 8 +- ...on-add-initial-device-trees-for-Dre.patch} | 10 +- ...rm-amlogic-add-support-for-Ugoos-AM.patch} | 8 +- ...eson-add-support-for-Ugoos-AM6-Plus.patch} | 8 +- ...on-add-support-for-MeCool-M8S-Pro-P.patch} | 10 +- ...son-radxa-zero2-add-pwm-fan-support.patch} | 4 +- ...rm-amlogic-add-support-for-Tanix-TX.patch} | 6 +- ...on-add-initial-device-tree-for-Tani.patch} | 8 +- ...on-add-7-segment-display-to-Tanix-T.patch} | 4 +- ...-phy-add-support-for-Maxio-MAE0621A.patch} | 4 +- ...-bindings-add-sunvell-vendor-prefix.patch} | 4 +- ...s-media-rc-add-rc-sunvell-t95z-plus.patch} | 4 +- ...rc-add-keymap-for-Sunvell-T95Z-Plus.patch} | 4 +- ...rm-amlogic-add-support-for-Sunvell-.patch} | 6 +- ...on-add-support-for-Sunvell-T95Z-Plu.patch} | 8 +- ...on-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch} | 4 +- ...rm-amlogic-add-support-for-BananaPi.patch} | 10 +- ...on-add-support-for-BananaPi-M2S-var.patch} | 146 ++--- ...on-p23x-q20x-fix-usb-init-don-t-for.patch} | 17 +- ...son-add-WiFi-BT-support-to-BananaPi-.patch | 99 +++ 126 files changed, 1243 insertions(+), 445 deletions(-) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch => amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch} (88%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch => amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch => amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch => amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch => amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch => amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch => amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch => amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch => amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch => amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch => amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch => amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch => amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch => amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch => amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch => amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch => amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch => amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch => amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch => amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch => amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch => amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch => amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch} (92%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch => amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch => amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch} (96%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch => amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch => amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch => amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch => amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch => amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch => amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch => amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch => amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch => amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch => amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch => amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch => amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch} (94%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch => amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch => amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch => amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch => amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch => amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch => amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch => amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch => amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch => amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch => amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch => amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch => amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch => amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch => amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch => amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch => amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch => amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch => amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch => amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch => amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch => amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch => amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch => amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch} (83%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch => amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch => amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch => amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch} (84%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch => amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch => amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch} (85%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch => amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch} (84%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch => amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch => amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch => amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch} (83%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch => amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch => amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch} (82%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch => amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch} (95%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch => amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch => amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch} (85%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch => amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch => amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch => amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch} (82%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch => amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch => amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch} (83%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch => amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch => amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch => amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch => amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch => amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch => amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch => amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch => amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch} (82%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch => amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch => amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch} (82%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch => amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch => amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch => amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch => amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch} (83%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch => amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch => amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch => amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch => amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch => amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch => amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch => amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch} (84%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch => amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch => amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch => amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch} (85%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch => amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch => amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch} (70%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index bd973bc51a..782e98baf9 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="7d54cb2c26dad1264ecca85992bfe8984df4b7b5" # 6.1.14 - PKG_SHA256="76f039741d61e06c740b846291e5017b97da7d3f91fb2f368230a161d46905a6" + PKG_VERSION="42616e0f09fb4e9a6c59892a227f7bdefbd2d6d3" # 6.1.15 + PKG_SHA256="963efd296b713d1eba66cfc831b6b09bcd380fe565baf4f7f63aa1cedc78dd18" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 4a8da94498..03926984fd 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From 6142085e9460414a2fc7f51f0a52afea5eaf0923 Mon Sep 17 00:00:00 2001 +From 3d13e5ef9b0be2a25ab1fff395db44bbe0a3cd22 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 001/119] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 001/124] 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 6c80208d35..5922a41aad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From c0df9052aeb8d47bc2a18e0873b20fb68b54321a Mon Sep 17 00:00:00 2001 +From 6a2448485c0944260935c633e84ac807940cd17d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 002/119] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 002/124] 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 49e9890c83..c4b3467369 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From 980967e34f6463f7b8dc3d37e7a255abb4950dfc Mon Sep 17 00:00:00 2001 +From 94fa4941a5cc58275a9060386480a330af953a03 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 003/119] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 003/124] LOCAL: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index 2e0a3782aa..404fbe35ad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,7 +1,7 @@ -From 6ef4c65b5e4796e163beb7241cdb0b5d2c7698de Mon Sep 17 00:00:00 2001 +From d8485fc35c8f74f174bb9dc66532fda6d2ccaf4d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 004/119] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 004/124] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend The Amlogic Meson GX SoCs uses a non-standard argument to the PSCI CPU_SUSPEND call to enter system suspend. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch index 8eead0cde1..e110bab6d8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch @@ -1,7 +1,7 @@ -From 2712b6a5207c3bdff9612c9938ee0d97a683e007 Mon Sep 17 00:00:00 2001 +From 5de1504fd7f5dbb61045a427fe81ad1c8d344c36 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 005/119] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 005/124] 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 94fe062c67..6bc2cf51e8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 694b9b83d3442791ee6d6c01868d04357bc9b782 Mon Sep 17 00:00:00 2001 +From 896c7e487a9b85565d5f032472479589870fbb7f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 006/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 006/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index d4a8488c0c..3330b62da2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 70d3c7b8d66da08a0deef1c99657ed822b7131b0 Mon Sep 17 00:00:00 2001 +From cf9c9c87c8f4e9b9bd6b77c82160fe37d02ce8cd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 007/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 007/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 3f5512a399..d41979c349 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From a2df580982a2c364aa35da82aa66feddf2e56f36 Mon Sep 17 00:00:00 2001 +From 4fae9dab8a66664eda75b2e72d11be84495874e6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 008/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 008/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch index ce68e41167..395f00e564 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch @@ -1,7 +1,7 @@ -From 86032671e6f5efd8eac2ba503c50b10f538e2c52 Mon Sep 17 00:00:00 2001 +From 6d951d1064742ff05f3c753d2830ee82597f5150 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 009/119] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 +Subject: [PATCH 009/124] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 848e870e0d..e41376cf42 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -1,7 +1,7 @@ -From 95087f3fd82785ef72de4dc4ab3364a76ecbfdf4 Mon Sep 17 00:00:00 2001 +From c2d5a3c9cd74bd38f70e5e0aaac3e0f73a4af506 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 010/119] LOCAL: usb: hub: disable autosuspend for Genesys +Subject: [PATCH 010/124] LOCAL: usb: hub: disable autosuspend for Genesys Logic Hubs Disable autosuspend in Genesys Logic hubs to allow USB devices on the @@ -17,10 +17,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0aaaadb02cc6..1ca434aed00b 100644 +index 1abe43ddb75f..7889811e5516 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5800,7 +5800,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5799,7 +5799,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch index dcb7a837d3..3d7d2f65df 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch @@ -1,7 +1,7 @@ -From 9742de1efcdbf512e3ee5671e0b5d4b7b2dde9d1 Mon Sep 17 00:00:00 2001 +From 9d7af11c29d31e837497210fb027c6e71619ea5d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Sep 2021 05:00:45 +0000 -Subject: [PATCH 011/119] LOCAL: of: partial revert of fdt.c changes +Subject: [PATCH 011/124] LOCAL: of: partial revert of fdt.c changes This resolves reports similar to the below which are present in dmesg since Linux 5.10; which are also causing crashes in some distros: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch index d443b7f661..fd416bee7a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch @@ -1,7 +1,7 @@ -From ebc9244e10d017655e8df41d0f7f12da5a90fb9a Mon Sep 17 00:00:00 2001 +From fcc187a4ae5a17045c2922b37b9158ee6830a31e Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Mon, 13 Feb 2023 10:32:09 +0100 -Subject: [PATCH 058/119] FROMLIST(v2): drm/meson/meson_venc: Relax the +Subject: [PATCH 012/124] FROMGIT(FIXES): drm/meson/meson_venc: Relax the supported mode checks Relax a bit the supported modes list by including also 480x1920 and diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch new file mode 100644 index 0000000000..06072948de --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch @@ -0,0 +1,38 @@ +From 2af8142b44df714599fe5f7a5d9c3f678231bbe1 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 1 Mar 2023 12:48:28 +0000 +Subject: [PATCH 013/124] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM + when scaling video overlay + +Playing media with a resolution smaller than the crtc size requires the +video overlay to be scaled for output and GXM boards display a 1px pink +line on the bottom of the scaled overlay. Comparing with the downstream +vendor driver revealed VPP_DUMMY_DATA not being set [0]. + +Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen. + +[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869 + +Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") +Suggested-by: Martin Blumenstingl +Signed-off-by: Christian Hewitt +--- + drivers/gpu/drm/meson/meson_vpp.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/gpu/drm/meson/meson_vpp.c b/drivers/gpu/drm/meson/meson_vpp.c +index 154837688ab0..5df1957c8e41 100644 +--- a/drivers/gpu/drm/meson/meson_vpp.c ++++ b/drivers/gpu/drm/meson/meson_vpp.c +@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv) + priv->io_base + _REG(VPP_DOLBY_CTRL)); + writel_relaxed(0x1020080, + priv->io_base + _REG(VPP_DUMMY_DATA1)); ++ writel_relaxed(0x42020, ++ priv->io_base + _REG(VPP_DUMMY_DATA)); + } else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) + writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL)); + +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch index 412ee8dbf7..f16f537932 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch @@ -1,7 +1,7 @@ -From 933161dcf2708d0d8765f0134d6cf08f0634737f Mon Sep 17 00:00:00 2001 +From 923a36494f202ce6c3e0b2febfe2fe3fad70256f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 4 Jan 2023 15:19:06 +0000 -Subject: [PATCH 012/119] FROMGIT(6.2): Revert "arm64: dts: +Subject: [PATCH 014/124] FROMGIT(6.2): Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0" This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch index f7cdca579b..a5f93a7da1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch @@ -1,7 +1,7 @@ -From 04e35d23966417d7feea63379cfa97734e88882c Mon Sep 17 00:00:00 2001 +From 700cf88d7bc8a96082f0a55bdaf1990e445862e3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 19 Jan 2023 05:03:53 +0000 -Subject: [PATCH 013/119] FROMGIT(6.3): arm64: dts: meson: remove CPU opps +Subject: [PATCH 015/124] FROMGIT(6.3): arm64: dts: meson: remove CPU opps below 1GHz for G12A boards Amlogic G12A devices experience CPU stalls and random board wedges when diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch index 457910fb04..b39e465251 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch @@ -1,7 +1,7 @@ -From dbc56924b4ef2ef4929dbbd3a71dd5f9c587cb56 Mon Sep 17 00:00:00 2001 +From d4e849bab8f5cbd70d8198e0deb9273c3e63187c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:50:01 +0000 -Subject: [PATCH 014/119] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to +Subject: [PATCH 016/124] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to P212 dtsi The P212 has a combined WiFi/BT module. The BT side is already enabled diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch index cdfe5c9a29..d4a57f5cb0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch @@ -1,7 +1,7 @@ -From 734fe8a9758c83353f4e87d92217fe3f0c94a773 Mon Sep 17 00:00:00 2001 +From c2c6ad295dcfc54e39d48c6981f22a2cebb054c5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:56:12 +0000 -Subject: [PATCH 015/119] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in +Subject: [PATCH 017/124] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in P212 dtsi Cosmetic-only change to alpha-sort the pwm_ef node. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch index fcd4482aca..57237e6708 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch @@ -1,7 +1,7 @@ -From 687aa721901391c0d26b6f11b164963881cccde0 Mon Sep 17 00:00:00 2001 +From c1114a0f97a5a44bc25e972c37644792cc74953f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:58:58 +0000 -Subject: [PATCH 016/119] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes +Subject: [PATCH 018/124] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch index 6fbb2ada58..6eae91ae46 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch @@ -1,7 +1,7 @@ -From 5b1f67e6014292c83505302f67d7f0d1ebd8a93f Mon Sep 17 00:00:00 2001 +From bc7ca33a87ab8569cbc54a08fea7fa059be48fe7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 04:30:44 +0000 -Subject: [PATCH 017/119] FROMGIT(6.3): arm64: dts: meson: add audio playback +Subject: [PATCH 019/124] FROMGIT(6.3): arm64: dts: meson: add audio playback to S905X-P212 dts Add support for the HDMI and Analogue i2s audio outputs. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch index 34bb62d480..8702d51273 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch @@ -1,7 +1,7 @@ -From 2650a26be4c5432a8263096f2a89a5d10d270154 Mon Sep 17 00:00:00 2001 +From 37040153930ec646ca47f954b9e3c85ef7597843 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:03:14 +0000 -Subject: [PATCH 018/119] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add +Subject: [PATCH 020/124] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add missing NNA reset Doesn't appear in the TRM I have, but it is used by the downstream diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch index 5a1daa1fc6..301f2e588b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 3d021e127ccda3f91708b37f14ad3ea1da299d1e Mon Sep 17 00:00:00 2001 +From 397a8f83bff92b2797585433274ac2ea176f7e75 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:02 +0000 -Subject: [PATCH 019/119] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power +Subject: [PATCH 021/124] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power domain Add define for the NNA power domain for the NPU in the G12A. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch index 73eb4319c3..dca0f5ea87 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 0e9313ae8e525d1d811e35a778fc17cf590661f7 Mon Sep 17 00:00:00 2001 +From 21a3fd2803e4fd17ce9bd98aba0c4504a9e29dd1 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:51 +0000 -Subject: [PATCH 020/119] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power +Subject: [PATCH 022/124] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power domain for A311D Based on power initialization sequence in downstream driver. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch index f1b9875280..132b2f18fc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch @@ -1,7 +1,7 @@ -From fe1c33c1c209927e3cf08485eba3498275dccc32 Mon Sep 17 00:00:00 2001 +From af35fb5c2bfc4b722a4e2268a217099e7a664f64 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:05:46 +0000 -Subject: [PATCH 021/119] FROMGIT(6.3): arm64: dts: Add DT node for the +Subject: [PATCH 023/124] FROMGIT(6.3): arm64: dts: Add DT node for the VIPNano-QI on the A311D This "NPU" is very similar to the Vivante GPUs and Etnaviv works well diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch index c32a7ac33d..c04934090c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch @@ -1,7 +1,7 @@ -From 88b256191bb62756826193b5b8cce03f046bd946 Mon Sep 17 00:00:00 2001 +From f033edaa3332d18828e348d75f21ef806336e663 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:01:47 +0000 -Subject: [PATCH 022/119] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip +Subject: [PATCH 024/124] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip feature struct We will use these for differentiating between GPUs and NPUs, as the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch index 556d3fe37f..92509c19c4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch @@ -1,7 +1,7 @@ -From 6bc70bd7f8321a13dab880378d239c813a6c74c1 Mon Sep 17 00:00:00 2001 +From b259ac5ee71948b18626f8c098c19f25e8b9f106 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:02:31 +0000 -Subject: [PATCH 023/119] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs +Subject: [PATCH 025/124] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs Userspace is still not making full use of the hardware, so we don't know yet if changes to the UAPI won't be needed. Warn about it. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch index 479a05c455..c031ef85e0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch @@ -1,7 +1,7 @@ -From 726e813f6501345007ebca68891fd137945b8a88 Mon Sep 17 00:00:00 2001 +From 18745ede1bba607053170d114500a05410897acd Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:03:16 +0000 -Subject: [PATCH 024/119] FROMGIT(6.3): drm/etnaviv: add HWDB entry for +Subject: [PATCH 026/124] FROMGIT(6.3): drm/etnaviv: add HWDB entry for VIPNano-QI.7120.0055 This is a compute-only module marketed towards AI and vision diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch index 5286242275..e064db5905 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch @@ -1,7 +1,7 @@ -From b314d9f65e9d729c33229230c61a6d7ca05d67ab Mon Sep 17 00:00:00 2001 +From 21bf955b7c8c397c28eb24b6ab3fccc7f11d0492 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:04:00 +0000 -Subject: [PATCH 025/119] FROMGIT(6.3): arm64: dts: Fix NPU power domain +Subject: [PATCH 027/124] FROMGIT(6.3): arm64: dts: Fix NPU power domain references in Amlogic G12-based SoCs The power sequence is different between SoCs in that family, so get the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch index 9f181383d1..00cac03df9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch @@ -1,7 +1,7 @@ -From feb3f7acd48af99a6a3cc3e247f1ee39dd8c0727 Mon Sep 17 00:00:00 2001 +From dea931026d73bc6d8af46ec56a9694213a2aab61 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:41:46 +0000 -Subject: [PATCH 026/119] FROMGIT(6.3): clk: meson: mpll: Switch from +Subject: [PATCH 028/124] FROMGIT(6.3): clk: meson: mpll: Switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch index af27f4ff86..f4633a0937 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch @@ -1,7 +1,7 @@ -From d446faa2fd433dcdddf9bb3c6903fb41f21cc7de Mon Sep 17 00:00:00 2001 +From d974f9603f560a46024fe8ff88a066d6f8794980 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:42:41 +0000 -Subject: [PATCH 027/119] FROMGIT(6.3): clk: meson: dualdiv: switch from +Subject: [PATCH 029/124] FROMGIT(6.3): clk: meson: dualdiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch index 425850cd96..bde960d396 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch @@ -1,7 +1,7 @@ -From b25c8b76c5c500741e1bae5be92f40af8302646f Mon Sep 17 00:00:00 2001 +From 3f16df9ced198c479d359fd65846bbea179a38af Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:43:33 +0000 -Subject: [PATCH 028/119] FROMGIT(6.3): clk: meson: sclk-div: switch from +Subject: [PATCH 030/124] FROMGIT(6.3): clk: meson: sclk-div: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch index ddf522e1d2..4a37922892 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch @@ -1,7 +1,7 @@ -From b3173d4cbebb7494013b2471869f61aa7c50523b Mon Sep 17 00:00:00 2001 +From 98e5f6b3c291633477aa99bf82cb9614900e77e5 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:44:26 +0000 -Subject: [PATCH 029/119] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from +Subject: [PATCH 031/124] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch index 7ea47d5817..83c6cf2fc2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch @@ -1,7 +1,7 @@ -From 827db0a8686d83ae15ba6a60c219c9ca7a91a599 Mon Sep 17 00:00:00 2001 +From bb12a49637fd4e0a711d27a049ad07295e52aaa8 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Tue, 24 Jan 2023 12:39:08 +0100 -Subject: [PATCH 030/119] FROMGIT(6.3): arm64: dts: amlogic: +Subject: [PATCH 032/124] FROMGIT(6.3): arm64: dts: amlogic: meson-sm1-odroid-hc4: fix active fan thermal trip Add an active trip tied to the on-board fan cooling device, which is better diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch index 547976d0d7..784f90e11f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch @@ -1,7 +1,7 @@ -From 6a563c7bffe748e52a415383f4fb9d1fcbf1caaa Mon Sep 17 00:00:00 2001 +From 8427e08cb0e9aa76e4f4362004bc95b36e1eb5b2 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 27 Nov 2021 07:23:35 +0000 -Subject: [PATCH 031/119] FROMGIT(6.3): arm64: dts: meson: make dts use +Subject: [PATCH 033/124] FROMGIT(6.3): arm64: dts: meson: make dts use gpio-fan matrix instead of array No functional changes. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch index 2b84e435ce..dbddcf3ac5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch @@ -1,7 +1,7 @@ -From 24cdc899972f989681b564140e1ac677cd0dc12a Mon Sep 17 00:00:00 2001 +From d1fe2551af812a91518cd0334a26315b09c87724 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 26 Jan 2023 12:20:19 +0000 -Subject: [PATCH 032/119] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow +Subject: [PATCH 034/124] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow usb otg mode Setting dr_mode to "host" prevents otg which can be useful on a board diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch index 3a8e200faa..c31a140c20 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch @@ -1,7 +1,7 @@ -From d4acc14701de1429557af4e427e4e85131f12802 Mon Sep 17 00:00:00 2001 +From 4bda0546e6690a9f52773a94fa77b3b91d228cd8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 26 Jan 2023 16:15:59 +0000 -Subject: [PATCH 033/119] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch +Subject: [PATCH 035/124] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch VDDIO_C pin to OPEN_DRAIN For proper warm (re)boot from SD card the BPI-M5 board requires TFLASH_VDD_EN diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch deleted file mode 100644 index 739bd2f779..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 84ce435b0892826680ab99807b7e086c8b5569f5 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Wed, 25 Jan 2023 09:28:27 +0000 -Subject: [PATCH 035/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support - for BananaPi M2-Pro - -BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset. - -Signed-off-by: Christian Hewitt ---- - Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 9fda2436c618..d63f6b899f25 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -175,6 +175,7 @@ properties: - - enum: - - amediatech,x96-air - - amediatech,x96-air-gbit -+ - bananapi,bpi-m2-pro - - bananapi,bpi-m5 - - cyx,a95xf3-air - - cyx,a95xf3-air-gbit --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch index 0f10888bfd..811fa2e2f5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch @@ -1,7 +1,7 @@ -From fe8bd6ed716a8dee218e13d39eec3bf6df05f055 Mon Sep 17 00:00:00 2001 +From 4790c0f01fa63b6883c0a76e82d3b1edd11bfcd6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:10:48 +0000 -Subject: [PATCH 034/119] FROMGIT(6.3): arm64: dts: meson: +Subject: [PATCH 036/124] FROMGIT(6.3): arm64: dts: meson: meson-sm1-bananapi-m5: convert to dtsi Convert the BPI-M5 dts into meson-sm1-bananapi.dtsi to support the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch index bcff764519..1cf71b5af3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -1,30 +1,28 @@ -From 7fa5cf2ed6c65f2071fcf92d5e1ede56322154f6 Mon Sep 17 00:00:00 2001 +From 4b448f98adc272243d49334e06a916b9cb712709 Mon Sep 17 00:00:00 2001 From: Christian Hewitt -Date: Wed, 16 Feb 2022 07:27:07 +0000 -Subject: [PATCH 037/119] FROMGIT(6.3): dt-bindings: arm: amlogic: add support - for Radxa Zero2 +Date: Wed, 25 Jan 2023 09:28:27 +0000 +Subject: [PATCH 037/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support + for BananaPi M2-Pro -The Radxa Zero2 is a small form-factor SBC using the Amlogic -A311D chip. +BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset. Signed-off-by: Christian Hewitt -Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index d63f6b899f25..7ded40b309a4 100644 +index 9fda2436c618..d63f6b899f25 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -154,6 +154,7 @@ properties: - items: +@@ -175,6 +175,7 @@ properties: - enum: - - khadas,vim3 -+ - radxa,zero2 - - const: amlogic,a311d - - const: amlogic,g12b - + - amediatech,x96-air + - amediatech,x96-air-gbit ++ - bananapi,bpi-m2-pro + - bananapi,bpi-m5 + - cyx,a95xf3-air + - cyx,a95xf3-air-gbit -- 2.34.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch index 854dd547a7..84cd96e9c2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch @@ -1,7 +1,7 @@ -From 8a627052d2914e54417e93d22900d3546d116e3a Mon Sep 17 00:00:00 2001 +From 2946da11893f378e8e3091c342faf7efe64428d6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:13:28 +0000 -Subject: [PATCH 036/119] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 038/124] FROMGIT(6.3): arm64: dts: meson: add support for BananaPi M2-Pro BPI-M2-PRO is based upon the BPI-M5 design except for a different diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch new file mode 100644 index 0000000000..9bee12e5b3 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -0,0 +1,30 @@ +From b9575451cb033823080415404a23397eb376f030 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Wed, 16 Feb 2022 07:27:07 +0000 +Subject: [PATCH 039/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support + for Radxa Zero2 + +The Radxa Zero2 is a small form-factor SBC using the Amlogic +A311D chip. + +Signed-off-by: Christian Hewitt +Acked-by: Krzysztof Kozlowski +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index d63f6b899f25..7ded40b309a4 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -154,6 +154,7 @@ properties: + items: + - enum: + - khadas,vim3 ++ - radxa,zero2 + - const: amlogic,a311d + - const: amlogic,g12b + +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch index 13aa301c17..3847215820 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch @@ -1,7 +1,7 @@ -From 158ba8f7ed4d4e6e774df5a400bdc63c70db384e Mon Sep 17 00:00:00 2001 +From 230c630b8ba5ff3f4a1a1e27f13ea78b1e0f589f Mon Sep 17 00:00:00 2001 From: Yuntian Zhang Date: Fri, 14 Jan 2022 15:50:02 +0000 -Subject: [PATCH 038/119] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 040/124] FROMGIT(6.3): arm64: dts: meson: add support for Radxa Zero2 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch index 4753aa2dfa..eeb8d640c0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch @@ -1,7 +1,7 @@ -From 29d379e87a02cecbe4213618c2a66d1a03768d02 Mon Sep 17 00:00:00 2001 +From da6bd559e6d8c65a385eb15a1818825820e3a5e2 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:15 +0100 -Subject: [PATCH 039/119] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio +Subject: [PATCH 041/124] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio multiplexer Add documentation for the MDIO bus multiplexer found on the Amlogic GXL diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch index 1f235647b4..2631fcbb97 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch @@ -1,7 +1,7 @@ -From 3fa339d30ff897466809b54738aef7b0884f1b54 Mon Sep 17 00:00:00 2001 +From e7783502af6a0585bb0d46cefd4d2afcd3f0b3ba Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:16 +0100 -Subject: [PATCH 040/119] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux +Subject: [PATCH 042/124] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux support Add support for the mdio mux and internal phy glue of the GXL SoC diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch index 6c1fd29a50..a1fec839a9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch @@ -1,7 +1,7 @@ -From 90b6d6340680523ec3b0390d182f058fe4cfd272 Mon Sep 17 00:00:00 2001 +From e0c54c7d8dae134cb4f306edafbbaf83a639c295 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 12 Feb 2023 22:43:32 +0100 -Subject: [PATCH 041/119] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd +Subject: [PATCH 043/124] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd MMC core only checks whether return value of .get_cd() equals zero. Therefore -ENOSYS and 1 are effectively the same and the function diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch index a19f5a050f..db1fd39512 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch @@ -1,7 +1,7 @@ -From c0fa86921daa596b83cd24ca6ee9d832d3f62f55 Mon Sep 17 00:00:00 2001 +From ca39f3e579c6e65e74c309b96f8363f5c5efb97d Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Thu, 15 Jul 2021 14:32:33 -0400 -Subject: [PATCH 050/119] FROMLIST(v1): media: meson: vdec: remove redundant if +Subject: [PATCH 044/124] FROMGIT(6.4): media: meson: vdec: remove redundant if statement Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch index fe57dbe615..4bae48c472 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch @@ -1,7 +1,7 @@ -From a504e22a654a64c4920b96446f74c5d007140329 Mon Sep 17 00:00:00 2001 +From 57745077b1446f15f12c0e4a3d9839f83de97860 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Feb 2023 08:53:39 +0000 -Subject: [PATCH 054/119] FROMLIST(v2): dt-bindings: media: rc: add rc-dreambox +Subject: [PATCH 045/124] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox binding Add a binding for the rc-dreambox remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch index ad134a3602..c456bdbc5a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch @@ -1,7 +1,7 @@ -From d978b4f1de65c75d27f09e370054946b600eb091 Mon Sep 17 00:00:00 2001 +From 4af5a66da2b8d8237642c589992321bec5818f17 Mon Sep 17 00:00:00 2001 From: Emanuel Strobel Date: Mon, 5 Apr 2021 17:57:57 +0000 -Subject: [PATCH 055/119] FROMLIST(v2): media: rc: add common keymap for +Subject: [PATCH 046/124] FROMGIT(6.4): media: rc: add common keymap for Dreambox RC10/RC0 and RC20/RC-BT remotes Add a common keymap for the RC10/RC0 and RC20/RC-BT remotes used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch index b6abab4e97..2168a5a59b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch @@ -1,7 +1,7 @@ -From 89bf0cf980d400a58d5fb12f0cb23af6c00e0415 Mon Sep 17 00:00:00 2001 +From fc398d991d1e5cf43901adcf21b75f9ee9bafafe Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Feb 2023 06:42:20 +0000 -Subject: [PATCH 056/119] FROMLIST(v2): dt-bindings: media: rc: add +Subject: [PATCH 047/124] FROMGIT(6.4): dt-bindings: media: rc: add rc-beelink-mxiii Add a binding for the rc-beelink-mxiii remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch index c887828deb..1477063650 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch @@ -1,7 +1,7 @@ -From 39794f188cf5778a6b84517d95c50e830d9d89ba Mon Sep 17 00:00:00 2001 +From ce9f721bd1c6e1194709364701f15e6ab4ae0834 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:33:47 +0000 -Subject: [PATCH 057/119] FROMLIST(v2): media: rc: add Beelink Mini MXIII +Subject: [PATCH 048/124] FROMGIT(6.4): media: rc: add Beelink Mini MXIII keymap Add a keymap for the simple IR (NEC) remote used with the Beelink diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch index 68348724b4..ee8c6f5ecb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch @@ -1,7 +1,7 @@ -From 5ecde6b3e72b51715d366c5f2a63b4161aab4ac8 Mon Sep 17 00:00:00 2001 +From 349e97058c6823553bd7ad5f7f60355b3c0c05f5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:16:12 +0000 -Subject: [PATCH 059/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: sort +Subject: [PATCH 049/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Alpha-sort the nodes, move the default line in the LED node to where it's diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch index d8fbda54a8..1fa5543625 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch @@ -1,7 +1,7 @@ -From 8e6a3584cedb7b625d698b08781ab96f7f515a9d Mon Sep 17 00:00:00 2001 +From 773768b2f3823d574569e8f607eaa4005ced8bf5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:21:08 +0000 -Subject: [PATCH 060/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: +Subject: [PATCH 050/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Add missing content to the bluetooth node to align it with the content diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch index ed55affc7c..37fac9dba9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch @@ -1,7 +1,7 @@ -From 26e09e684c37965401d31cacdc5f03912b84121b Mon Sep 17 00:00:00 2001 +From 51a4ffc98695b4e6e491678269e58f32d2311f30 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:29:00 +0000 -Subject: [PATCH 061/119] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: add +Subject: [PATCH 051/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add initial audio support Add initial support for HDMI and S/PDIF audio output. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch new file mode 100644 index 0000000000..046b89eae7 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch @@ -0,0 +1,39 @@ +From b72738ccb1d004c6430cc8a90a0ecfa834c28056 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Fri, 3 Mar 2023 18:37:57 +0100 +Subject: [PATCH 052/124] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the + boards with the BPI-CM4 connected + +The BPI-CM4 module with an Amlogic A311D SoC is a module compatible +with the Raspberry Pi CM4 specifications. + +Document the boards using this module, by specifying the BananaPi CM4 +compatible in addition to the baseboard compatible. + +Signed-off-by: Neil Armstrong +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index 7ded40b309a4..94f68e7c85ed 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -158,6 +158,14 @@ properties: + - const: amlogic,a311d + - const: amlogic,g12b + ++ - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC ++ items: ++ - enum: ++ - bananapi,bpi-cm4io ++ - const: bananapi,bpi-cm4 ++ - const: amlogic,a311d ++ - const: amlogic,g12b ++ + - description: Boards with the Amlogic Meson G12B S922X SoC + items: + - enum: +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch new file mode 100644 index 0000000000..62819899a6 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch @@ -0,0 +1,610 @@ +From 3fed5b6e5327443a8aaccb08e720ee4209726352 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Sat, 4 Mar 2023 07:14:17 +0000 +Subject: [PATCH 053/124] FROMGIT(6.4): arm64: dts: amlogic: Add initial + support for BPI-CM4 module with BPI-CM4IO baseboard + +Add support for both the BananaPi BPI-CM4 module and the BananaPi +baseboard which is comnpatible with the RaspberryPi CM4IO baseboard. + +The BananaPi BPI-CM4 module follows the CM4 specifications at [1], +but with a single HDMI port and a since DSI output. + +The current CM4IO baseboard DT should work fine on the Raspberry CM4 +baseboard and other derivatives baseboards, but proper DT should +be written for other baseboards. + +The split is done so it's easy to describe a new CM4 baseboard, enabling +only the necessary HW used on the baseboard. + +[1] https://datasheets.raspberrypi.com/cm4io/cm4io-datasheet.pdf + +Signed-off-by: Neil Armstrong +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++ + .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 ++++++++++++++++++ + 3 files changed, 554 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi + +diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile +index 5d5ec22a469e..f5845e565efb 100644 +--- a/arch/arm64/boot/dts/amlogic/Makefile ++++ b/arch/arm64/boot/dts/amlogic/Makefile +@@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +new file mode 100644 +index 000000000000..1b0c3881c6a1 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts +@@ -0,0 +1,165 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-bananapi-cm4.dtsi" ++#include ++#include ++#include ++ ++/ { ++ compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi BPI-CM4IO Baseboard with BPI-CM4 Module"; ++ ++ aliases { ++ ethernet0 = ðmac; ++ i2c0 = &i2c1; ++ i2c1 = &i2c3; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1710000>; ++ ++ button-function { ++ label = "Function"; ++ linux,code = ; ++ press-threshold-microvolt = <10000>; ++ }; ++ }; ++ ++ hdmi_connector: hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-CM4IO"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-4 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&cecb_AO { ++ status = "okay"; ++}; ++ ++ðmac { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++/* CSI port */ ++&i2c1 { ++ status = "okay"; ++}; ++ ++/* DSI port for touchscreen */ ++&i2c3 { ++ status = "okay"; ++}; ++ ++/* miniPCIe port with USB + SIM slot */ ++&pcie { ++ status = "okay"; ++}; ++ ++&sd_emmc_b { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++/* Peripheral Only USB-C port */ ++&usb { ++ dr_mode = "peripheral"; ++ ++ status = "okay"; ++}; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +new file mode 100644 +index 000000000000..dc0988c82694 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +@@ -0,0 +1,388 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Neil Armstrong ++ */ ++ ++#include "meson-g12b-a311d.dtsi" ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ rtc1 = &vrtc; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOAO_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ dc_in: regulator-dc-in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vddio_c: regulator-vddio-c { ++ compatible = "regulator-gpio"; ++ regulator-name = "VDDIO_C"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3300000>; ++ ++ enable-gpio = <&gpio_ao GPIOAO_3 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ ++ gpios = <&gpio_ao GPIOAO_9 GPIO_OPEN_DRAIN>; ++ gpios-states = <1>; ++ ++ states = <1800000 0>, ++ <3300000 1>; ++ }; ++ ++ vddao_1v8: regulator-vddao-1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_3v3: regulator-vddao-3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ /* ++ * MP8756GD DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_ab 0 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vddcpu_b: regulator-vddcpu-b { ++ /* ++ * SY8120B1ABC DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <680000>; ++ regulator-max-microvolt = <1040000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu_b>; ++ operating-points-v2 = <&cpu_opp_table_0>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu100 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu101 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu102 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu103 { ++ cpu-supply = <&vddcpu_a>; ++ operating-points-v2 = <&cpub_opp_table_1>; ++ clocks = <&clkc CLKID_CPUB_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++/* Ethernet to be enabled in baseboard DT */ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++/* HDMI to be enabled in baseboard DT */ ++&hdmi_tx { ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&dc_in>; ++}; ++ ++/* "Camera" I2C bus */ ++&i2c1 { ++ pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* Main I2C bus */ ++&i2c2 { ++ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* "ID" I2C bus */ ++&i2c3 { ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pcie { ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++ ++ status = "okay"; ++}; ++ ++&pwm_ef { ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ ++ status = "okay"; ++}; ++ ++&saradc { ++ vref-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++/* on-module SDIO WiFi */ ++&sd_emmc_a { ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_3v3>; ++ ++ status = "okay"; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card to be enabled in baseboard DT */ ++&sd_emmc_b { ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* on-module eMMC */ ++&sd_emmc_c { ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++/* on-module UART BT */ ++&uart_A { ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; ++ ++&uart_AO { ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++ ++ status = "okay"; ++}; ++ ++&usb { ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch index d707628951..209ee840e0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch @@ -1,7 +1,7 @@ -From ec6df411382a6b218aed3dc3f3247c88d6f533da Mon Sep 17 00:00:00 2001 +From cb3f73c01b56bc2762dfdfcf25c3a85c2dd6cdec Mon Sep 17 00:00:00 2001 From: Sergey Shtylyov Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 042/119] FROMLIST(v1): mmc: meson-gx: fix deferred probing +Subject: [PATCH 054/124] FROMLIST(v1): mmc: meson-gx: fix deferred probing The driver overrides the error codes and IRQ0 returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index 4254f9ceb6..b0a37b7007 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From 76869c873dc2fc0bb999a7f078a981b3cca8d79b Mon Sep 17 00:00:00 2001 +From b937c4545b48fc4b9685c631c8c34ff96ddb6ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Feb 2022 08:23:12 +0000 -Subject: [PATCH 043/119] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 055/124] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan Micro Electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index b244aa4f4e..75be9da338 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From ea68b39d92eb6daeae900078a8d5fb884aa2aedb Mon Sep 17 00:00:00 2001 +From b3469395f4da7a3fd81780a2bc20dc9752323a65 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 044/119] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan +Subject: [PATCH 056/124] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro Electronics TM1628 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 18a21689c2..00a66829bc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 9b520e8a8d6edbd7da36baed8a221f4abe110633 Mon Sep 17 00:00:00 2001 +From 567668ede141f733821710c8a640aa42b496939d Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 045/119] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 057/124] FROMLIST(v5): docs: ABI: document tm1628 attribute display-text Document the attribute for reading / writing the text to be displayed on diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index 9de21f49c1..acb8dc4af1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 1f2f8f35ca011bbc72ef1292b1927aa002a34811 Mon Sep 17 00:00:00 2001 +From 2cb43fe6c04b9e0b5fea923f6fc3872b21a0755c Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 046/119] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 058/124] FROMLIST(v5): auxdisplay: add support for Titanmec TM1628 7 segment display controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index b838f677b6..f854ab5a5e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From a8d66974c12c82d16e132e6bdbaf8bd309e2e8e0 Mon Sep 17 00:00:00 2001 +From d5b29dd52f3de3d8b97c51d4442a1619372fce18 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 047/119] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: +Subject: [PATCH 059/124] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add support for the 7 segment display This patch adds support for the 7 segment display of the device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index d41ab379bf..679738f937 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From 61450e18700a00f6fbf4194f2afa3238687c8044 Mon Sep 17 00:00:00 2001 +From 58501d9aad75798a85e434547b7949287ede7506 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 048/119] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 060/124] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index 1fbe5b5f8c..60d159b378 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 24048a5997adb905190d42eb60c3b73118d860b1 Mon Sep 17 00:00:00 2001 +From 6d32b35e79596ed1350d739f37bfeec056f592bc Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 049/119] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 061/124] FROMLIST(v1): ASoC: hdmi-codec: reorder channel allocation list Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index c73b811bcb..8dfaeff470 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From 93eacecf63e1c2f0fe5abcaed4a78c2bebd24560 Mon Sep 17 00:00:00 2001 +From 45918db1c9f75ddf16fe9cfc29cb7abd5d140f6c Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 051/119] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 062/124] FROMLIST(v1): media: meson: vdec: esparser: check parsing state with hardware write pointer Also check the hardware write pointer to check if ES Parser has stalled. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index 46401fd8bb..009d1b1448 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From 7c7cfd0c00e1037fc0226393ee509169893756f0 Mon Sep 17 00:00:00 2001 +From 216f4500ccf36f6a74e0b3ffd378ee557ed9dbdc Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 052/119] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 063/124] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index 304c3b6e06..d6a84eecf9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 5033662952d289300d6ee76c17913abe3e5de47e Mon Sep 17 00:00:00 2001 +From 0799916720ff59f4cb5132453a17748b8d1e81a4 Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 053/119] FROMLIST(v2): media: meson: vdec: add HEVC decode +Subject: [PATCH 064/124] FROMLIST(v2): media: meson: vdec: add HEVC decode codec Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch index 4434345693..ac5e2df4bd 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch @@ -1,7 +1,7 @@ -From 4df952eb87fb849535fa3ce7b9b8c86e9c3d7e1a Mon Sep 17 00:00:00 2001 +From 3167ffdc14544e74a82566d3bc0f1e39c0d3a8d6 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:41:53 +0100 -Subject: [PATCH 062/119] FROMLIST(v2): dt-bindings: serial: +Subject: [PATCH 065/124] FROMLIST(v2): dt-bindings: serial: amlogic,meson-uart: Add compatible string for G12A Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch index 5d629e989f..531be2ad3c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch @@ -1,7 +1,7 @@ -From a795fe52d97a8792a94d8c1109f68984c89ed527 Mon Sep 17 00:00:00 2001 +From ae9f3f449af22ca1806b8ca65b622d2f91b611a4 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:44:16 +0100 -Subject: [PATCH 063/119] FROMLIST(v2): tty: serial: meson: Add a new +Subject: [PATCH 066/124] FROMLIST(v2): tty: serial: meson: Add a new compatible string for the G12A SoC Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch index 9b5e43ada0..c5c5b1ceea 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch @@ -1,7 +1,7 @@ -From 0e9c49a97b49745c4de3ec41bd9f3eaf6755d71a Mon Sep 17 00:00:00 2001 +From 36552905b53f40bd89e007fa714b7d52f05b5d87 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:47:16 +0100 -Subject: [PATCH 064/119] FROMLIST(v2): arm64: dts: meson-g12-common: Use the +Subject: [PATCH 067/124] FROMLIST(v2): arm64: dts: meson-g12-common: Use the G12A UART compatible string Switch meson-12-common.dtsi to use the Meson G12A specific UART diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch index 9afb11be22..8f467d3b4f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch @@ -1,7 +1,7 @@ -From f589d7cc58e31e96f58b80e516945e5f701b62a1 Mon Sep 17 00:00:00 2001 +From 69724ec6d9aa2c6eed4c19b2432fe4e3cea1517f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 065/119] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 068/124] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index 95d3de2bd5..0e1c5eeaad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From 76d5200e280b14a0f50556b7b50371c13455dddc Mon Sep 17 00:00:00 2001 +From 49a02986cb8ae08090e576d0d78f9a71b89c2e27 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 066/119] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 069/124] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to 100MHz Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index c866bac829..f3f84cc7a5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From f1eb8cf980881ab603ec1fd257e5801d3b412032 Mon Sep 17 00:00:00 2001 +From 814b6de6186193cccf6517e0a243fd64a549851d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 067/119] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 070/124] WIP: arm64: dts: meson: add UHS SDIO capabilities to p212/p23x/q20x Add UHS capabilities to the SDIO node to enable 100MHz speeds. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index 2fb631850a..0a89a7bf0b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From bebad1696209039640521ca5649548d106d32eeb Mon Sep 17 00:00:00 2001 +From 58eb5ad2cea635f2941ead75106654455f81951a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 068/119] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 071/124] WIP: arm64: dts: meson: remove SDIO node from Khadas VIM1 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch index 81a2eac702..bec523a3f4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch @@ -1,7 +1,7 @@ -From 855a21c63c2b82230248a9bab6ba2865518a7bd5 Mon Sep 17 00:00:00 2001 +From bdb0515c10ba11b7e010681820bb2916be9b43f9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 069/119] WIP: arm64: dts: meson: add audio playback to p201 +Subject: [PATCH 072/124] WIP: arm64: dts: meson: add audio playback to p201 Add initial audio support limited to HDMI i2s. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch index 4e85de3848..5e7d53a18e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch @@ -1,7 +1,7 @@ -From c6e8181b98c57349768ad232ee3557ce9b606c06 Mon Sep 17 00:00:00 2001 +From 1b834e16307438e9a29efc9ad046f12d8972a055 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 070/119] WIP: arm64: dts: meson: add audio playback to p200 +Subject: [PATCH 073/124] WIP: arm64: dts: meson: add audio playback to p200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch index fc076d059c..f3489ba880 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch @@ -1,7 +1,7 @@ -From fff41879355aba35bc6c674ca32a4f90408e7f98 Mon Sep 17 00:00:00 2001 +From 85116c417b26bdb50e3faa278b7939c0e4f4e81e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 071/119] WIP: arm64: dts: meson: add audio playback to u200 +Subject: [PATCH 074/124] WIP: arm64: dts: meson: add audio playback to u200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch index 47805f64ac..444a8a5bde 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch @@ -1,7 +1,7 @@ -From 6e49e1d60237acf467191c490b5fecb8536f7536 Mon Sep 17 00:00:00 2001 +From 7a41e52459e177ecd1e728c84d321fd46549b82c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Nov 2021 13:50:06 +0000 -Subject: [PATCH 072/119] WIP: arm64: dts: meson: add Headphone output to +Subject: [PATCH 075/124] WIP: arm64: dts: meson: add Headphone output to Beelink GT-King Add support for the Headphone audio DAC built-in to the S922X chip. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch index 54431d96c3..3ae894bd2a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch @@ -1,7 +1,7 @@ -From 959c3000813126592068fc508428b3dd8a2f7445 Mon Sep 17 00:00:00 2001 +From fb48811743b3c70e5fa8fdbfb709c1116a06b219 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 29 Feb 2020 15:13:02 +0000 -Subject: [PATCH 073/119] WIP: dt-bindings: arm: amlogic: add support for the +Subject: [PATCH 076/124] WIP: dt-bindings: arm: amlogic: add support for the Tanix TX5 Max The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 7ded40b309a4..940fda576809 100644 +index 94f68e7c85ed..845a5eb56ff3 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -146,6 +146,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch index 3016540fdd..c542373ea4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch @@ -1,7 +1,7 @@ -From 616ee1bf2dd2072b2a52f04917f32e2ad4b75d66 Mon Sep 17 00:00:00 2001 +From 191edeaf7c267716ebc1f4ed802135e8170fa2ad Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 20 Oct 2019 04:06:59 +0000 -Subject: [PATCH 074/119] WIP: arm64: dts: meson: add support for the Tanix TX5 +Subject: [PATCH 077/124] WIP: arm64: dts: meson: add support for the Tanix TX5 Max The Tanix TX5 Max is based on the Amlogic U200 reference design @@ -26,7 +26,7 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-tanix-tx5max.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 5d5ec22a469e..a69bd3a4769f 100644 +index f5845e565efb..5897fd0f594b 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -6,6 +6,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch index ebcc7fcc33..d7d866b47e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch @@ -1,7 +1,7 @@ -From 986b38291ffc617c93f8fa37cb88cc7ccdc91957 Mon Sep 17 00:00:00 2001 +From 2a0bbdd4019af1fb6c3326ec024fe5867e0e54f0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 21 Oct 2019 03:58:06 +0000 -Subject: [PATCH 075/119] WIP: arm64: dts: meson: add multiple MeCool device +Subject: [PATCH 078/124] WIP: arm64: dts: meson: add multiple MeCool device trees This adds initial device trees for a range of MeCool devices based on various @@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-mecool-m8s-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index a69bd3a4769f..791c6ff9f121 100644 +index 5897fd0f594b..be7cc188706a 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -19,6 +19,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb +@@ -20,6 +20,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb @@ -37,7 +37,7 @@ index a69bd3a4769f..791c6ff9f121 100644 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb -@@ -32,12 +34,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb +@@ -33,12 +35,21 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-libretech-pc.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch index 08c3d02cf9..44f78e908c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch @@ -1,7 +1,7 @@ -From cb6409dbc874089f3e7a75013f999ec02f9f5be5 Mon Sep 17 00:00:00 2001 +From 84cac7ac9589cef2c3c3190a4013870fde942923 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:50:13 +0000 -Subject: [PATCH 076/119] WIP: dt-bindings: arm: amlogic: add support for Minix +Subject: [PATCH 079/124] WIP: dt-bindings: arm: amlogic: add support for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 940fda576809..dfdf6c42ea47 100644 +index 845a5eb56ff3..657af6e662ea 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -58,6 +58,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch index 6d7d1d5df2..3b039d33f8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch @@ -1,7 +1,7 @@ -From cc383de661125823c2bea1f074e897dc648d314a Mon Sep 17 00:00:00 2001 +From 380f3ccdb8e979426723e8f44970c17cba846440 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:52:14 +0000 -Subject: [PATCH 077/119] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 080/124] WIP: arm64: dts: meson: add initial device-tree for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) @@ -30,10 +30,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-minix-neo-u1.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 791c6ff9f121..f5f17f2f0fc2 100644 +index be7cc188706a..c310be848a62 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb +@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-ki-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-mecool-kii-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 564b6d9530..6fd04aa5fb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From 50050fbec8c02222eeb219ec3495caff13560297 Mon Sep 17 00:00:00 2001 +From f27efc1faf0aeec4b1cbd39a707170a363ac019b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 19 Aug 2022 21:32:21 +0000 -Subject: [PATCH 078/119] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 081/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO-U1 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch index e1a8f12952..077829403f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch @@ -1,7 +1,7 @@ -From 54ce89d3f4d99631678c0a0819a9ce6b212dfba3 Mon Sep 17 00:00:00 2001 +From a9ba332ddc1e257b23ae9f10782c61acba1e9020 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:28:50 +0000 -Subject: [PATCH 079/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 082/124] WIP: dt-bindings: arm: amlogic: add support for Beelink Mini MXIII The Beelink Mini MXIII is an Android STB based on the Amlogic P200 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index dfdf6c42ea47..70cb580f8b7e 100644 +index 657af6e662ea..a0ea076b7b4d 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -56,6 +56,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch index 177ec6e3af..b1d9c25321 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch @@ -1,7 +1,7 @@ -From d2ffa2383dec0ec5fd736258b910f68ae7e27a30 Mon Sep 17 00:00:00 2001 +From 1aa48da78d4ce958f87d6575b3b7754a8f17e9c5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:26:00 +0000 -Subject: [PATCH 080/119] WIP: arm64: dts: meson: add support for Beelink Mini +Subject: [PATCH 083/124] WIP: arm64: dts: meson: add support for Beelink Mini MXIII This is a GXBB board that ships in two variants, one with @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-beelink-mini-mxiii.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index f5f17f2f0fc2..b7d7cb46b70a 100644 +index c310be848a62..f27222c9d292 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb +@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-kii-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch index a94058ec75..f1146e5bd7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch @@ -1,7 +1,7 @@ -From 3099de0850d5d012648f6addbd236341b43bf842 Mon Sep 17 00:00:00 2001 +From e7e0505675278f27b97535ded162f2636b03c205 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:48:02 +0000 -Subject: [PATCH 081/119] WIP: media: rc: add keymap for MeCool M8S Pro W +Subject: [PATCH 084/124] WIP: media: rc: add keymap for MeCool M8S Pro W remote Add a keymap and bindings for the simple IR (NEC) remote used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch index 97f2ccbb3b..2428cc4262 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch @@ -1,7 +1,7 @@ -From 08d9f3f5a18a2b8ed87285ed50f298fff7634aa6 Mon Sep 17 00:00:00 2001 +From 9bdca7d4092cae3f006591f958eea92e73111179 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:15:36 +0000 -Subject: [PATCH 082/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 085/124] WIP: dt-bindings: arm: amlogic: add support for MeCool M8S Pro W The MeCool M8S Pro W is an Android STB based on the Amlogic P281 @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 70cb580f8b7e..f9d6a8f82d01 100644 +index a0ea076b7b4d..70706c8d5ed8 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -89,6 +89,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch deleted file mode 100644 index 48d0f74cfb..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-RTL8822CS-bluetooth-to-X96-A.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9447b13173e07289f13d43e48c63aa9ffe551a0d Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Tue, 12 Apr 2022 11:21:21 +0000 -Subject: [PATCH 086/119] WIP: arm64: dts: meson: add RTL8822CS bluetooth to - X96-Air - -Add the uart_A/bluetooth node for the RTL8822CS chip. - -Signed-off-by: Christian Hewitt ---- - .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -index 7e1a74046ba5..66e53c25bfb4 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts -@@ -131,3 +131,16 @@ &tdmout_b { - &tohdmitx { - status = "okay"; - }; -+ -+&uart_A { -+ status = "okay"; -+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; -+ pinctrl-names = "default"; -+ uart-has-rtscts; -+ -+ bluetooth { -+ compatible = "realtek,rtl8822cs-bt"; -+ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; -+ host-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; -+ }; -+}; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch index 88d95a00a1..255cb9da56 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch @@ -1,7 +1,7 @@ -From c8111a7e93aee04ee7d1c7c87ef5b552f043f309 Mon Sep 17 00:00:00 2001 +From 2a7053d28f65c8e6fdb092fa5505a5ad4cca3fde Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:17:41 +0000 -Subject: [PATCH 083/119] WIP: arm64: dts: meson: add support for MeCool M8S +Subject: [PATCH 086/124] WIP: arm64: dts: meson: add support for MeCool M8S Pro W MeCool M8S Pro W is an Android STB based on the Amlogic P281 (GXL) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch index 4af6b029de..0fc2036586 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch @@ -1,7 +1,7 @@ -From 04494107d4738b516d6a4302d9e7db7ae77e6d52 Mon Sep 17 00:00:00 2001 +From 98313629608297592ca31d832ec93c876a3143e9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 02:40:20 +0000 -Subject: [PATCH 084/119] WIP: dt-bindings: arm: amlogic: add Vero 4K binding +Subject: [PATCH 087/124] WIP: dt-bindings: arm: amlogic: add Vero 4K binding Add the board binding for the OSMC Vero 4K STB device @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index f9d6a8f82d01..abf58071d4fa 100644 +index 70706c8d5ed8..63a2093cb626 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -102,6 +102,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch index 58731d5487..823573eb3f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch @@ -1,7 +1,7 @@ -From 09a3ea93b7a533fbd8f5aabbeb78124958df968e Mon Sep 17 00:00:00 2001 +From 25c119d7883625bc0bbeded88ce312a9c4102273 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 04:06:17 +0000 -Subject: [PATCH 085/119] WIP: arm64: dts: meson: add support for OSMC Vero 4K +Subject: [PATCH 088/124] WIP: arm64: dts: meson: add support for OSMC Vero 4K The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference design with the following specifications: @@ -28,10 +28,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index b7d7cb46b70a..1680f7f6dbd6 100644 +index f27222c9d292..2c4c83cc0a04 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -51,6 +51,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch new file mode 100644 index 0000000000..9b732cf171 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch @@ -0,0 +1,62 @@ +From 2969de85cdf6695415496013b30d5340b5a9b91d Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 12 Apr 2022 11:21:21 +0000 +Subject: [PATCH 089/124] WIP: arm64: dts: meson: sm1-x96-air: add RTL8822CS + WiFi and Bluetooth support + +Add support for the RTL8822CS WiFi and BT module on the board. + +Signed-off-by: Christian Hewitt +--- + .../dts/amlogic/meson-sm1-x96-air-gbit.dts | 24 +++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +index 7e1a74046ba5..9217db5bdcea 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +@@ -13,6 +13,10 @@ / { + compatible = "amediatech,x96-air-gbit", "amlogic,sm1"; + model = "Shenzhen Amediatech Technology Co., Ltd X96 Air"; + ++ aliases { ++ serial2 = &uart_A; ++ }; ++ + sound { + compatible = "amlogic,axg-sound-card"; + model = "X96-AIR"; +@@ -120,6 +124,12 @@ &ir { + linux,rc-map-name = "rc-x96max"; + }; + ++&sd_emmc_a { ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ + &tdmif_b { + status = "okay"; + }; +@@ -131,3 +141,17 @@ &tdmout_b { + &tohdmitx { + status = "okay"; + }; ++ ++&uart_A { ++ status = "okay"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch index 94370c2989..9d0461dffa 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch @@ -1,7 +1,7 @@ -From ec3fd95f8147ceccc0da3647128f42caf5c7f8eb Mon Sep 17 00:00:00 2001 +From b0c6b8195241c1b5ae1cae8ba88722997c5f7bf8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 10 Apr 2022 11:51:38 +0000 -Subject: [PATCH 087/119] WIP: media: rc: add keymap for Venz V10 remote +Subject: [PATCH 090/124] WIP: media: rc: add keymap for Venz V10 remote Add a keymap and bindings for the IR (NEC) remote used with the Venz V10 Android STB device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch index 5294cc3e7e..125292023a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch @@ -1,7 +1,7 @@ -From 1d7ef8f872d93d1444ddc324830a7f0b895cc7f0 Mon Sep 17 00:00:00 2001 +From 878d4954456473d6f87606b48300b810762c7042 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:27:50 +0000 -Subject: [PATCH 088/119] WIP: dt-bindings: arm: amlogic: add S905L and Venz +Subject: [PATCH 091/124] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10 bindings Add SOC bindings for S905L devices and the board binding for Venz V10. @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index abf58071d4fa..fa02463f1e58 100644 +index 63a2093cb626..5ff3e7f43a51 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -83,6 +83,13 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch index 12ef714a7f..d2ea73a715 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch @@ -1,7 +1,7 @@ -From c4efd114a22c073b877b7659322774fffabe49a2 Mon Sep 17 00:00:00 2001 +From 2281bee85181532d637cd86e43e25ab35ebfecde Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:21:58 +0000 -Subject: [PATCH 089/119] WIP: arm64: dts: meson: add support for Venz V10 +Subject: [PATCH 092/124] WIP: arm64: dts: meson: add support for Venz V10 The Venz V10 is an Android STB based on the Amlogic P212 (GXL) reference design with an S905L chip and the following specs: @@ -25,10 +25,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905l-venz-v10.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 1680f7f6dbd6..fbeea2278187 100644 +index 2c4c83cc0a04..81e8195509b4 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb +@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-sml5442tw.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch index d4df484173..f9460b6597 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch @@ -1,7 +1,7 @@ -From a2dac2285a5381e7265efbe188c9ba4ba499dedf Mon Sep 17 00:00:00 2001 +From 2efd1b2f6307fd48c46cfce51509fe28734f894d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:15:41 +0000 -Subject: [PATCH 090/119] WIP: dt-bindings: vendor-prefixes: add tbee prefix +Subject: [PATCH 093/124] WIP: dt-bindings: vendor-prefixes: add tbee prefix QUIDBox, Lda. are the Portuguese manufacturer of 'TBee' branded Android Set-Top Box devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch index e83afab5d0..cb472899b6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch @@ -1,7 +1,7 @@ -From 94dde8907583a3ea8c9de74c6f8ca5be8d9b81df Mon Sep 17 00:00:00 2001 +From 1ca81121e141538fd7afab3bd192e19946148891 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:05:11 +0000 -Subject: [PATCH 091/119] WIP: dt-bindings: arm: amlogic: add TBee Box binding +Subject: [PATCH 094/124] WIP: dt-bindings: arm: amlogic: add TBee Box binding Add the board binding for the TBee Box. @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index fa02463f1e58..ba803d8d6eb2 100644 +index 5ff3e7f43a51..9e410dc8d0c5 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -110,6 +110,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch index 687af9a940..d2d85e04a5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch @@ -1,7 +1,7 @@ -From 56aaccf3ceb9988ae456dd2212e701acad5f3f68 Mon Sep 17 00:00:00 2001 +From fe987620ab0641d1d8b039a3233c5576ac1a65ca Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:23:12 +0000 -Subject: [PATCH 092/119] WIP: arm64: dts: meson: add support for TBee Box +Subject: [PATCH 095/124] WIP: arm64: dts: meson: add support for TBee Box The TBee Box is an Android STB based on the Amlogic P212 (GXL) reference design with an S905X chip and the following specs: @@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-tbee.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index fbeea2278187..281a72ca8918 100644 +index 81e8195509b4..48459c7f8f1e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb +@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch index 431d034537..ffeebb5cdb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch @@ -1,7 +1,7 @@ -From b794a923fd9340a46ad7f537e3926449975014fb Mon Sep 17 00:00:00 2001 +From b8976aabd9e76725ea8a29b215a42e7320837819 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 24 Jul 2022 08:50:28 +0000 -Subject: [PATCH 093/119] WIP: dt-bindings: arm: amlogic: add Beelink GT1 +Subject: [PATCH 096/124] WIP: dt-bindings: arm: amlogic: add Beelink GT1 binding Add the board binding for the Shenzen AZW (Beelink) GT1 Android @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index ba803d8d6eb2..5844cb31efab 100644 +index 9e410dc8d0c5..658702b68afe 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -132,6 +132,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch index cec57c12a0..f22df44ab5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ -From 80b5d49ebfd2ab56d74441e7a22ce252fd4b686f Mon Sep 17 00:00:00 2001 +From a0cb03cf21bb5654eb6937e7dff58621d8806bfc Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 10:01:03 +0000 -Subject: [PATCH 094/119] WIP: arm64: dts: meson: add support for Beelink GT1 +Subject: [PATCH 097/124] WIP: arm64: dts: meson: add support for Beelink GT1 The Beelink GT1 is based on the Amlogic S912 (Q200) reference design with the following specifications: @@ -26,10 +26,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 281a72ca8918..3fad85258de2 100644 +index 48459c7f8f1e..187c83c4c61e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -63,6 +63,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb +@@ -64,6 +64,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch index d4ddee2f47..bde6d2ffd6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch @@ -1,7 +1,7 @@ -From 312fbdaeaf73b1ebd300e550a3152a5713db2711 Mon Sep 17 00:00:00 2001 +From 8af283176bd32b91b81c317b65afbd47dc81a264 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 10:27:10 +0000 -Subject: [PATCH 095/119] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek +Subject: [PATCH 098/124] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek dtsi Add the vcc_5v regulator used by the audio DAC chip diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch index 54c6aab3c2..69cae97343 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch @@ -1,7 +1,7 @@ -From 64b085618158efcc560162027a6773b89fdacfdd Mon Sep 17 00:00:00 2001 +From ff2202cf381c97d5a4f94205f11ffbdcc464135d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 13:39:23 +0000 -Subject: [PATCH 096/119] WIP: arm64: dts: meson: add audio lineout to WeTek +Subject: [PATCH 099/124] WIP: arm64: dts: meson: add audio lineout to WeTek Play2 Add support for the ES7134LV headphone output on the WeTek Play2 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch index 09f69da405..c326070dc2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch @@ -1,7 +1,7 @@ -From a45aab44a99949e25796854294e41bf46b72dc7b Mon Sep 17 00:00:00 2001 +From 30b5be28577f5dbd13fa8cfef2db02c59fc9b1f1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 29 Jul 2022 08:29:20 +0000 -Subject: [PATCH 097/119] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek +Subject: [PATCH 100/124] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek Hub The original submission in commit d537d289de06 ("ARM64: dts: meson-gxbb: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch index 6f39ca75ee..c29dd5c2a3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch @@ -1,7 +1,7 @@ -From 563b593d2d94d5ede23ea0e70ed9987cb42f0d3b Mon Sep 17 00:00:00 2001 +From 736ef97e9ea4e09a69380e65f1f95484e6d38d19 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:21:16 +0000 -Subject: [PATCH 098/119] WIP: ASoC: dt-bindings: add compatible for es8323-i2c +Subject: [PATCH 101/124] WIP: ASoC: dt-bindings: add compatible for es8323-i2c Add a compatible for the everest,es8323 audio codec used with a number of Amlogic and Rockchip board devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch index 3a4f85e9c3..085747b1d4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch @@ -1,7 +1,7 @@ -From 480488c15b69618860e48b9c85905faa65e94360 Mon Sep 17 00:00:00 2001 +From be7b6b7be99be3c13c75553c04c9513d498ec520 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:29:32 +0000 -Subject: [PATCH 099/119] WIP: ASoC: codecs: add support for ES8323 +Subject: [PATCH 102/124] WIP: ASoC: codecs: add support for ES8323 The ES8323 is compatible with the existing ES8328 codec driver, so add compatibles allowing it to be used. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch index 100c685b9d..bf383c57da 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch @@ -1,7 +1,7 @@ -From 1368afbd892487bc554ef3e1480be404f393d28c Mon Sep 17 00:00:00 2001 +From 5489e9d75d64df5ceaf47459f91482bf161bfff7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:47:52 +0000 -Subject: [PATCH 100/119] WIP: dt-bindings: add dream vendor prefix +Subject: [PATCH 103/124] WIP: dt-bindings: add dream vendor prefix Add vendor prefix for Dream Property GmbH diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch index ebd86eeb19..1c63c68b88 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch @@ -1,7 +1,7 @@ -From 782af7674db11452db57dc9eb06da4b88b85b1e4 Mon Sep 17 00:00:00 2001 +From 3148a47be228f148c76b538daa4fcb44f77805ae Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:48:34 +0000 -Subject: [PATCH 101/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 104/124] WIP: dt-bindings: arm: amlogic: add support for Dreambox One/Two The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 5844cb31efab..b8b2899ad83b 100644 +index 658702b68afe..b7ade343feaf 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -178,6 +178,8 @@ properties: +@@ -186,6 +186,8 @@ properties: - azw,gsking-x - azw,gtking - azw,gtking-pro diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch index 459027c0c4..c465b9f5c9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch @@ -1,7 +1,7 @@ -From dbbff2493c4e7bc8d5428eac685fad04f0aabba0 Mon Sep 17 00:00:00 2001 +From 454f410492f7aaf33eb39e948727b01c40d08970 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:51:20 +0000 -Subject: [PATCH 102/119] WIP: arm64: dts: meson: add initial device-trees for +Subject: [PATCH 105/124] WIP: arm64: dts: meson: add initial device-trees for Dreambox One/Two Dreambox One and Dreambox Two are based on the Amlogic W400 reference @@ -40,13 +40,13 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3fad85258de2..f06a1337b29d 100644 +index 187c83c4c61e..bc50ca8b0e79 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -10,6 +10,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-tanix-tx5max.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb +@@ -11,6 +11,8 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch index c71cc0254b..797da57d03 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch @@ -1,7 +1,7 @@ -From 5c3b005aaad70692a8ac2891b402a636ec3cc9e9 Mon Sep 17 00:00:00 2001 +From 4ad7019b4d4e8977c4dc92dbd3ed1cf03425deac Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 04:27:45 +0000 -Subject: [PATCH 103/119] WIP: dt-bindings: arm: amlogic: add support for Ugoos +Subject: [PATCH 106/124] WIP: dt-bindings: arm: amlogic: add support for Ugoos AM6 plus The AM6 plus is a revised version of the AM6 Android box based @@ -14,10 +14,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index b8b2899ad83b..cc0f1ac5f678 100644 +index b7ade343feaf..a1ec954a8b8b 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -184,6 +184,7 @@ properties: +@@ -192,6 +192,7 @@ properties: - hardkernel,odroid-n2-plus - khadas,vim3 - ugoos,am6 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch index 638d2aa102..55586572f0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch @@ -1,7 +1,7 @@ -From 8abd9cdf2ae1a222828a031510ca49c103f336c5 Mon Sep 17 00:00:00 2001 +From 7502bd1a593179a0ecdcb3e2323ef5a01e2c7c6d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 05:29:31 +0000 -Subject: [PATCH 104/119] WIP: arm64: dts: meson: add support for Ugoos AM6 +Subject: [PATCH 107/124] WIP: arm64: dts: meson: add support for Ugoos AM6 Plus The Ugoos AM6 Plus is based on the Amlogic W400 (G12B) reference design @@ -31,10 +31,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index f06a1337b29d..494f8aaa8060 100644 +index bc50ca8b0e79..615b1c496a34 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch index 25fd737a56..524f48fb91 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch @@ -1,8 +1,8 @@ -From a2439693661c617b58d9d7934ac082bd42e8ddb2 Mon Sep 17 00:00:00 2001 +From fe8d7fee0ad2ae5170cb6affd3fd2737a553bdd5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 24 Jan 2023 16:57:20 +0000 -Subject: [PATCH 105/119] arm64: dts: meson: add support for MeCool M8S Pro - Plus +Subject: [PATCH 108/124] WIP: arm64: dts: meson: add support for MeCool M8S + Pro Plus This is an S905X device based on the P212 reference design, but with an S908CS WiFi/BT module that is not currently supported. @@ -15,10 +15,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-mecool-m8s-pro-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 494f8aaa8060..3f1b3e2f30f5 100644 +index 615b1c496a34..43ffbe9e359e 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb +@@ -54,6 +54,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch index 668efa3731..117ded5746 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch @@ -1,7 +1,7 @@ -From 1a1fc49b6127ecf2d16be31ab83ec734da497b7e Mon Sep 17 00:00:00 2001 +From 8f943925f5928e8d5293e9929d5406b71749d058 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 106/119] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan +Subject: [PATCH 109/124] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan support The A311D on Zero2 needs active cooling and the board includes a header to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch index 6f776f587e..65e492d9e3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch @@ -1,7 +1,7 @@ -From e6e55db69f4283d40937256d93edfa837f905f33 Mon Sep 17 00:00:00 2001 +From f4f9ddf6dd331448affe7d2669038fcf63c8cb8f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 09:59:58 +0000 -Subject: [PATCH 107/119] WIP: dt-bindings: arm: amlogic: add support for Tanix +Subject: [PATCH 110/124] WIP: dt-bindings: arm: amlogic: add support for Tanix TX9 Pro The Oranth Tanix TX9 Pro is an Android STB using the Amlogic S912 chip @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index cc0f1ac5f678..e76691082298 100644 +index a1ec954a8b8b..dea5d15da404 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -139,6 +139,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch index 08c248d479..14a7e22353 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch @@ -1,7 +1,7 @@ -From c8038bf4bbae704a49cd2844bc2e5648d99696b0 Mon Sep 17 00:00:00 2001 +From 922db6bdf5bf8f1aec97201b380e573332d6d567 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:01:14 +0000 -Subject: [PATCH 108/119] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 111/124] WIP: arm64: dts: meson: add initial device-tree for Tanix TX9 Pro Oranth Tanix TX9 Pro is based on the Amlogic Q200 reference design with @@ -27,10 +27,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-tx9-pro.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3f1b3e2f30f5..6a71a170b6f3 100644 +index 43ffbe9e359e..8b4155e0140c 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb +@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch index 2f6f718b63..fb0f0ecb80 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch @@ -1,7 +1,7 @@ -From ef5c2fa82e569cbcb8fb53b742343f4272f638ed Mon Sep 17 00:00:00 2001 +From 28eb18b1d12aa935a3015d8fcd8b1a4e5b8aaee0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:11:39 +0000 -Subject: [PATCH 109/119] WIP: arm64: dts: meson: add 7-segment display to +Subject: [PATCH 112/124] WIP: arm64: dts: meson: add 7-segment display to Tanix TX9 Pro Add support for the 7-segment VFD display of the device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch index 1fa503d1e1..6c1eb2e6b4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch @@ -1,7 +1,7 @@ -From 4bf607534e312de06cfdc61cf3a5c2e2baa36a97 Mon Sep 17 00:00:00 2001 +From 090ff084fb42a1554f4da542fa1969ba5c1514ec Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 12 Feb 2023 10:45:54 +0000 -Subject: [PATCH 110/119] WIP: net: phy: add support for Maxio MAE0621A +Subject: [PATCH 113/124] WIP: net: phy: add support for Maxio MAE0621A Maxio MAE0621A is the external PHY found in some Amlogic set-top box devices based on the S905D chipset. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch index 64c021ad46..fd500df66c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch @@ -1,7 +1,7 @@ -From f24ebb12d59f441e4061046fcd85befb9b07ff23 Mon Sep 17 00:00:00 2001 +From 89929d27582c48cd8e25e52a850d4374d940b0ed Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:38:16 +0000 -Subject: [PATCH 111/119] WIP: dt-bindings: add sunvell vendor prefix +Subject: [PATCH 114/124] WIP: dt-bindings: add sunvell vendor prefix Add vendor prefix for Shenzhen Sunvell Electronics Co., Ltd diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch index fa0d4f30ef..f11e219107 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch @@ -1,7 +1,7 @@ -From 175c7bc4e08922b3be0b2940efe07f877ddcf03e Mon Sep 17 00:00:00 2001 +From b707c63b54c6cb6e778b357b77c984d08526f43e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 18:36:56 +0000 -Subject: [PATCH 112/119] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus +Subject: [PATCH 115/124] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus Add a binding for the rc-sunvell-t95z-plus remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch index 76d0c57865..247ecc1be7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From dfed8817abde00a9877d53d02b21871a05da1054 Mon Sep 17 00:00:00 2001 +From 1cd5494d2e1d93a11f47e5fe7bdfc368e97d3606 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 19:03:10 +0000 -Subject: [PATCH 113/119] WIP: media: rc: add keymap for Sunvell T95Z Plus +Subject: [PATCH 116/124] WIP: media: rc: add keymap for Sunvell T95Z Plus Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch similarity index 84% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch index a9b95d5f35..219f916cc5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch @@ -1,7 +1,7 @@ -From 5ba3816e2167b21386eb376d5aa283a754cc62b2 Mon Sep 17 00:00:00 2001 +From 11d54d85afabca95aeadad5d760495f2585ba0e5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:41:09 +0000 -Subject: [PATCH 114/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 117/124] WIP: dt-bindings: arm: amlogic: add support for Sunvell T95Z Plus Sunvell T95Z Plus is an Android STB based on the Amlogic Q200 reference @@ -13,7 +13,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index e76691082298..e7d2624cbbb6 100644 +index dea5d15da404..800ecbc6efa6 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -140,6 +140,7 @@ properties: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch index ca69473a09..1e5aace150 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch @@ -1,7 +1,7 @@ -From d4d794feea10af19360d8781aeaf6996d52e2978 Mon Sep 17 00:00:00 2001 +From 0345ea076cc9f1728e5d5fefeeaf93a8f43a432a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:46:39 +0000 -Subject: [PATCH 115/119] WIP: arm64: dts: meson: add support for Sunvell T95Z +Subject: [PATCH 118/124] WIP: arm64: dts: meson: add support for Sunvell T95Z Plus Sunvell T95Z Pluz is based on the Amlogic Q200 reference design with @@ -27,10 +27,10 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 6a71a170b6f3..3897fb9a9207 100644 +index 8b4155e0140c..8ce0c8697c94 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -78,6 +78,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb +@@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxm-tx9-pro.dtb diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch index 192b8f0970..75e07a166b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From 776e7979362127c2fcc55fe178da02192f852ae5 Mon Sep 17 00:00:00 2001 +From 1797ebac6c5364810954a07a9a4b9cad206e0a89 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 13:11:14 +0000 -Subject: [PATCH 116/119] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z +Subject: [PATCH 119/124] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z Plus making guesses at the config.. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch index 65c56feb1c..726f7d5e22 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch @@ -1,10 +1,10 @@ -From 526525ab3720040b9982cabbc8ba9d1cc9c6538f Mon Sep 17 00:00:00 2001 +From f1cd1ca3923a1b9f24b7c4e51f573808d43281fd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 19:25:18 +0000 -Subject: [PATCH 118/119] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 120/124] WIP: dt-bindings: arm: amlogic: add support for BananaPi M2S variants -BananaPi M2S ships in two variants with Amlogic S922X or A311D chips +BananaPi M2S ships in two variants with Amlogic S922X or A311D chips. Signed-off-by: Christian Hewitt --- @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index e7d2624cbbb6..bc4f2a2422db 100644 +index 800ecbc6efa6..fb93a6e51061 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -169,6 +169,7 @@ properties: @@ -23,7 +23,7 @@ index e7d2624cbbb6..bc4f2a2422db 100644 - khadas,vim3 - radxa,zero2 - const: amlogic,a311d -@@ -180,8 +181,10 @@ properties: +@@ -188,8 +189,10 @@ properties: - azw,gsking-x - azw,gtking - azw,gtking-pro diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch index 264fcb00c9..5bacba9e6f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch @@ -1,7 +1,7 @@ -From d0680b65d58938cc23d9b3a38de228444904fe32 Mon Sep 17 00:00:00 2001 +From 0dec4707acf8cd15da290abdaf10696406f0488f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 09:22:24 +0000 -Subject: [PATCH 119/119] WIP: arm64: dts: meson: add support for BananaPi M2S +Subject: [PATCH 121/124] WIP: arm64: dts: meson: add support for BananaPi M2S variants BananaPi M2S ships in Amlogic S922X and A311D variants with the @@ -34,16 +34,16 @@ both board variants. Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/amlogic/Makefile | 2 + - .../amlogic/meson-g12b-a311d-bananapi-m2s.dts | 18 + - .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 554 ++++++++++++++++++ + .../amlogic/meson-g12b-a311d-bananapi-m2s.dts | 37 ++ + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 521 ++++++++++++++++++ .../amlogic/meson-g12b-s922x-bananapi-m2s.dts | 14 + - 4 files changed, 588 insertions(+) + 4 files changed, 574 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 3897fb9a9207..43a78de9ddb7 100644 +index 8ce0c8697c94..172355a2afb0 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb @@ -52,9 +52,9 @@ index 3897fb9a9207..43a78de9ddb7 100644 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-one.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-dreambox-two.dtb -@@ -18,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +@@ -19,6 +20,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb @@ -64,10 +64,10 @@ index 3897fb9a9207..43a78de9ddb7 100644 dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6-plus.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts new file mode 100644 -index 000000000000..6c4f02c3a349 +index 000000000000..ac6f7ae1d103 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts -@@ -0,0 +1,18 @@ +@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2023 Christian Hewitt @@ -81,6 +81,25 @@ index 000000000000..6c4f02c3a349 +/ { + compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b"; + model = "BananaPi M2S"; ++ ++ aliases { ++ i2c0 = &i2c1; ++ i2c1 = &i2c3; ++ }; ++}; ++ ++/* Camera (CSI) bus */ ++&i2c1 { ++ status = "okay"; ++ pinctrl-0 = <&i2c1_sda_h6_pins>, <&i2c1_sck_h7_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* Display (DSI) bus */ ++&i2c3 { ++ status = "okay"; ++ pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; ++ pinctrl-names = "default"; +}; + +&npu { @@ -88,10 +107,10 @@ index 000000000000..6c4f02c3a349 +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi new file mode 100644 -index 000000000000..2698d718c9a5 +index 000000000000..d02b50a0f7a8 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi -@@ -0,0 +1,554 @@ +@@ -0,0 +1,521 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS @@ -107,8 +126,8 @@ index 000000000000..2698d718c9a5 +/ { + aliases { + serial0 = &uart_AO; -+ serial2 = &uart_A; + ethernet0 = ðmac; ++ rtc1 = &vrtc; + }; + + chosen { @@ -124,12 +143,12 @@ index 000000000000..2698d718c9a5 + compatible = "adc-keys"; + io-channels = <&saradc 2>; + io-channel-names = "buttons"; -+ keyup-threshold-microvolt = <1800000>; ++ keyup-threshold-microvolt = <1710000>; + + button-function { + label = "RST"; + linux,code = ; -+ press-threshold-microvolt = <40000>; ++ press-threshold-microvolt = <10000>; + }; + }; + @@ -161,18 +180,18 @@ index 000000000000..2698d718c9a5 + leds { + compatible = "gpio-leds"; + -+ green { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; -+ }; -+ + blue { + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + }; ++ ++ green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; ++ }; + }; + + sdio_pwrseq: sdio-pwrseq { @@ -189,7 +208,7 @@ index 000000000000..2698d718c9a5 + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; + -+ dc_in: regulator-dc_in { ++ dc_in: regulator-dc-in { + compatible = "regulator-fixed"; + regulator-name = "DC_IN"; + regulator-min-microvolt = <5000000>; @@ -197,7 +216,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vcc_5v: regulator-vcc_5v { ++ vcc_5v: regulator-vcc-5v { + compatible = "regulator-fixed"; + regulator-name = "VCC_5V"; + regulator-min-microvolt = <5000000>; @@ -208,7 +227,7 @@ index 000000000000..2698d718c9a5 + enable-active-high; + }; + -+ vcc_3v3: regulator-vcc_3v3 { ++ vcc_3v3: regulator-vcc-3v3 { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <3300000>; @@ -217,7 +236,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vcc_1v8: regulator-vcc_1v8 { ++ vcc_1v8: regulator-vcc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "VCC_1V8"; + regulator-min-microvolt = <1800000>; @@ -226,7 +245,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vddao_1v8: regulator-vddao_1v8 { ++ vddao_1v8: regulator-vddao-1v8 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO1V8"; + regulator-min-microvolt = <1800000>; @@ -259,7 +278,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ vsys_3v3: regulator-vsys_3v3 { ++ vsys_3v3: regulator-vsys-3v3 { + compatible = "regulator-fixed"; + regulator-name = "VSYS_3V3"; + regulator-min-microvolt = <3300000>; @@ -268,7 +287,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ emmc_1v8: regulator-emmc_1v8 { ++ emmc_1v8: regulator-emmc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "EMMC_AO1V8"; + regulator-min-microvolt = <1800000>; @@ -277,7 +296,7 @@ index 000000000000..2698d718c9a5 + regulator-always-on; + }; + -+ usb_pwr: regulator-usb_pwr { ++ usb_pwr: regulator-usb-pwr { + compatible = "regulator-fixed"; + regulator-name = "USB_PWR"; + regulator-min-microvolt = <5000000>; @@ -291,16 +310,11 @@ index 000000000000..2698d718c9a5 + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M2S"; -+ audio-aux-devs = <&tdmin_a>, <&tdmout_a>; -+ audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", -+ "TDMOUT_A IN 1", "FRDDR_B OUT 0", -+ "TDMOUT_A IN 2", "FRDDR_C OUT 0", -+ "TDM_A Playback", "TDMOUT_A OUT", -+ "TDMIN_A IN 0", "TDM_A Capture", -+ "TDMIN_A IN 3", "TDM_A Loopback", -+ "TODDR_A IN 0", "TDMIN_A OUT", -+ "TODDR_B IN 0", "TDMIN_A OUT", -+ "TODDR_C IN 0", "TDMIN_A OUT"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; + + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, @@ -322,21 +336,9 @@ index 000000000000..2698d718c9a5 + sound-dai = <&frddr_c>; + }; + -+ dai-link-3 { -+ sound-dai = <&toddr_a>; -+ }; -+ -+ dai-link-4 { -+ sound-dai = <&toddr_b>; -+ }; -+ -+ dai-link-5 { -+ sound-dai = <&toddr_c>; -+ }; -+ + /* 8ch hdmi interface */ -+ dai-link-6 { -+ sound-dai = <&tdmif_a>; ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + dai-tdm-slot-tx-mask-1 = <1 1>; @@ -345,12 +347,12 @@ index 000000000000..2698d718c9a5 + mclk-fs = <256>; + + codec { -+ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>; ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* hdmi glue */ -+ dai-link-7 { ++ dai-link-4 { + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; + + codec { @@ -368,13 +370,6 @@ index 000000000000..2698d718c9a5 + status = "okay"; +}; + -+&cec_AO { -+ pinctrl-0 = <&cec_ao_a_h_pins>; -+ pinctrl-names = "default"; -+ status = "disabled"; -+ hdmi-phandle = <&hdmi_tx>; -+}; -+ +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; @@ -474,6 +469,13 @@ index 000000000000..2698d718c9a5 + }; +}; + ++/* Main i2c bus */ ++&i2c2 { ++ status = "okay"; ++ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>; ++ pinctrl-names = "default"; ++}; ++ +&pcie { + status = "okay"; + reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; @@ -579,27 +581,11 @@ index 000000000000..2698d718c9a5 + vqmmc-supply = <&emmc_1v8>; +}; + -+&tdmif_a { ++&tdmif_b { + status = "okay"; +}; + -+&tdmin_a { -+ status = "okay"; -+}; -+ -+&tdmout_a { -+ status = "okay"; -+}; -+ -+&toddr_a { -+ status = "okay"; -+}; -+ -+&toddr_b { -+ status = "okay"; -+}; -+ -+&toddr_c { ++&tdmout_b { + status = "okay"; +}; + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch similarity index 70% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch index fab85e2447..b818ad7545 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -1,24 +1,25 @@ -From d1e24180eafd58f9d4fb07bfeb92ac4d7e506f34 Mon Sep 17 00:00:00 2001 +From 8eded64d29097fd5915f3416d6353fa810f8bdb1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Feb 2023 08:28:00 +0000 -Subject: [PATCH 117/119] WIP: arm64: dts: meson: p23x-q20x: fix usb init - +Subject: [PATCH 122/124] WIP: arm64: dts: meson: p23x-q20x: fix usb init - don't force otg -Forcing OTG in the p23x-q20x dtsi causes USB problems on some boards: +Forcing OTG in the p23x-q20x dtsi causes USB problems on multiple boards: [ 1.246056] dwc2 c9100000.usb: supply vusb_d not found, using dummy regulator [ 1.246442] dwc2 c9100000.usb: supply vusb_a not found, using dummy regulator [ 1.258386] dwc2 c9100000.usb: dwc2_core_reset: HANG! Soft Reset timeout GRSTCTL_CSFTRST [ 1.258404] dwc2: probe of c9100000.usb failed with error -16 -Using device mode results in working USB ports: +Using 'peripheral' mode clears the error but still leaves boards without working +USB ports. Using 'host' mode results in working USB ports: [ 1.760353] dwc2 c9100000.usb: supply vusb_d not found, using dummy regulator [ 1.760706] dwc2 c9100000.usb: supply vusb_a not found, using dummy regulator [ 1.761307] dwc2 c9100000.usb: EPs: 7, dedicated fifos, 712 entries in SPRAM -Define 'peripheral' dr_mode as a safe default for all GXL/GXM boards -that consume the common dtsi. +Define 'host' dr_mode as a safer default for all GXL/GXM boards that +consume the common dtsi. Signed-off-by: Christian Hewitt --- @@ -26,7 +27,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi -index b0d008fc5f7a..fcfc81dc08b6 100644 +index b0d008fc5f7a..025cefd6939a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi @@ -324,5 +324,5 @@ &uart_AO { @@ -34,7 +35,7 @@ index b0d008fc5f7a..fcfc81dc08b6 100644 &usb { status = "okay"; - dr_mode = "otg"; -+ dr_mode = "peripheral"; ++ dr_mode = "host"; }; -- 2.34.1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch new file mode 100644 index 0000000000..a9cdf62fd7 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch @@ -0,0 +1,99 @@ +From 5141028915365644abf578857b16ad3a882a4f73 Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 7 Mar 2023 13:17:16 +0000 +Subject: [PATCH 123/124] WIP: arm64: dts: meson: add WiFi/BT support to + BananaPi M5 + +The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe +the board but mark the sd_mmc_a and uart_A nodes disabled so they can +be enabled via overlay or fdtput when the baord is connected. + +Signed-off-by: Christian Hewitt +--- + .../dts/amlogic/meson-sm1-bananapi-m5.dts | 59 +++++++++++++++++++ + 1 file changed, 59 insertions(+) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +index 34b3238ee0a0..0b434572a789 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +@@ -25,6 +25,20 @@ cvbs_connector_in: endpoint { + }; + }; + ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ ++ }; ++ + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M5"; +@@ -173,6 +187,36 @@ &frddr_c { + status = "okay"; + }; + ++/* SDIO */ ++&sd_emmc_a { ++ /* enable if WiFi/BT board connected */ ++ status = "disabled"; ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ + &tdmif_b { + status = "okay"; + }; +@@ -220,3 +264,18 @@ &toddr_b { + &toddr_c { + status = "okay"; + }; ++ ++&uart_A { ++ /* enable if WiFi/BT board connected */ ++ status = "disabled"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "realtek,rtl8822cs-bt"; ++ enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; ++ device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; ++ }; ++}; +-- +2.34.1 + From 97fac3eb5786f91241de358fa82ae4d88275b65e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 23 Feb 2023 10:36:14 +0000 Subject: [PATCH 010/157] mesa: update to 22.3.7 --- packages/graphics/mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index f7e6a5fbb1..feff132b94 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="22.3.5" -PKG_SHA256="3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9" +PKG_VERSION="22.3.7" +PKG_SHA256="894ce2f4a1c2e76177cdd2284620192d0da3066b243eec2fbb1d7cf37f13042c" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://mesa.freedesktop.org/archive/mesa-${PKG_VERSION}.tar.xz" From 61296540f09d36dc972afb55e141e09a518fc974 Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 10 Mar 2023 17:40:07 +0100 Subject: [PATCH 011/157] kodi: update to cfad925 --- packages/mediacenter/kodi/package.mk | 4 ++-- .../kodi/patches/kodi-995.11-smbc_getxattr.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-995.11-smbc_getxattr.patch diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index cf14fa520f..2e4bfa86f1 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="20.0-Nexus" -PKG_SHA256="4c75add8b9ea44924b6ee45f94439545676033f35f5993908871e3dded527b79" +PKG_VERSION="cfad925044a9424182e0e3f388cc595abc66ed07" +PKG_SHA256="c3e4004a266e33839a6ca580ac82ad95094f888a3964f088d042c5e1702554fc" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/mediacenter/kodi/patches/kodi-995.11-smbc_getxattr.patch b/packages/mediacenter/kodi/patches/kodi-995.11-smbc_getxattr.patch deleted file mode 100644 index 77e5e7ff19..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-995.11-smbc_getxattr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./xbmc/platform/posix/filesystem/SMBDirectory.cpp.orig 2023-02-03 14:31:42.518877830 +0100 -+++ ./xbmc/platform/posix/filesystem/SMBDirectory.cpp 2023-02-03 14:36:27.357905849 +0100 -@@ -171,7 +171,7 @@ - char value[20]; - // We poll for extended attributes which symbolizes bits but split up into a string. Where 0x02 is hidden and 0x12 is hidden directory. - // According to the libsmbclient.h it's supposed to return 0 if ok, or the length of the string. It seems always to return the length which is 4 -- if (smbc_getxattr(strFullName.c_str(), "system.dos_attr.mode", value, sizeof(value)) > 0) -+ if (smbc_getxattr(strFullName.c_str(), "system.dos_attr.mode", value, sizeof(value)) >= 0) - { - long longvalue = strtol(value, NULL, 16); - if (longvalue & SMBC_DOS_MODE_HIDDEN) From 22a018934d7b0159cac6e7eeaef7bfa73ec8c05b Mon Sep 17 00:00:00 2001 From: CvH Date: Fri, 10 Mar 2023 17:48:03 +0100 Subject: [PATCH 012/157] kodi: update LE patches --- .../kodi-100.03-disable-online-check.patch | 4 +-- ...100.05-make-binary-addons-executable.patch | 5 --- .../kodi-100.07-disable-minimize.patch | 7 +--- .../patches/kodi-100.08-setup-timezone.patch | 4 +-- ...se-a-wrapper-to-setup-service-addons.patch | 21 ++++------- .../patches/kodi-100.10-handle-SIGTERM.patch | 35 +++++++------------ .../kodi-100.16-remove-sysinfo-battery.patch | 2 +- ...00.26-disable-internal-texturepacker.patch | 4 +-- ...00.30-addons-refresh-etc-environment.patch | 9 ++--- .../kodi-100.40-estuary-settings-icon.patch | 12 ++----- .../patches/kodi-999.20-headers-only.patch | 14 +++----- 11 files changed, 36 insertions(+), 81 deletions(-) diff --git a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch index c07e189fe1..63f27931de 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch @@ -3,7 +3,7 @@ Subject: disable online check --- --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp -@@ -1840,7 +1840,6 @@ const infomap system_labels[] = { +@@ -1919,7 +1919,6 @@ const infomap system_labels[] = { {"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"dvdlabel", SYSTEM_DVD_LABEL}, @@ -34,7 +34,7 @@ Subject: disable online check std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText) --- a/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp -@@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove() +@@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove() SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS); SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS); SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS); diff --git a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch index 66abd04aa7..d00641023c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch @@ -10,8 +10,6 @@ credits to vpeter4 for the patch xbmc/addons/Addon.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index 90669bb10e..f6aabfc615 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp @@ -29,6 +29,10 @@ @@ -54,6 +52,3 @@ index 90669bb10e..f6aabfc615 100644 addon->OnPostInstall(update, modal); } --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index b2e61e45e3..2508ba42d2 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -7,11 +7,9 @@ Subject: [PATCH] disable minimize xbmc/application/Application.cpp | 1 - 1 file changed, 1 deletion(-) -diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp -index 27b7bc80cb..bafb5de064 100644 --- a/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp -@@ -1572,7 +1572,6 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1609,7 +1609,6 @@ void CApplication::OnApplicationMessage( break; case TMSG_MINIMIZE: @@ -19,6 +17,3 @@ index 27b7bc80cb..bafb5de064 100644 break; case TMSG_EXECUTE_OS: --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch b/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch index b982f28834..f6f383240b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch @@ -12,7 +12,7 @@ tz-data.service --- a/xbmc/platform/posix/PosixTimezone.cpp +++ b/xbmc/platform/posix/PosixTimezone.cpp -@@ -26,6 +26,8 @@ +@@ -25,6 +25,8 @@ #include @@ -21,7 +21,7 @@ tz-data.service CPosixTimezone::CPosixTimezone() { char* line = NULL; -@@ -143,6 +145,16 @@ void CPosixTimezone::OnSettingChanged(co +@@ -142,6 +144,16 @@ void CPosixTimezone::OnSettingChanged(co const std::string &settingId = setting->GetId(); if (settingId == CSettings::SETTING_LOCALE_TIMEZONE) { diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch index 639ed811bd..836e0e984c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Use a wrapper to setup service addons xbmc/addons/AddonManager.cpp | 3 +++ 3 files changed, 47 insertions(+) -diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index f6aabfc615..496e1fcfa0 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersion(const std::string& dependencyID) cons +@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersi return m_addonInfo->DependencyVersion(dependencyID); } @@ -51,7 +49,7 @@ index f6aabfc615..496e1fcfa0 100644 void OnPreInstall(const AddonPtr& addon) { //Fallback to the pre-install callback in the addon. -@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon } closedir(addonsDir); } @@ -60,7 +58,7 @@ index f6aabfc615..496e1fcfa0 100644 // OE addon->OnPostInstall(update, modal); -@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon void OnPreUnInstall(const AddonPtr& addon) { @@ -69,11 +67,9 @@ index f6aabfc615..496e1fcfa0 100644 addon->OnPreUnInstall(); } -diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h -index a09b8db80f..629f028584 100644 --- a/xbmc/addons/Addon.h +++ b/xbmc/addons/Addon.h -@@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal); +@@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon void OnPreUnInstall(const AddonPtr& addon); void OnPostUnInstall(const AddonPtr& addon); @@ -89,8 +85,6 @@ index a09b8db80f..629f028584 100644 class CAddon : public IAddon { public: -diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp -index bb0b510378..0524caa5a9 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -12,6 +12,7 @@ @@ -101,7 +95,7 @@ index bb0b510378..0524caa5a9 100644 #include "addons/AddonBuilder.h" #include "addons/AddonDatabase.h" #include "addons/AddonEvents.h" -@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled +@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std:: AddonPtr addon; if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr) { @@ -109,7 +103,7 @@ index bb0b510378..0524caa5a9 100644 auto eventLog = CServiceBroker::GetEventLog(); if (eventLog) eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141))); -@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) +@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std:: if (!m_database->EnableAddon(id)) return false; m_disabled.erase(id); @@ -117,6 +111,3 @@ index bb0b510378..0524caa5a9 100644 // If enabling a repo add-on without an origin, set its origin to its own id if (addon->HasType(AddonType::REPOSITORY) && addon->Origin().empty()) --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch index 3cc65d5eff..33cfc08fdc 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -20,11 +20,9 @@ so, when shutdown/reboot is requested: .../powermanagement/LogindUPowerSyscall.cpp | 2 -- 3 files changed, 20 insertions(+), 8 deletions(-) -diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp -index bafb5de064..c5f39217cc 100644 --- a/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp -@@ -1444,12 +1444,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1481,12 +1481,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +37,7 @@ index bafb5de064..c5f39217cc 100644 break; case TMSG_SHUTDOWN: -@@ -1470,12 +1470,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1507,12 +1507,13 @@ void CApplication::OnApplicationMessage( case TMSG_RESTART: case TMSG_RESET: @@ -54,7 +52,7 @@ index bafb5de064..c5f39217cc 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2039,7 +2040,7 @@ bool CApplication::Stop(int exitCode) +@@ -2083,7 +2084,7 @@ bool CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -63,7 +61,7 @@ index bafb5de064..c5f39217cc 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2071,7 +2072,6 @@ bool CApplication::Stop(int exitCode) +@@ -2115,7 +2116,6 @@ bool CApplication::Stop(int exitCode) // Needs cleaning up CServiceBroker::GetAppMessenger()->Stop(); m_AppFocused = false; @@ -71,7 +69,7 @@ index bafb5de064..c5f39217cc 100644 CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -2602,6 +2602,18 @@ void CApplication::StopPlaying() +@@ -2658,6 +2658,18 @@ void CApplication::StopPlaying() } } @@ -89,8 +87,8 @@ index bafb5de064..c5f39217cc 100644 + bool CApplication::OnMessage(CGUIMessage& message) { - switch ( message.GetMessage() ) -@@ -3114,7 +3126,7 @@ void CApplication::ProcessSlow() + switch (message.GetMessage()) +@@ -3178,7 +3190,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -99,31 +97,27 @@ index bafb5de064..c5f39217cc 100644 } #endif -diff --git a/xbmc/application/Application.h b/xbmc/application/Application.h -index 710ea9923b..59763464ab 100644 --- a/xbmc/application/Application.h +++ b/xbmc/application/Application.h -@@ -120,6 +120,7 @@ public: +@@ -113,6 +113,7 @@ public: bool CreateGUI(); bool InitWindow(RESOLUTION res = RES_INVALID); + bool SetExitCode(int exitCode); bool Stop(int exitCode); - void ReloadSkin(bool confirm = false); const std::string& CurrentFile(); -@@ -274,6 +275,7 @@ private: - CApplicationPlayer m_appPlayer; - CApplicationStackHelper m_stackHelper; + CFileItem& CurrentFileItem(); +@@ -251,6 +252,7 @@ private: + unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls which are processed during one "door open" cycle in FrameMove */ + unsigned int m_ProcessedExternalDecay = 0; /*!< counts to close door after a few frames of no python activity */ int m_ExitCode{EXITCODE_QUIT}; + bool m_ExitCodeSet = false; }; XBMC_GLOBAL_REF(CApplication,g_application); -diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp -index 34eed6e41b..c374dbdbd3 100644 --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp -@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() +@@ -79,8 +79,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc bool CLogindUPowerSyscall::Powerdown() { @@ -132,6 +126,3 @@ index 34eed6e41b..c374dbdbd3 100644 return LogindSetPowerState("PowerOff"); } --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch index d918dc0744..ab42cafc05 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch @@ -1,6 +1,6 @@ --- a/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp -@@ -99,7 +99,6 @@ void CGUIWindowSystemInfo::FrameMove() +@@ -100,7 +100,6 @@ void CGUIWindowSystemInfo::FrameMove() SetControlLabel(i++, "{} {}", 13283, SYSTEM_OS_VERSION_INFO); SetControlLabel(i++, "{}: {}", 12390, SYSTEM_UPTIME); SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME); diff --git a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch index f090fbda1e..e1327b021b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch @@ -1,8 +1,6 @@ -diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake -index 4817d15799..c56630001a 100644 --- a/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake -@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) +@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack endif() endif() diff --git a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch index 05e91134a3..f98488ef61 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch @@ -7,11 +7,9 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall xbmc/addons/Addon.cpp | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index 496e1fcfa0..da0a5955e0 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon // OE addon->OnPostInstall(update, modal); @@ -21,7 +19,7 @@ index 496e1fcfa0..da0a5955e0 100644 } void OnPreUnInstall(const AddonPtr& addon) -@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addon) +@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addo void OnPostUnInstall(const AddonPtr& addon) { addon->OnPostUnInstall(); @@ -31,6 +29,3 @@ index 496e1fcfa0..da0a5955e0 100644 } } // namespace ADDON --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch b/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch index 43fc9f6490..9d3a3b764b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch @@ -12,21 +12,18 @@ Signed-off-by: Christian Hewitt addons/skin.estuary/xml/Settings.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml -index fa63b174b8..e25d96dec2 100644 --- a/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml -@@ -54,10 +54,17 @@ - ActivateWindow(systeminfo) +@@ -55,9 +55,16 @@ icons/settings/sysinfo.png -+ + + + RunAddon(service.libreelec.settings) + icons/settings/libreelec.png + System.AddonIsEnabled(service.libreelec.settings) + - ++ ActivateWindow(eventlog) icons/settings/eventlog.png @@ -47,6 +44,3 @@ index fa63b174b8..e25d96dec2 100644 --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch index 6ea97a4797..827db8e60d 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch @@ -1,16 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5824f0d20b7..cf17e1563a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,6 +45,7 @@ include(ExternalProject) - +@@ -47,6 +47,7 @@ include(CMakeDependentOption) + include(cmake/scripts/common/DependencyOptions.cmake) # general +option(HEADERS_ONLY "Skip building" OFF) option(VERBOSE "Enable verbose output?" OFF) option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF) option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF) -@@ -95,6 +96,7 @@ endif() +@@ -107,6 +108,7 @@ endif() core_find_git_rev(APP_SCMID FULL) @@ -18,7 +16,7 @@ index e5824f0d20b7..cf17e1563a7f 100644 # Dynamically loaded libraries built with the project add_custom_target(${APP_NAME_LC}-libraries) set(LIBRARY_FILES "" CACHE STRING "" FORCE) -@@ -458,6 +460,7 @@ endif() +@@ -478,6 +480,7 @@ endif() if(FFMPEG_CREATE_SHARED_LIBRARY) set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}") endif() @@ -26,11 +24,9 @@ index e5824f0d20b7..cf17e1563a7f 100644 # Platform specific additional extra targets if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/ExtraTargets.cmake) -diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake -index 331722cb5616..cc00c55fa27c 100644 --- a/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake -@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop.in +@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.metainfo.xml.in ${CORE_BUILD_DIR}/${APP_PACKAGE}.metainfo.xml @ONLY) From 62b254abb41c3b6112d3bb944e2069b32a3060ce Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 12 Mar 2023 00:37:57 +0100 Subject: [PATCH 013/157] kodi: update to 20.1-Nexus --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 2e4bfa86f1..c15c865971 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="cfad925044a9424182e0e3f388cc595abc66ed07" -PKG_SHA256="c3e4004a266e33839a6ca580ac82ad95094f888a3964f088d042c5e1702554fc" +PKG_VERSION="20.1-Nexus" +PKG_SHA256="cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" From 6f264f6b8ff1078563a23e43608660646756c7ed Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 12 Mar 2023 13:09:29 +0000 Subject: [PATCH 014/157] kodi-binary-addons: update to latest versions - inputstream.adaptive: update 20.3.4-Nexus to 20.3.5-Nexus - peripheral.joystick: update 20.1.7-Nexus to 20.1.8-Nexus --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 6 +++--- .../kodi-binary-addons/peripheral.joystick/package.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index 36360919d5..6e3a7c1026 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="inputstream.adaptive" -PKG_VERSION="20.3.4-Nexus" -PKG_SHA256="49fe8dc908166d4b0c5130d3201d3221f24e860a7a05c5b0db3491f64422c14f" -PKG_REV="3" +PKG_VERSION="20.3.5-Nexus" +PKG_SHA256="3851e1ac48aa38681b6ff6cfb39ab2cc24156b859d1a257be63f3c4d9fd926de" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/inputstream.adaptive" diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index 630d5e6145..946a670d63 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="peripheral.joystick" -PKG_VERSION="20.1.7-Nexus" -PKG_SHA256="da141fb79474de1346704b1afc67dc3b615aef4f74b14bfb896dfe8dfb91ddc5" +PKG_VERSION="20.1.8-Nexus" +PKG_SHA256="6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From d7876df684167d709f02f15f1a33ac86d73f622c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 13 Mar 2023 19:38:35 +0000 Subject: [PATCH 015/157] linux: update to 6.1.19 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index cd1920ccd9..adc4b5ab0e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.1.18" - PKG_SHA256="842ac15eff0e6fb0c150fdf83f4f6aaf6b4c1239dcf8c14e2227620ec0ae141e" + PKG_VERSION="6.1.19" + PKG_SHA256="9e991c6e5f6c1ca45eea98c55e82ef6ae3dccc73b3e8a655c8665e585f5a8647" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From e16d9e8e44300ea8e463266d0b82e6b3c4a9b51b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 14 Mar 2023 09:16:36 +0000 Subject: [PATCH 016/157] pvr.vbox: update 20.4.1-Nexus to 20.4.2-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk index 1fbcd3dd6f..4a0420c82a 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.vbox" -PKG_VERSION="20.4.1-Nexus" -PKG_SHA256="c8ee26a903491fa8a2c321322a5ae3184139e892508f30faadbd9bd0df6287bc" -PKG_REV="2" +PKG_VERSION="20.4.2-Nexus" +PKG_SHA256="04c50eba71426f062339491e7567545ec8c910b17c7055b28285eab14f26ca6f" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.vbox" From 0562e5adbc1edcba09903599c82ceee63f4025f9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 28 Feb 2023 19:26:08 +0000 Subject: [PATCH 017/157] linux: update Amlogic Linux 6.1.x patches --- packages/linux/package.mk | 4 +- ...LOCAL-set-meson-gx-cma-pool-to-896MB.patch | 6 +-- ...OCAL-set-meson-g12-cma-pool-to-896MB.patch | 6 +-- ...m64-fix-Kodi-sysinfo-CPU-information.patch | 4 +- ...eson-add-Amlogic-Meson-GX-PM-Suspend.patch | 4 +- ...meson-add-support-for-GX-PM-and-Virt.patch | 6 +-- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 4 +- ...meson-add-rtc-vrtc-aliases-to-Khadas.patch | 4 +- ...meson-add-rtc-vrtc-aliases-to-Minix-.patch | 4 +- ...n-internal-PCM-chmap-ELD-IEC958-kctl.patch | 4 +- ...sable-autosuspend-for-Genesys-Logic-.patch | 4 +- ...L-of-partial-revert-of-fdt.c-changes.patch | 4 +- ...m-meson-meson_venc-Relax-the-support.patch | 4 +- ...m-meson-fix-1px-pink-line-on-GXM-whe.patch | 4 +- ...rt-arm64-dts-meson-sm1-odroid-hc4-di.patch | 8 +-- ...-dts-meson-add-Broadcom-WiFi-to-P21.patch} | 4 +- ...4-dts-meson-remove-CPU-opps-below-1G.patch | 53 ------------------- ...-dts-meson-move-pwm_ef-node-in-P212.patch} | 4 +- ...-dts-meson-remove-WiFi-BT-nodes-fro.patch} | 4 +- ...-dts-meson-add-audio-playback-to-S9.patch} | 4 +- ...ndings-reset-meson-g12a-Add-missing.patch} | 4 +- ...ndings-power-Add-G12A-NNA-power-dom.patch} | 4 +- ...mlogic-meson-pwrc-Add-NNA-power-dom.patch} | 4 +- ...-dts-Add-DT-node-for-the-VIPNano-QI.patch} | 6 +-- ...tnaviv-Add-nn_core_count-to-chip-fe.patch} | 4 +- ...m-etnaviv-Warn-when-probing-on-NPUs.patch} | 4 +- ...tnaviv-add-HWDB-entry-for-VIPNano-Q.patch} | 4 +- ...-dts-Fix-NPU-power-domain-reference.patch} | 6 +-- ...eson-mpll-Switch-from-.round_rate-t.patch} | 4 +- ...eson-dualdiv-switch-from-.round_rat.patch} | 4 +- ...eson-sclk-div-switch-from-.round_ra.patch} | 4 +- ...eson-clk-cpu-dyndiv-switch-from-.ro.patch} | 4 +- ...-dts-meson-make-dts-use-gpio-fan-ma.patch} | 4 +- ...4-dts-amlogic-meson-sm1-odroid-hc4-f.patch | 42 --------------- ...-dts-meson-meson-sm1-bananapi-m5-co.patch} | 10 ++-- ...ndings-arm-amlogic-add-support-for-.patch} | 4 +- ...-dts-meson-add-support-for-BananaPi.patch} | 4 +- ...4-dts-meson-radxa-zero-allow-usb-otg.patch | 27 ---------- ...4-dts-meson-bananapi-m5-switch-VDDIO.patch | 38 ------------- ...ndings-arm-amlogic-add-support-for-.patch} | 4 +- ...-dts-meson-add-support-for-Radxa-Ze.patch} | 4 +- ...ndings-net-add-amlogic-gxl-mdio-mul.patch} | 4 +- ...dio-add-amlogic-gxl-mdio-mux-suppor.patch} | 4 +- ...mc-meson-gx-remove-meson_mmc_get_cd.patch} | 4 +- ...-meson-vdec-remove-redundant-if-sta.patch} | 4 +- ...ndings-media-rc-add-rc-dreambox-bin.patch} | 4 +- ...-rc-add-common-keymap-for-Dreambox-.patch} | 4 +- ...ndings-media-rc-add-rc-beelink-mxii.patch} | 4 +- ...ia-rc-add-Beelink-Mini-MXIII-keymap.patch} | 4 +- ...-dts-meson-gxbb-kii-pro-sort-and-ti.patch} | 30 +++++------ ...-dts-meson-gxbb-kii-pro-complete-th.patch} | 8 +-- ...-dts-meson-gxbb-kii-pro-add-initial.patch} | 10 ++-- ...ndings-arm-amlogic-Document-the-boa.patch} | 4 +- ...-dts-amlogic-Add-initial-support-fo.patch} | 4 +- ...1-mmc-meson-gx-fix-deferred-probing.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 +- ...hdmi-codec-reorder-channel-allocati.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-serial-amlogic-meson-uart-Ad.patch} | 4 +- ...erial-meson-Add-a-new-compatible-st.patch} | 4 +- ...-dts-meson-g12-common-Use-the-G12A-.patch} | 6 +-- ...dec-disable-MPEG1-MPEG2-hardware-de.patch} | 4 +- ...on-set-p212-p23x-q20x-SDIO-to-100MH.patch} | 4 +- ...on-add-UHS-SDIO-capabilities-to-p21.patch} | 4 +- ...on-remove-SDIO-node-from-Khadas-VIM.patch} | 4 +- ...ts-meson-add-audio-playback-to-p201.patch} | 4 +- ...ts-meson-add-audio-playback-to-p200.patch} | 4 +- ...ts-meson-add-audio-playback-to-u200.patch} | 4 +- ...on-add-Headphone-output-to-Beelink-.patch} | 4 +- ...rm-amlogic-add-support-for-the-Tani.patch} | 4 +- ...on-add-support-for-the-Tanix-TX5-Ma.patch} | 4 +- ...on-add-multiple-MeCool-device-trees.patch} | 4 +- ...rm-amlogic-add-support-for-Minix-NE.patch} | 4 +- ...on-add-initial-device-tree-for-Mini.patch} | 4 +- ...eson-add-rtc-vrtc-aliases-to-Minix-.patch} | 4 +- ...rm-amlogic-add-support-for-Beelink-.patch} | 4 +- ...on-add-support-for-Beelink-Mini-MXI.patch} | 4 +- ...-keymap-for-MeCool-M8S-Pro-W-remote.patch} | 4 +- ...rm-amlogic-add-support-for-MeCool-M.patch} | 4 +- ...on-add-support-for-MeCool-M8S-Pro-W.patch} | 4 +- ...ngs-arm-amlogic-add-Vero-4K-binding.patch} | 4 +- ...-meson-add-support-for-OSMC-Vero-4K.patch} | 4 +- ...on-sm1-x96-air-add-RTL8822CS-WiFi-a.patch} | 4 +- ...a-rc-add-keymap-for-Venz-V10-remote.patch} | 4 +- ...rm-amlogic-add-S905L-and-Venz-V10-b.patch} | 4 +- ...-dts-meson-add-support-for-Venz-V10.patch} | 4 +- ...ngs-vendor-prefixes-add-tbee-prefix.patch} | 4 +- ...gs-arm-amlogic-add-TBee-Box-binding.patch} | 4 +- ...-dts-meson-add-support-for-TBee-Box.patch} | 4 +- ...arm-amlogic-add-Beelink-GT1-binding.patch} | 4 +- ...s-meson-add-support-for-Beelink-GT1.patch} | 4 +- ...on-add-vcc_5v-regulator-to-WeTek-dt.patch} | 4 +- ...on-add-audio-lineout-to-WeTek-Play2.patch} | 4 +- ...logic-fix-cvbs-disable-on-WeTek-Hub.patch} | 4 +- ...dings-add-compatible-for-es8323-i2c.patch} | 4 +- ...-ASoC-codecs-add-support-for-ES8323.patch} | 4 +- ...dt-bindings-add-dream-vendor-prefix.patch} | 4 +- ...rm-amlogic-add-support-for-Dreambox.patch} | 4 +- ...on-add-initial-device-trees-for-Dre.patch} | 4 +- ...rm-amlogic-add-support-for-Ugoos-AM.patch} | 4 +- ...eson-add-support-for-Ugoos-AM6-Plus.patch} | 4 +- ...on-add-support-for-MeCool-M8S-Pro-P.patch} | 4 +- ...son-radxa-zero2-add-pwm-fan-support.patch} | 4 +- ...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 +- ...-phy-add-support-for-Maxio-MAE0621A.patch} | 4 +- ...-bindings-add-sunvell-vendor-prefix.patch} | 4 +- ...s-media-rc-add-rc-sunvell-t95z-plus.patch} | 4 +- ...rc-add-keymap-for-Sunvell-T95Z-Plus.patch} | 4 +- ...rm-amlogic-add-support-for-Sunvell-.patch} | 4 +- ...on-add-support-for-Sunvell-T95Z-Plu.patch} | 4 +- ...on-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch} | 4 +- ...rm-amlogic-add-support-for-BananaPi.patch} | 4 +- ...on-add-support-for-BananaPi-M2S-var.patch} | 4 +- ...on-p23x-q20x-fix-usb-init-don-t-for.patch} | 4 +- ...on-add-WiFi-BT-support-to-BananaPi-.patch} | 4 +- ...on-vdec-fix-memory-leak-of-new_frame.patch | 29 ++++++++++ projects/Amlogic/linux/linux.aarch64.conf | 6 +-- 126 files changed, 298 insertions(+), 435 deletions(-) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch => amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch} (87%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch => amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch => amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch => amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch => amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch => amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch => amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch => amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch => amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch => amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch => amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch => amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch => amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch => amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch => amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch => amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch => amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch} (89%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch => amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch => amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch => amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch} (96%) delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch delete mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch => amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch => amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch => amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch => amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch => amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch => amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch => amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch => amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch => amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch => amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch => amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch} (80%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch => amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch} (83%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch => amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch => amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch => amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch => amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch => amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch => amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch => amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch => amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch => amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch => amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch => amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch => amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch => amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch => amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch => amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch} (95%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch => amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch => amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch => amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch => amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch => amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch => amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch => amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch => amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch => amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch => amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch => amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch => amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch => amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch => amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch => amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch => amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch} (85%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch => amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch => amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch => amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch => amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch => amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch} (93%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch => amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch => amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch => amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch => amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch => amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch => amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch => amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch => amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch => amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch => amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch => amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch => amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch => amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch} (91%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch => amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch => amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch => amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch} (89%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch => amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch => amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch => amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch => amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch} (88%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch => amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch => amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch} (97%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch => amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch => amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch => amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch => amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch => amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch} (98%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch => amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch => amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch} (86%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch => amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch => amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch} (87%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch => amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch} (96%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch => amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch} (94%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch => amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch} (90%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch => amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch} (99%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch => amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch} (92%) rename projects/Amlogic/devices/AMLGX/patches/linux/{amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch => amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch} (94%) create mode 100644 projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index adc4b5ab0e..5b6728b543 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -16,8 +16,8 @@ PKG_PATCH_DIRS="${LINUX}" case "${LINUX}" in amlogic) - PKG_VERSION="42616e0f09fb4e9a6c59892a227f7bdefbd2d6d3" # 6.1.15 - PKG_SHA256="963efd296b713d1eba66cfc831b6b09bcd380fe565baf4f7f63aa1cedc78dd18" + PKG_VERSION="6449a0ba6843fe70523eeb7855984054f36f6d24" # 6.1.19 + PKG_SHA256="6a46c7b91028157d56437736cc8601fa46485e6f52bd6983e92ff80f17aa3065" PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="default" diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch index 03926984fd..74ebd01acc 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0001-LOCAL-set-meson-gx-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From 3d13e5ef9b0be2a25ab1fff395db44bbe0a3cd22 Mon Sep 17 00:00:00 2001 +From c5478965aad09d2ebc682438e5474f7606e06eb2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 001/124] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 001/120] LOCAL: set meson-gx cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index fa6cff4a2ebc..5ee7640fad06 100644 +index 80d86780cb6b..7f20b90e11da 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -58,7 +58,7 @@ secmon_reserved_bl32: secmon@5300000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch index 5922a41aad..e919d19953 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0002-LOCAL-set-meson-g12-cma-pool-to-896MB.patch @@ -1,7 +1,7 @@ -From 6a2448485c0944260935c633e84ac807940cd17d Mon Sep 17 00:00:00 2001 +From f442bde4d5400279042a90b8af49e4631eac3133 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 002/124] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 002/120] LOCAL: set meson-g12 cma pool to 896MB This change sets the CMA pool to a larger 896MB! value for vdec use @@ -11,7 +11,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 894cea697550..8be0381cd419 100644 +index 131a8a5a9f5a..d2b6fa8034ea 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -116,7 +116,7 @@ secmon_reserved_bl32: secmon@5300000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch index c4b3467369..b8437d85d4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0003-LOCAL-arm64-fix-Kodi-sysinfo-CPU-information.patch @@ -1,7 +1,7 @@ -From 94fa4941a5cc58275a9060386480a330af953a03 Mon Sep 17 00:00:00 2001 +From 79decc6d434e12c4bb2fc6c88073ab210bc8c8cb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 003/124] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 003/120] LOCAL: arm64: fix Kodi sysinfo CPU information This allows the CPU information to show in the Kodi sysinfo screen, e.g. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch index 404fbe35ad..da89855fd1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0004-LOCAL-arm64-meson-add-Amlogic-Meson-GX-PM-Suspend.patch @@ -1,7 +1,7 @@ -From d8485fc35c8f74f174bb9dc66532fda6d2ccaf4d Mon Sep 17 00:00:00 2001 +From 4430a4f8e570fc70b2053fc4970758bc0976fda9 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 004/124] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 004/120] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend The Amlogic Meson GX SoCs uses a non-standard argument to the PSCI CPU_SUSPEND call to enter system suspend. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch index e110bab6d8..3eade2ab65 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0005-LOCAL-arm64-dts-meson-add-support-for-GX-PM-and-Virt.patch @@ -1,7 +1,7 @@ -From 5de1504fd7f5dbb61045a427fe81ad1c8d344c36 Mon Sep 17 00:00:00 2001 +From dbe7af745c89a0824b90c8f0dcf9bb4cc0f48d4c Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 005/124] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 005/120] LOCAL: arm64: dts: meson: add support for GX PM and Virtual RTC Signed-off-by: Neil Armstrong @@ -10,7 +10,7 @@ Signed-off-by: Neil Armstrong 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 5ee7640fad06..b8e43b406cec 100644 +index 7f20b90e11da..f39de6ead2fb 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -221,6 +221,10 @@ sm: secure-monitor { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 6bc2cf51e8..91295503bf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0006-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From 896c7e487a9b85565d5f032472479589870fbb7f Mon Sep 17 00:00:00 2001 +From 08655d3530269d8c17410a6dc3fde69e9c23fe2f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 006/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 006/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch index 3330b62da2..f0717cab55 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0007-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Khadas.patch @@ -1,7 +1,7 @@ -From cf9c9c87c8f4e9b9bd6b77c82160fe37d02ce8cd Mon Sep 17 00:00:00 2001 +From 35731fd9e4a198dbd96911828de0270f7f7fcfe9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 007/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 007/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Khadas VIM2 Add aliases to ensure the vrtc time (which normally proves first) is /dev/rtc1 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index d41979c349..1a1eab50af 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0008-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From 4fae9dab8a66664eda75b2e72d11be84495874e6 Mon Sep 17 00:00:00 2001 +From 54396343f2c349acae2c8c31fd07719f3f71577f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 008/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 008/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO U9-H Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch index 395f00e564..48beb80f41 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0009-LOCAL-ALSA-Assign-internal-PCM-chmap-ELD-IEC958-kctl.patch @@ -1,7 +1,7 @@ -From 6d951d1064742ff05f3c753d2830ee82597f5150 Mon Sep 17 00:00:00 2001 +From 6f81de193a1d33648341c8d3a702a070dc71c133 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 009/124] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 +Subject: [PATCH 009/120] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 kctls to device 0 On SoC sound devices utilizing codec2codec DAI links with a HDMI codec diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index e41376cf42..f57591283e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0010-LOCAL-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -1,7 +1,7 @@ -From c2d5a3c9cd74bd38f70e5e0aaac3e0f73a4af506 Mon Sep 17 00:00:00 2001 +From 6101cde6d49a5d6c4ed4535131dbce78f3523eb9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 010/124] LOCAL: usb: hub: disable autosuspend for Genesys +Subject: [PATCH 010/120] LOCAL: usb: hub: disable autosuspend for Genesys Logic Hubs Disable autosuspend in Genesys Logic hubs to allow USB devices on the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch index 3d7d2f65df..b046c64bd3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0011-LOCAL-of-partial-revert-of-fdt.c-changes.patch @@ -1,7 +1,7 @@ -From 9d7af11c29d31e837497210fb027c6e71619ea5d Mon Sep 17 00:00:00 2001 +From 012c3d681e1370c701cc666027871817bfc0ec6d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Sep 2021 05:00:45 +0000 -Subject: [PATCH 011/124] LOCAL: of: partial revert of fdt.c changes +Subject: [PATCH 011/120] LOCAL: of: partial revert of fdt.c changes This resolves reports similar to the below which are present in dmesg since Linux 5.10; which are also causing crashes in some distros: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch index fd416bee7a..6a8a2f3aac 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-FIXES-drm-meson-meson_venc-Relax-the-support.patch @@ -1,7 +1,7 @@ -From fcc187a4ae5a17045c2922b37b9158ee6830a31e Mon Sep 17 00:00:00 2001 +From 8f94ff5bdfe66ddbaafd35beb20b77fd3a1790f8 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Mon, 13 Feb 2023 10:32:09 +0100 -Subject: [PATCH 012/124] FROMGIT(FIXES): drm/meson/meson_venc: Relax the +Subject: [PATCH 012/120] FROMGIT(FIXES): drm/meson/meson_venc: Relax the supported mode checks Relax a bit the supported modes list by including also 480x1920 and diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch index 06072948de..06834480de 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0013-FROMGIT-FIXES-drm-meson-fix-1px-pink-line-on-GXM-whe.patch @@ -1,7 +1,7 @@ -From 2af8142b44df714599fe5f7a5d9c3f678231bbe1 Mon Sep 17 00:00:00 2001 +From eb87fb2d9f172769fadab83e148d3138c2a2031b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Mar 2023 12:48:28 +0000 -Subject: [PATCH 013/124] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM +Subject: [PATCH 013/120] FROMGIT(FIXES): drm/meson: fix 1px pink line on GXM when scaling video overlay Playing media with a resolution smaller than the crtc size requires the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch index f16f537932..d9742dba27 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0014-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch @@ -1,7 +1,7 @@ -From 923a36494f202ce6c3e0b2febfe2fe3fad70256f Mon Sep 17 00:00:00 2001 +From df013bc124b5814849cf5d4d97027432752d976d Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 4 Jan 2023 15:19:06 +0000 -Subject: [PATCH 014/124] FROMGIT(6.2): Revert "arm64: dts: +Subject: [PATCH 014/120] FROMGIT(6.2): Revert "arm64: dts: meson-sm1-odroid-hc4: disable unused USB PHY0" This reverts commit 703e84d6615a4a95fb504c8f2e4c9426b86f3930. @@ -17,10 +17,10 @@ Signed-off-by: Pierre-Olivier Mercier 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index e3486f60645a..a1f0c38ccadd 100644 +index 3d642d739c35..74088e7280fe 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -131,10 +131,6 @@ flash@0 { +@@ -139,10 +139,6 @@ flash@0 { }; &usb { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch index b39e465251..1093f79244 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch @@ -1,7 +1,7 @@ -From d4e849bab8f5cbd70d8198e0deb9273c3e63187c Mon Sep 17 00:00:00 2001 +From bc574310bb7aad62c46aeee3a7e590df1f5ae0e7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:50:01 +0000 -Subject: [PATCH 016/124] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to +Subject: [PATCH 015/120] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to P212 dtsi The P212 has a combined WiFi/BT module. The BT side is already enabled diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch deleted file mode 100644 index a5f93a7da1..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0015-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 700cf88d7bc8a96082f0a55bdaf1990e445862e3 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 19 Jan 2023 05:03:53 +0000 -Subject: [PATCH 015/124] FROMGIT(6.3): arm64: dts: meson: remove CPU opps - below 1GHz for G12A boards - -Amlogic G12A devices experience CPU stalls and random board wedges when -the system idles and CPU cores clock down to lower opp points. Recent -vendor kernels include a change to remove 100-250MHz and other distro -sources also remove the 500/667MHz points. Unless all 100-667Mhz opps -are removed or the CPU governor forced to performance stalls are still -observed, so let's remove them to improve stability and uptime. - -Fixes: b190056fa9ee ("arm64: dts: meson-g12a: add cpus OPP table") -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 20 -------------------- - 1 file changed, 20 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -index fb0ab27d1f64..6eaceb717d61 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi -@@ -57,26 +57,6 @@ cpu_opp_table: opp-table { - compatible = "operating-points-v2"; - opp-shared; - -- opp-100000000 { -- opp-hz = /bits/ 64 <100000000>; -- opp-microvolt = <731000>; -- }; -- -- opp-250000000 { -- opp-hz = /bits/ 64 <250000000>; -- opp-microvolt = <731000>; -- }; -- -- opp-500000000 { -- opp-hz = /bits/ 64 <500000000>; -- opp-microvolt = <731000>; -- }; -- -- opp-667000000 { -- opp-hz = /bits/ 64 <666666666>; -- opp-microvolt = <731000>; -- }; -- - opp-1000000000 { - opp-hz = /bits/ 64 <1000000000>; - opp-microvolt = <731000>; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch index d4a57f5cb0..cd9b564713 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0016-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch @@ -1,7 +1,7 @@ -From c2c6ad295dcfc54e39d48c6981f22a2cebb054c5 Mon Sep 17 00:00:00 2001 +From 127106564fbef4f111b65f556affddef25d73764 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:56:12 +0000 -Subject: [PATCH 017/124] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in +Subject: [PATCH 016/120] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in P212 dtsi Cosmetic-only change to alpha-sort the pwm_ef node. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch index 57237e6708..bd0fddd8d9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0017-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch @@ -1,7 +1,7 @@ -From c1114a0f97a5a44bc25e972c37644792cc74953f Mon Sep 17 00:00:00 2001 +From 0097b59b870692e148373b4fe171b227295d296b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:58:58 +0000 -Subject: [PATCH 018/124] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes +Subject: [PATCH 017/120] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes from Khadas VIM1 The Broadcom WiFi/BT SDIO nodes are now inherited from the P212 common dtsi diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch index 6eae91ae46..6a18442973 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0018-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch @@ -1,7 +1,7 @@ -From bc7ca33a87ab8569cbc54a08fea7fa059be48fe7 Mon Sep 17 00:00:00 2001 +From da97eaeea4e9583bee58cc05afc29462a7d42403 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 04:30:44 +0000 -Subject: [PATCH 019/124] FROMGIT(6.3): arm64: dts: meson: add audio playback +Subject: [PATCH 018/120] FROMGIT(6.3): arm64: dts: meson: add audio playback to S905X-P212 dts Add support for the HDMI and Analogue i2s audio outputs. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch index 8702d51273..857e303195 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0019-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch @@ -1,7 +1,7 @@ -From 37040153930ec646ca47f954b9e3c85ef7597843 Mon Sep 17 00:00:00 2001 +From 6dafa687717b7d33cdecbc0494cca51f5b754251 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:03:14 +0000 -Subject: [PATCH 020/124] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add +Subject: [PATCH 019/120] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add missing NNA reset Doesn't appear in the TRM I have, but it is used by the downstream diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch index 301f2e588b..130cd2918d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0020-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 397a8f83bff92b2797585433274ac2ea176f7e75 Mon Sep 17 00:00:00 2001 +From 7327250ae9d136ee318b4f9d0537b965df324111 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:02 +0000 -Subject: [PATCH 021/124] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power +Subject: [PATCH 020/120] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power domain Add define for the NNA power domain for the NPU in the G12A. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch index dca0f5ea87..a2eb049521 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0021-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 21a3fd2803e4fd17ce9bd98aba0c4504a9e29dd1 Mon Sep 17 00:00:00 2001 +From 17a33be46d9bf9f977855c631a6303c99abd002e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:51 +0000 -Subject: [PATCH 022/124] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power +Subject: [PATCH 021/120] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power domain for A311D Based on power initialization sequence in downstream driver. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch index 132b2f18fc..9b60cd58e9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch @@ -1,7 +1,7 @@ -From af35fb5c2bfc4b722a4e2268a217099e7a664f64 Mon Sep 17 00:00:00 2001 +From f34fad413355b9fb666b61cc9e8df7156bbbb7b6 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:05:46 +0000 -Subject: [PATCH 023/124] FROMGIT(6.3): arm64: dts: Add DT node for the +Subject: [PATCH 022/120] FROMGIT(6.3): arm64: dts: Add DT node for the VIPNano-QI on the A311D This "NPU" is very similar to the Vivante GPUs and Etnaviv works well @@ -15,7 +15,7 @@ Reviewed-by: Neil Armstrong 2 files changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 8be0381cd419..146610cbf05e 100644 +index d2b6fa8034ea..c90066823250 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,6 +11,7 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch index c04934090c..fdae267884 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0023-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch @@ -1,7 +1,7 @@ -From f033edaa3332d18828e348d75f21ef806336e663 Mon Sep 17 00:00:00 2001 +From 32817c57b6cc75595d60ea68ccc0c7c767d46898 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:01:47 +0000 -Subject: [PATCH 024/124] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip +Subject: [PATCH 023/120] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip feature struct We will use these for differentiating between GPUs and NPUs, as the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch index 92509c19c4..e7fb624bf3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0024-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch @@ -1,7 +1,7 @@ -From b259ac5ee71948b18626f8c098c19f25e8b9f106 Mon Sep 17 00:00:00 2001 +From b3155f8944de71787491aa1cedbf079939539de7 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:02:31 +0000 -Subject: [PATCH 025/124] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs +Subject: [PATCH 024/120] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs Userspace is still not making full use of the hardware, so we don't know yet if changes to the UAPI won't be needed. Warn about it. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch index c031ef85e0..88f127be8f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0025-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch @@ -1,7 +1,7 @@ -From 18745ede1bba607053170d114500a05410897acd Mon Sep 17 00:00:00 2001 +From 3e9c8855643486b4f793bd13fbfc759058524062 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:03:16 +0000 -Subject: [PATCH 026/124] FROMGIT(6.3): drm/etnaviv: add HWDB entry for +Subject: [PATCH 025/120] FROMGIT(6.3): drm/etnaviv: add HWDB entry for VIPNano-QI.7120.0055 This is a compute-only module marketed towards AI and vision diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch index e064db5905..e0a937863b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch @@ -1,7 +1,7 @@ -From 21bf955b7c8c397c28eb24b6ab3fccc7f11d0492 Mon Sep 17 00:00:00 2001 +From 2a3a6c002d0055ae280e94bdcff00088c60e56a6 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:04:00 +0000 -Subject: [PATCH 027/124] FROMGIT(6.3): arm64: dts: Fix NPU power domain +Subject: [PATCH 026/120] FROMGIT(6.3): arm64: dts: Fix NPU power domain references in Amlogic G12-based SoCs The power sequence is different between SoCs in that family, so get the @@ -15,7 +15,7 @@ Signed-off-by: Tomeu Vizoso 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 146610cbf05e..749d5b3e3554 100644 +index c90066823250..bb2e86073261 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -11,7 +11,6 @@ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch index 00cac03df9..7a1dcc49e2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0027-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch @@ -1,7 +1,7 @@ -From dea931026d73bc6d8af46ec56a9694213a2aab61 Mon Sep 17 00:00:00 2001 +From 3a1d65dcdcdd2201dacf97eb5394bec9f4677297 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:41:46 +0000 -Subject: [PATCH 028/124] FROMGIT(6.3): clk: meson: mpll: Switch from +Subject: [PATCH 027/120] FROMGIT(6.3): clk: meson: mpll: Switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch index f4633a0937..c12bebe505 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0028-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch @@ -1,7 +1,7 @@ -From d974f9603f560a46024fe8ff88a066d6f8794980 Mon Sep 17 00:00:00 2001 +From 6239c914d58c0517ccc5f1386918da94c03c2508 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:42:41 +0000 -Subject: [PATCH 029/124] FROMGIT(6.3): clk: meson: dualdiv: switch from +Subject: [PATCH 028/120] FROMGIT(6.3): clk: meson: dualdiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch index bde960d396..eb9be382a1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0029-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch @@ -1,7 +1,7 @@ -From 3f16df9ced198c479d359fd65846bbea179a38af Mon Sep 17 00:00:00 2001 +From 450b9f39897989b1f1f9c1efe5a07417d7ef04cf Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:43:33 +0000 -Subject: [PATCH 030/124] FROMGIT(6.3): clk: meson: sclk-div: switch from +Subject: [PATCH 029/120] FROMGIT(6.3): clk: meson: sclk-div: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch index 4a37922892..00df92b688 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0030-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch @@ -1,7 +1,7 @@ -From 98e5f6b3c291633477aa99bf82cb9614900e77e5 Mon Sep 17 00:00:00 2001 +From 900d5cb13f3c1b7ced0586497190be1ed96a4742 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:44:26 +0000 -Subject: [PATCH 031/124] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from +Subject: [PATCH 030/120] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from .round_rate to .determine_rate clk_ops.round_rate will be removed at some point. It's replacement is diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch index 784f90e11f..a17b89a83e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch @@ -1,7 +1,7 @@ -From 8427e08cb0e9aa76e4f4362004bc95b36e1eb5b2 Mon Sep 17 00:00:00 2001 +From 6e28630c533846d7c79bb388a1cc1e13650e45b6 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 27 Nov 2021 07:23:35 +0000 -Subject: [PATCH 033/124] FROMGIT(6.3): arm64: dts: meson: make dts use +Subject: [PATCH 031/120] FROMGIT(6.3): arm64: dts: meson: make dts use gpio-fan matrix instead of array No functional changes. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch deleted file mode 100644 index 83c6cf2fc2..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bb12a49637fd4e0a711d27a049ad07295e52aaa8 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Tue, 24 Jan 2023 12:39:08 +0100 -Subject: [PATCH 032/124] FROMGIT(6.3): arm64: dts: amlogic: - meson-sm1-odroid-hc4: fix active fan thermal trip - -Add an active trip tied to the on-board fan cooling device, which is better -than describing it along the passive cooling maps. - -Fixes: 33b14f663df8 ("arm64: dts: meson: add initial device-tree for ODROID-HC4") -Reported-by: Ricardo Pardini -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index a1f0c38ccadd..74088e7280fe 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -76,9 +76,17 @@ sound { - }; - - &cpu_thermal { -+ trips { -+ cpu_active: cpu-active { -+ temperature = <60000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "active"; -+ }; -+ }; -+ - cooling-maps { - map { -- trip = <&cpu_passive>; -+ trip = <&cpu_active>; - cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch index 811fa2e2f5..7ca713a61e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0032-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch @@ -1,7 +1,7 @@ -From 4790c0f01fa63b6883c0a76e82d3b1edd11bfcd6 Mon Sep 17 00:00:00 2001 +From 67e3334c533941ed976a3d6390c4553a0a4bf660 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:10:48 +0000 -Subject: [PATCH 036/124] FROMGIT(6.3): arm64: dts: meson: +Subject: [PATCH 032/120] FROMGIT(6.3): arm64: dts: meson: meson-sm1-bananapi-m5: convert to dtsi Convert the BPI-M5 dts into meson-sm1-bananapi.dtsi to support the @@ -15,7 +15,7 @@ Signed-off-by: Christian Hewitt create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index e8a23861013f..34b3238ee0a0 100644 +index 38ebe98ba9c6..34b3238ee0a0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts @@ -6,10 +6,7 @@ @@ -34,13 +34,13 @@ index e8a23861013f..34b3238ee0a0 100644 compatible = "bananapi,bpi-m5", "amlogic,sm1"; model = "Banana Pi BPI-M5"; -- adc_keys { +- adc-keys { - compatible = "adc-keys"; - io-channels = <&saradc 2>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - -- key { +- button-sw3 { - label = "SW3"; - linux,code = ; - press-threshold-microvolt = <1700000>; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch index 1cf71b5af3..e93629e142 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0033-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -1,7 +1,7 @@ -From 4b448f98adc272243d49334e06a916b9cb712709 Mon Sep 17 00:00:00 2001 +From 654df5af5a8feddbb6407c100061a1412a5f8238 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 09:28:27 +0000 -Subject: [PATCH 037/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support +Subject: [PATCH 033/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support for BananaPi M2-Pro BPI-M2-PRO is based upon the BPI-M5 using the Amlogic SM1 (S905X3) chipset. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch index 84cd96e9c2..57cbcec449 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch @@ -1,7 +1,7 @@ -From 2946da11893f378e8e3091c342faf7efe64428d6 Mon Sep 17 00:00:00 2001 +From 2c38c04f66a209ef843a74c47d5ad55049a45fee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:13:28 +0000 -Subject: [PATCH 038/124] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 034/120] FROMGIT(6.3): arm64: dts: meson: add support for BananaPi M2-Pro BPI-M2-PRO is based upon the BPI-M5 design except for a different diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch deleted file mode 100644 index dbddcf3ac5..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d1fe2551af812a91518cd0334a26315b09c87724 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 26 Jan 2023 12:20:19 +0000 -Subject: [PATCH 034/124] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow - usb otg mode - -Setting dr_mode to "host" prevents otg which can be useful on a board -with limited connectivity options. So don't force host mode. - -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index e3bb6df42ff3..cf0a9be83fc4 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -401,5 +401,4 @@ &uart_AO { - - &usb { - status = "okay"; -- dr_mode = "host"; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch deleted file mode 100644 index c31a140c20..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4bda0546e6690a9f52773a94fa77b3b91d228cd8 Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Thu, 26 Jan 2023 16:15:59 +0000 -Subject: [PATCH 035/124] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch - VDDIO_C pin to OPEN_DRAIN - -For proper warm (re)boot from SD card the BPI-M5 board requires TFLASH_VDD_EN -and VDDIO_C pins to be switched to high impedance mode. This can be achieved -using OPEN_DRAIN instead of ACTIVE_HIGH to leave the GPIO pins in input mode -and retain high state (pin has the pull-up). - -This change is inspired by meson-sm1-odroid.dtsi where OPEN_DRAIN has been -used to resolve similar problems with the Odroid C4 board (TF_IO in the C4 -dts is the equivalent regulator). - -Fixes 976e920183e4 ("arm64: dts: meson-sm1: add Banana PI BPI-M5 board dts") -Suggested-by: Neil Armstrong -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index cadba194b149..e8a23861013f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -@@ -123,7 +123,7 @@ vddio_c: regulator-vddio_c { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - -- enable-gpio = <&gpio_ao GPIOE_2 GPIO_ACTIVE_HIGH>; -+ enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>; - enable-active-high; - regulator-always-on; - --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch index 9bee12e5b3..54918f9aaa 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0035-FROMGIT-6.3-dt-bindings-arm-amlogic-add-support-for-.patch @@ -1,7 +1,7 @@ -From b9575451cb033823080415404a23397eb376f030 Mon Sep 17 00:00:00 2001 +From b71a8761891cdca7af133b91aaef4f485e7542b3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 16 Feb 2022 07:27:07 +0000 -Subject: [PATCH 039/124] FROMGIT(6.3): dt-bindings: arm: amlogic: add support +Subject: [PATCH 035/120] FROMGIT(6.3): dt-bindings: arm: amlogic: add support for Radxa Zero2 The Radxa Zero2 is a small form-factor SBC using the Amlogic diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch index 3847215820..ebe526745e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch @@ -1,7 +1,7 @@ -From 230c630b8ba5ff3f4a1a1e27f13ea78b1e0f589f Mon Sep 17 00:00:00 2001 +From 263e11fb9680d32705f0980569dc32a412818488 Mon Sep 17 00:00:00 2001 From: Yuntian Zhang Date: Fri, 14 Jan 2022 15:50:02 +0000 -Subject: [PATCH 040/124] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 036/120] FROMGIT(6.3): arm64: dts: meson: add support for Radxa Zero2 Radxa Zero2 is a small form factor SBC based on the Amlogic A311D diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch index eeb8d640c0..e71914115b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0037-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch @@ -1,7 +1,7 @@ -From da6bd559e6d8c65a385eb15a1818825820e3a5e2 Mon Sep 17 00:00:00 2001 +From be94b9629bc355647bda972f92e0887d3a94c17f Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:15 +0100 -Subject: [PATCH 041/124] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio +Subject: [PATCH 037/120] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio multiplexer Add documentation for the MDIO bus multiplexer found on the Amlogic GXL diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch index 2631fcbb97..ce672e6d80 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch @@ -1,7 +1,7 @@ -From e7783502af6a0585bb0d46cefd4d2afcd3f0b3ba Mon Sep 17 00:00:00 2001 +From 7246aabe2dcaced67c24646712e930e931177c71 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:16 +0100 -Subject: [PATCH 042/124] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux +Subject: [PATCH 038/120] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux support Add support for the mdio mux and internal phy glue of the GXL SoC diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch index a1fec839a9..aff142305b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0039-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch @@ -1,7 +1,7 @@ -From e0c54c7d8dae134cb4f306edafbbaf83a639c295 Mon Sep 17 00:00:00 2001 +From 3f94f73ae5c31ac0c009e2867a25077cd63df251 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 12 Feb 2023 22:43:32 +0100 -Subject: [PATCH 043/124] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd +Subject: [PATCH 039/120] FROMGIT(6.4): mmc: meson-gx: remove meson_mmc_get_cd MMC core only checks whether return value of .get_cd() equals zero. Therefore -ENOSYS and 1 are effectively the same and the function diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch index db1fd39512..5c38ed15d2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0040-FROMGIT-6.4-media-meson-vdec-remove-redundant-if-sta.patch @@ -1,7 +1,7 @@ -From ca39f3e579c6e65e74c309b96f8363f5c5efb97d Mon Sep 17 00:00:00 2001 +From 5142ba301edc43cc70ca708aafa84cf1b2b32feb Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Thu, 15 Jul 2021 14:32:33 -0400 -Subject: [PATCH 044/124] FROMGIT(6.4): media: meson: vdec: remove redundant if +Subject: [PATCH 040/120] FROMGIT(6.4): media: meson: vdec: remove redundant if statement Checking if sess->fmt_out->pixfmt is V4L2_PIX_FMT_VP9 was already done as a diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch index 4bae48c472..ceae1dd7e4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-dt-bindings-media-rc-add-rc-dreambox-bin.patch @@ -1,7 +1,7 @@ -From 57745077b1446f15f12c0e4a3d9839f83de97860 Mon Sep 17 00:00:00 2001 +From 1b5d94d6c98f76a33fcc98f09a9e2c414cb6c4ee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Feb 2023 08:53:39 +0000 -Subject: [PATCH 045/124] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox +Subject: [PATCH 041/120] FROMGIT(6.4): dt-bindings: media: rc: add rc-dreambox binding Add a binding for the rc-dreambox remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch index c456bdbc5a..61e20e146c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMGIT-6.4-media-rc-add-common-keymap-for-Dreambox-.patch @@ -1,7 +1,7 @@ -From 4af5a66da2b8d8237642c589992321bec5818f17 Mon Sep 17 00:00:00 2001 +From c86408e487a66dc5664c3002da54478eb103228c Mon Sep 17 00:00:00 2001 From: Emanuel Strobel Date: Mon, 5 Apr 2021 17:57:57 +0000 -Subject: [PATCH 046/124] FROMGIT(6.4): media: rc: add common keymap for +Subject: [PATCH 042/120] FROMGIT(6.4): media: rc: add common keymap for Dreambox RC10/RC0 and RC20/RC-BT remotes Add a common keymap for the RC10/RC0 and RC20/RC-BT remotes used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch index 2168a5a59b..e4caef3849 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMGIT-6.4-dt-bindings-media-rc-add-rc-beelink-mxii.patch @@ -1,7 +1,7 @@ -From fc398d991d1e5cf43901adcf21b75f9ee9bafafe Mon Sep 17 00:00:00 2001 +From b2ab233ef1556f2e210c6fe88ea7fca11b52092c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Feb 2023 06:42:20 +0000 -Subject: [PATCH 047/124] FROMGIT(6.4): dt-bindings: media: rc: add +Subject: [PATCH 043/120] FROMGIT(6.4): dt-bindings: media: rc: add rc-beelink-mxiii Add a binding for the rc-beelink-mxiii remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch index 1477063650..fc1bbe58f1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMGIT-6.4-media-rc-add-Beelink-Mini-MXIII-keymap.patch @@ -1,7 +1,7 @@ -From ce9f721bd1c6e1194709364701f15e6ab4ae0834 Mon Sep 17 00:00:00 2001 +From 428bfd6a70cdf2dba7e39568e2cb5a3c283c0bb6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:33:47 +0000 -Subject: [PATCH 048/124] FROMGIT(6.4): media: rc: add Beelink Mini MXIII +Subject: [PATCH 044/120] FROMGIT(6.4): media: rc: add Beelink Mini MXIII keymap Add a keymap for the simple IR (NEC) remote used with the Beelink diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch similarity index 80% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch index ee8c6f5ecb..350fb64cb4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch @@ -1,7 +1,7 @@ -From 349e97058c6823553bd7ad5f7f60355b3c0c05f5 Mon Sep 17 00:00:00 2001 +From 5c659c53668a1a8dbe101959142bb9e468a7cd87 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:16:12 +0000 -Subject: [PATCH 049/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort +Subject: [PATCH 045/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort and tidy the dts Alpha-sort the nodes, move the default line in the LED node to where it's @@ -11,14 +11,14 @@ Signed-off-by: Christian Hewitt Tested-by: Ferass El Hafidi Reviewed-by: Neil Armstrong --- - .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 32 ++++++++----------- - 1 file changed, 14 insertions(+), 18 deletions(-) + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 31 ++++++++----------- + 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 6d8cc00fedc7..9bfdb54d912a 100644 +index 5f2d4317ecfb..73ad0f5110f3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -6,21 +6,22 @@ +@@ -6,10 +6,10 @@ /dts-v1/; #include "meson-gxbb-p20x.dtsi" @@ -30,11 +30,9 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; - - leds { +@@ -18,9 +18,9 @@ leds { compatible = "gpio-leds"; -+ - status { + led { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = ; @@ -43,13 +41,13 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 }; }; -@@ -34,24 +35,8 @@ button-reset { +@@ -34,24 +34,8 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - --}; -- + }; + - - -&uart_A { @@ -61,14 +59,14 @@ index 6d8cc00fedc7..9bfdb54d912a 100644 - bluetooth { - compatible = "brcm,bcm4335a0"; - }; - }; - +-}; +- - - ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; -@@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { +@@ -78,3 +62,14 @@ eth_phy0: ethernet-phy@0 { &ir { linux,rc-map-name = "rc-videostrong-kii-pro"; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch index 1fa5543625..d6c8baa2f7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-complete-th.patch @@ -1,7 +1,7 @@ -From 773768b2f3823d574569e8f607eaa4005ced8bf5 Mon Sep 17 00:00:00 2001 +From eb1e3d228629c1946aef18c7337c5bc0e2694610 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:21:08 +0000 -Subject: [PATCH 050/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: +Subject: [PATCH 046/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Add missing content to the bluetooth node to align it with the content @@ -15,10 +15,10 @@ Reviewed-by: Neil Armstrong 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 9bfdb54d912a..435ae2aa404e 100644 +index 73ad0f5110f3..a800e8955c4a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -72,5 +72,10 @@ &uart_A { +@@ -71,5 +71,10 @@ &uart_A { bluetooth { compatible = "brcm,bcm4335a0"; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch index 37fac9dba9..e5a299280d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMGIT-6.4-arm64-dts-meson-gxbb-kii-pro-add-initial.patch @@ -1,7 +1,7 @@ -From 51a4ffc98695b4e6e491678269e58f32d2311f30 Mon Sep 17 00:00:00 2001 +From 52fdf527ce95b5c7347cde0f0105b3003a834ac8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:29:00 +0000 -Subject: [PATCH 051/124] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add +Subject: [PATCH 047/120] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add initial audio support Add initial support for HDMI and S/PDIF audio output. @@ -14,7 +14,7 @@ Reviewed-by: Neil Armstrong 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 435ae2aa404e..a09340e9f73a 100644 +index a800e8955c4a..e238f1f10124 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -9,11 +9,19 @@ @@ -36,8 +36,8 @@ index 435ae2aa404e..a09340e9f73a 100644 + leds { compatible = "gpio-leds"; - -@@ -35,6 +43,58 @@ button-reset { + led { +@@ -34,6 +42,58 @@ button-reset { gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch index 046b89eae7..38984711ac 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMGIT-6.4-dt-bindings-arm-amlogic-Document-the-boa.patch @@ -1,7 +1,7 @@ -From b72738ccb1d004c6430cc8a90a0ecfa834c28056 Mon Sep 17 00:00:00 2001 +From dafb23b2d7961125dc39553fa6b2ffb1b892a8b5 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 3 Mar 2023 18:37:57 +0100 -Subject: [PATCH 052/124] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the +Subject: [PATCH 048/120] FROMGIT(6.4): dt-bindings: arm: amlogic: Document the boards with the BPI-CM4 connected The BPI-CM4 module with an Amlogic A311D SoC is a module compatible diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch index 62819899a6..d5f4230f94 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMGIT-6.4-arm64-dts-amlogic-Add-initial-support-fo.patch @@ -1,7 +1,7 @@ -From 3fed5b6e5327443a8aaccb08e720ee4209726352 Mon Sep 17 00:00:00 2001 +From b76cd699a611d0fb168b6204489b8f2e41311b6b Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Sat, 4 Mar 2023 07:14:17 +0000 -Subject: [PATCH 053/124] FROMGIT(6.4): arm64: dts: amlogic: Add initial +Subject: [PATCH 049/120] FROMGIT(6.4): arm64: dts: amlogic: Add initial support for BPI-CM4 module with BPI-CM4IO baseboard Add support for both the BananaPi BPI-CM4 module and the BananaPi diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch index 209ee840e0..f934783d1c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch @@ -1,7 +1,7 @@ -From cb3f73c01b56bc2762dfdfcf25c3a85c2dd6cdec Mon Sep 17 00:00:00 2001 +From df65d487bb29ae0489c9794428ce57383471c6d7 Mon Sep 17 00:00:00 2001 From: Sergey Shtylyov Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 054/124] FROMLIST(v1): mmc: meson-gx: fix deferred probing +Subject: [PATCH 050/120] FROMLIST(v1): mmc: meson-gx: fix deferred probing The driver overrides the error codes and IRQ0 returned by platform_get_irq() to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index b0a37b7007..729ee90649 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From b937c4545b48fc4b9685c631c8c34ff96ddb6ec2 Mon Sep 17 00:00:00 2001 +From 022946dc830b928d2361e87501c7fca8505d6910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Feb 2022 08:23:12 +0000 -Subject: [PATCH 055/124] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 051/120] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan Micro Electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index 75be9da338..8ffb8d24a7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From b3469395f4da7a3fd81780a2bc20dc9752323a65 Mon Sep 17 00:00:00 2001 +From 94060333363a0241442deb5b993655188901840d Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 056/124] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan +Subject: [PATCH 052/120] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan Micro Electronics TM1628 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 00a66829bc..ac8922c5be 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 567668ede141f733821710c8a640aa42b496939d Mon Sep 17 00:00:00 2001 +From a53c2bef9b9f389914eb410e73b02b5099266708 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 057/124] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 053/120] FROMLIST(v5): docs: ABI: document tm1628 attribute display-text Document the attribute for reading / writing the text to be displayed on diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index acb8dc4af1..9cbc375b8c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 2cb43fe6c04b9e0b5fea923f6fc3872b21a0755c Mon Sep 17 00:00:00 2001 +From e64e545d0880e5617042ae8d28e60a455a689a78 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 058/124] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 054/120] FROMLIST(v5): auxdisplay: add support for Titanmec TM1628 7 segment display controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index f854ab5a5e..f00d6cb89a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From d5b29dd52f3de3d8b97c51d4442a1619372fce18 Mon Sep 17 00:00:00 2001 +From 136c5d1f6275026217be5741df24816a3875e7a4 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 059/124] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: +Subject: [PATCH 055/120] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: add support for the 7 segment display This patch adds support for the 7 segment display of the device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index 679738f937..44cec1ff07 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From 58501d9aad75798a85e434547b7949287ede7506 Mon Sep 17 00:00:00 2001 +From fbc5936b6016a740768dcd2ac99be9691750e649 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 060/124] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 056/120] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index 60d159b378..6162c22d72 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 6d32b35e79596ed1350d739f37bfeec056f592bc Mon Sep 17 00:00:00 2001 +From fdcff6282a2fcb2afb2751c33f22ea245002b068 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 061/124] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 057/120] FROMLIST(v1): ASoC: hdmi-codec: reorder channel allocation list Wrong channel allocation is selected by hdmi_codec_get_ch_alloc_table_idx(). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index 8dfaeff470..ec0760fd70 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From 45918db1c9f75ddf16fe9cfc29cb7abd5d140f6c Mon Sep 17 00:00:00 2001 +From 89e62d3e8515a1f51b415b255b7200bdf8f1209d Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 062/124] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 058/120] FROMLIST(v1): media: meson: vdec: esparser: check parsing state with hardware write pointer Also check the hardware write pointer to check if ES Parser has stalled. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index 009d1b1448..be628e9038 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From 216f4500ccf36f6a74e0b3ffd378ee557ed9dbdc Mon Sep 17 00:00:00 2001 +From 88671c6347d92c258d84e6448d2f0590ed8766d4 Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 063/124] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 059/120] FROMLIST(v2): media: meson: vdec: implement 10bit bitstream handling In order to support 10bit bitstream decoding, buffers and MMU diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index d6a84eecf9..b2f16add62 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 0799916720ff59f4cb5132453a17748b8d1e81a4 Mon Sep 17 00:00:00 2001 +From bc74e7054ac07e488d17c25f7c30660fcff5fb4d Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 064/124] FROMLIST(v2): media: meson: vdec: add HEVC decode +Subject: [PATCH 060/120] FROMLIST(v2): media: meson: vdec: add HEVC decode codec Add initial HEVC codec for the Amlogic GXBB/GXL/GXM SoCs using diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch index ac5e2df4bd..a7a0d6be40 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch @@ -1,7 +1,7 @@ -From 3167ffdc14544e74a82566d3bc0f1e39c0d3a8d6 Mon Sep 17 00:00:00 2001 +From f9e1f4f9ae2a9390cc8bde8742f4454acc29ff0f Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:41:53 +0100 -Subject: [PATCH 065/124] FROMLIST(v2): dt-bindings: serial: +Subject: [PATCH 061/120] FROMLIST(v2): dt-bindings: serial: amlogic,meson-uart: Add compatible string for G12A Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch index 531be2ad3c..1b9f041712 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch @@ -1,7 +1,7 @@ -From ae9f3f449af22ca1806b8ca65b622d2f91b611a4 Mon Sep 17 00:00:00 2001 +From 6784e19cbe62900c5524fe8e2b5b6216f7fb2ae5 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:44:16 +0100 -Subject: [PATCH 066/124] FROMLIST(v2): tty: serial: meson: Add a new +Subject: [PATCH 062/120] FROMLIST(v2): tty: serial: meson: Add a new compatible string for the G12A SoC Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch index c5c5b1ceea..15a86382d4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch @@ -1,7 +1,7 @@ -From 36552905b53f40bd89e007fa714b7d52f05b5d87 Mon Sep 17 00:00:00 2001 +From 9bf0bf029cc3ddea57cab66ea49db0d69048ee99 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Wed, 22 Feb 2023 21:47:16 +0100 -Subject: [PATCH 067/124] FROMLIST(v2): arm64: dts: meson-g12-common: Use the +Subject: [PATCH 063/120] FROMLIST(v2): arm64: dts: meson-g12-common: Use the G12A UART compatible string Switch meson-12-common.dtsi to use the Meson G12A specific UART @@ -18,7 +18,7 @@ Signed-off-by: Martin Blumenstingl 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 749d5b3e3554..977bfc1f1701 100644 +index bb2e86073261..ec78283d9a9e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -2040,7 +2040,8 @@ pwm_AO_cd: pwm@2000 { diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch index 8f467d3b4f..c24a8cc6a5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch @@ -1,7 +1,7 @@ -From 69724ec6d9aa2c6eed4c19b2432fe4e3cea1517f Mon Sep 17 00:00:00 2001 +From 866fcbd4b9f8e1f3502ab857a23a7a19f2d0ba9e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 068/124] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 064/120] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware decoding The MPEG1/2 decoder is broken and nobody has volunteered to poke diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index 0e1c5eeaad..73b8de0d2d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0065-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From 49a02986cb8ae08090e576d0d78f9a71b89c2e27 Mon Sep 17 00:00:00 2001 +From 705f27c026178c3cc9af1142fcbea2f686e034a5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 069/124] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 065/120] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to 100MHz Amlogic datasheets describe 50MHz max-frequency for SDIO on GXL/GXM but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index f3f84cc7a5..b9f1ed186d 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0066-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From 814b6de6186193cccf6517e0a243fd64a549851d Mon Sep 17 00:00:00 2001 +From fb0a50ba250cb8b6c328e32b5132f29a7ada0488 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 070/124] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 066/120] WIP: arm64: dts: meson: add UHS SDIO capabilities to p212/p23x/q20x Add UHS capabilities to the SDIO node to enable 100MHz speeds. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index 0a89a7bf0b..45d7263372 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0067-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From 58eb5ad2cea635f2941ead75106654455f81951a Mon Sep 17 00:00:00 2001 +From dac1058a8890451e943cd3dd82a04b23436928b2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 071/124] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 067/120] WIP: arm64: dts: meson: remove SDIO node from Khadas VIM1 Now that SDIO 100MHz max-frequency is inherited from the p212 dtsi we diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch index bec523a3f4..8bae5f8cde 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0068-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch @@ -1,7 +1,7 @@ -From bdb0515c10ba11b7e010681820bb2916be9b43f9 Mon Sep 17 00:00:00 2001 +From 8aadc1cc8f6f3ff75b071c935e2f885fd735ba81 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 072/124] WIP: arm64: dts: meson: add audio playback to p201 +Subject: [PATCH 068/120] WIP: arm64: dts: meson: add audio playback to p201 Add initial audio support limited to HDMI i2s. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch index 5e7d53a18e..abc4c8e28e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0069-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch @@ -1,7 +1,7 @@ -From 1b834e16307438e9a29efc9ad046f12d8972a055 Mon Sep 17 00:00:00 2001 +From a44b679ac6004a5a9a3c28ed744e597df0c840b5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 073/124] WIP: arm64: dts: meson: add audio playback to p200 +Subject: [PATCH 069/120] WIP: arm64: dts: meson: add audio playback to p200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch index f3489ba880..297bf71efb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0070-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch @@ -1,7 +1,7 @@ -From 85116c417b26bdb50e3faa278b7939c0e4f4e81e Mon Sep 17 00:00:00 2001 +From 76dfcdd0088bbc374551c52759be7223f8752074 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 074/124] WIP: arm64: dts: meson: add audio playback to u200 +Subject: [PATCH 070/120] WIP: arm64: dts: meson: add audio playback to u200 Add initial support limited to HDMI i2s and SPDIF (LPCM). diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch index 444a8a5bde..41b746fcde 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0071-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch @@ -1,7 +1,7 @@ -From 7a41e52459e177ecd1e728c84d321fd46549b82c Mon Sep 17 00:00:00 2001 +From c60ca77b02dd6904ffbd5418138a5880a822b460 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Nov 2021 13:50:06 +0000 -Subject: [PATCH 075/124] WIP: arm64: dts: meson: add Headphone output to +Subject: [PATCH 071/120] WIP: arm64: dts: meson: add Headphone output to Beelink GT-King Add support for the Headphone audio DAC built-in to the S922X chip. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch index 3ae894bd2a..3d0af16ff5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0072-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch @@ -1,7 +1,7 @@ -From fb48811743b3c70e5fa8fdbfb709c1116a06b219 Mon Sep 17 00:00:00 2001 +From d7ec2bf4d082d383dd2f3a77cbf46bb10261ea59 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 29 Feb 2020 15:13:02 +0000 -Subject: [PATCH 076/124] WIP: dt-bindings: arm: amlogic: add support for the +Subject: [PATCH 072/120] WIP: dt-bindings: arm: amlogic: add support for the Tanix TX5 Max The Oranth (Tanix) TX5 Max is based on the Amlogic U200 reference diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch index c542373ea4..02eb33fa99 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0073-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch @@ -1,7 +1,7 @@ -From 191edeaf7c267716ebc1f4ed802135e8170fa2ad Mon Sep 17 00:00:00 2001 +From e842f0a1b8d3454ac9a166c992986fe9bc5af99f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 20 Oct 2019 04:06:59 +0000 -Subject: [PATCH 077/124] WIP: arm64: dts: meson: add support for the Tanix TX5 +Subject: [PATCH 073/120] WIP: arm64: dts: meson: add support for the Tanix TX5 Max The Tanix TX5 Max is based on the Amlogic U200 reference design diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch index d7d866b47e..45f883e3e3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch @@ -1,7 +1,7 @@ -From 2a0bbdd4019af1fb6c3326ec024fe5867e0e54f0 Mon Sep 17 00:00:00 2001 +From 98656236664654dc5163a60522ed69d7e3f99823 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 21 Oct 2019 03:58:06 +0000 -Subject: [PATCH 078/124] WIP: arm64: dts: meson: add multiple MeCool device +Subject: [PATCH 074/120] WIP: arm64: dts: meson: add multiple MeCool device trees This adds initial device trees for a range of MeCool devices based on various diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch index 44f78e908c..d7fa0ed79b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch @@ -1,7 +1,7 @@ -From 84cac7ac9589cef2c3c3190a4013870fde942923 Mon Sep 17 00:00:00 2001 +From 821b974dba480063ad5c60d83bd28441ba164f7c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:50:13 +0000 -Subject: [PATCH 079/124] WIP: dt-bindings: arm: amlogic: add support for Minix +Subject: [PATCH 075/120] WIP: dt-bindings: arm: amlogic: add support for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch index 3b039d33f8..9ce8b79988 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch @@ -1,7 +1,7 @@ -From 380f3ccdb8e979426723e8f44970c17cba846440 Mon Sep 17 00:00:00 2001 +From d498d3a2fbd330d5f85f75b0f752351fe6745d53 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:52:14 +0000 -Subject: [PATCH 080/124] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 076/120] WIP: arm64: dts: meson: add initial device-tree for Minix NEO-U1 The Minix NEO-U1 is an Android STB based on the Amlogic P200 (GXBB) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch similarity index 85% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index 6fd04aa5fb..3165dd11b5 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From f27efc1faf0aeec4b1cbd39a707170a363ac019b Mon Sep 17 00:00:00 2001 +From e262438bbff7de98affac0b45496fc1e96cab49e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 19 Aug 2022 21:32:21 +0000 -Subject: [PATCH 081/124] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 077/120] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to Minix NEO-U1 Add node aliases to prevent meson-vrtc from claiming /dev/rtc0 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch index 077829403f..37c6674cad 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch @@ -1,7 +1,7 @@ -From a9ba332ddc1e257b23ae9f10782c61acba1e9020 Mon Sep 17 00:00:00 2001 +From 13fcb2cd934993bf97d27f11db35f2a478d173b4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:28:50 +0000 -Subject: [PATCH 082/124] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 078/120] WIP: dt-bindings: arm: amlogic: add support for Beelink Mini MXIII The Beelink Mini MXIII is an Android STB based on the Amlogic P200 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch index b1d9c25321..8ce3bb7e0c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0079-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch @@ -1,7 +1,7 @@ -From 1aa48da78d4ce958f87d6575b3b7754a8f17e9c5 Mon Sep 17 00:00:00 2001 +From 7202d36700ce8a77703bcc0d1ee1b0ba1346927a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:26:00 +0000 -Subject: [PATCH 083/124] WIP: arm64: dts: meson: add support for Beelink Mini +Subject: [PATCH 079/120] WIP: arm64: dts: meson: add support for Beelink Mini MXIII This is a GXBB board that ships in two variants, one with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch index f1146e5bd7..322c78ffb6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch @@ -1,7 +1,7 @@ -From e7e0505675278f27b97535ded162f2636b03c205 Mon Sep 17 00:00:00 2001 +From 895414b87c0d4e345c304d48bd39cdf1b3408e81 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:48:02 +0000 -Subject: [PATCH 084/124] WIP: media: rc: add keymap for MeCool M8S Pro W +Subject: [PATCH 080/120] WIP: media: rc: add keymap for MeCool M8S Pro W remote Add a keymap and bindings for the simple IR (NEC) remote used with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch index 2428cc4262..1bbd9749f6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch @@ -1,7 +1,7 @@ -From 9bdca7d4092cae3f006591f958eea92e73111179 Mon Sep 17 00:00:00 2001 +From f16b6edb5e3e984a4dab17906af225280ff6d543 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:15:36 +0000 -Subject: [PATCH 085/124] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 081/120] WIP: dt-bindings: arm: amlogic: add support for MeCool M8S Pro W The MeCool M8S Pro W is an Android STB based on the Amlogic P281 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch index 255cb9da56..1bede5f714 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0082-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch @@ -1,7 +1,7 @@ -From 2a7053d28f65c8e6fdb092fa5505a5ad4cca3fde Mon Sep 17 00:00:00 2001 +From 8dbd84116d2dd92367fe327292e71104c84f5b0c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:17:41 +0000 -Subject: [PATCH 086/124] WIP: arm64: dts: meson: add support for MeCool M8S +Subject: [PATCH 082/120] WIP: arm64: dts: meson: add support for MeCool M8S Pro W MeCool M8S Pro W is an Android STB based on the Amlogic P281 (GXL) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch index 0fc2036586..0b9a74d026 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch @@ -1,7 +1,7 @@ -From 98313629608297592ca31d832ec93c876a3143e9 Mon Sep 17 00:00:00 2001 +From 98ae62b3a7453b7210a56a97b0d78d5772f5d797 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 02:40:20 +0000 -Subject: [PATCH 087/124] WIP: dt-bindings: arm: amlogic: add Vero 4K binding +Subject: [PATCH 083/120] WIP: dt-bindings: arm: amlogic: add Vero 4K binding Add the board binding for the OSMC Vero 4K STB device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch index 823573eb3f..8bdeaf5220 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0084-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch @@ -1,7 +1,7 @@ -From 25c119d7883625bc0bbeded88ce312a9c4102273 Mon Sep 17 00:00:00 2001 +From 3cf39f2b0406b2d6c9eaf85e1e8e920448357ba1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 04:06:17 +0000 -Subject: [PATCH 088/124] WIP: arm64: dts: meson: add support for OSMC Vero 4K +Subject: [PATCH 084/120] WIP: arm64: dts: meson: add support for OSMC Vero 4K The OSMC Vero 4K device is based on the Amlogic S905X (P212) reference design with the following specifications: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch index 9b732cf171..9f92a3a7e2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-sm1-x96-air-add-RTL8822CS-WiFi-a.patch @@ -1,7 +1,7 @@ -From 2969de85cdf6695415496013b30d5340b5a9b91d Mon Sep 17 00:00:00 2001 +From 98494cbc35117a83cff5e0c23d200243bdff4f43 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Apr 2022 11:21:21 +0000 -Subject: [PATCH 089/124] WIP: arm64: dts: meson: sm1-x96-air: add RTL8822CS +Subject: [PATCH 085/120] WIP: arm64: dts: meson: sm1-x96-air: add RTL8822CS WiFi and Bluetooth support Add support for the RTL8822CS WiFi and BT module on the board. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch index 9d0461dffa..f25987d739 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0086-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch @@ -1,7 +1,7 @@ -From b0c6b8195241c1b5ae1cae8ba88722997c5f7bf8 Mon Sep 17 00:00:00 2001 +From bbb4c8b01cf73f2e600b1d67b742d515e1f2e6d1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 10 Apr 2022 11:51:38 +0000 -Subject: [PATCH 090/124] WIP: media: rc: add keymap for Venz V10 remote +Subject: [PATCH 086/120] WIP: media: rc: add keymap for Venz V10 remote Add a keymap and bindings for the IR (NEC) remote used with the Venz V10 Android STB device. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch index 125292023a..d8eea145c9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0087-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch @@ -1,7 +1,7 @@ -From 878d4954456473d6f87606b48300b810762c7042 Mon Sep 17 00:00:00 2001 +From 45cee9708bfc6c1418d3a23513ea7af22bf56bd7 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:27:50 +0000 -Subject: [PATCH 091/124] WIP: dt-bindings: arm: amlogic: add S905L and Venz +Subject: [PATCH 087/120] WIP: dt-bindings: arm: amlogic: add S905L and Venz V10 bindings Add SOC bindings for S905L devices and the board binding for Venz V10. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch index d2ea73a715..a5ba97b33b 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0088-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch @@ -1,7 +1,7 @@ -From 2281bee85181532d637cd86e43e25ab35ebfecde Mon Sep 17 00:00:00 2001 +From 5cd1412e6bb2a6e445b6e6e8bb35c3f2e74bbf4f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:21:58 +0000 -Subject: [PATCH 092/124] WIP: arm64: dts: meson: add support for Venz V10 +Subject: [PATCH 088/120] WIP: arm64: dts: meson: add support for Venz V10 The Venz V10 is an Android STB based on the Amlogic P212 (GXL) reference design with an S905L chip and the following specs: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch index f9460b6597..9cf01f7aa4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch @@ -1,7 +1,7 @@ -From 2efd1b2f6307fd48c46cfce51509fe28734f894d Mon Sep 17 00:00:00 2001 +From de812cac86ea6d25dbe3d0e0862f762749519be4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:15:41 +0000 -Subject: [PATCH 093/124] WIP: dt-bindings: vendor-prefixes: add tbee prefix +Subject: [PATCH 089/120] WIP: dt-bindings: vendor-prefixes: add tbee prefix QUIDBox, Lda. are the Portuguese manufacturer of 'TBee' branded Android Set-Top Box devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch index cb472899b6..94bfbe7bc1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch @@ -1,7 +1,7 @@ -From 1ca81121e141538fd7afab3bd192e19946148891 Mon Sep 17 00:00:00 2001 +From 74edd1397576e08df2de0fb5944ddbd85d47172b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:05:11 +0000 -Subject: [PATCH 094/124] WIP: dt-bindings: arm: amlogic: add TBee Box binding +Subject: [PATCH 090/120] WIP: dt-bindings: arm: amlogic: add TBee Box binding Add the board binding for the TBee Box. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch index d2d85e04a5..bbfe362055 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0091-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch @@ -1,7 +1,7 @@ -From fe987620ab0641d1d8b039a3233c5576ac1a65ca Mon Sep 17 00:00:00 2001 +From c2965f88c61c79d8cb6378b3c5f7849c7e5fa487 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:23:12 +0000 -Subject: [PATCH 095/124] WIP: arm64: dts: meson: add support for TBee Box +Subject: [PATCH 091/120] WIP: arm64: dts: meson: add support for TBee Box The TBee Box is an Android STB based on the Amlogic P212 (GXL) reference design with an S905X chip and the following specs: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch index ffeebb5cdb..f3ed825f29 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch @@ -1,7 +1,7 @@ -From b8976aabd9e76725ea8a29b215a42e7320837819 Mon Sep 17 00:00:00 2001 +From 9d8461e4e3f8f54ba7b3a9ced9eb627d4f03376e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 24 Jul 2022 08:50:28 +0000 -Subject: [PATCH 096/124] WIP: dt-bindings: arm: amlogic: add Beelink GT1 +Subject: [PATCH 092/120] WIP: dt-bindings: arm: amlogic: add Beelink GT1 binding Add the board binding for the Shenzen AZW (Beelink) GT1 Android diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch index f22df44ab5..33c358eb49 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ -From a0cb03cf21bb5654eb6937e7dff58621d8806bfc Mon Sep 17 00:00:00 2001 +From 265a4f2df88d969f26edc1303bc0f6b1527d54d1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 10:01:03 +0000 -Subject: [PATCH 097/124] WIP: arm64: dts: meson: add support for Beelink GT1 +Subject: [PATCH 093/120] WIP: arm64: dts: meson: add support for Beelink GT1 The Beelink GT1 is based on the Amlogic S912 (Q200) reference design with the following specifications: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch index bde6d2ffd6..55dcf40a00 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch @@ -1,7 +1,7 @@ -From 8af283176bd32b91b81c317b65afbd47dc81a264 Mon Sep 17 00:00:00 2001 +From 2652e86837fdb21477d62ef1645e463da9139536 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 10:27:10 +0000 -Subject: [PATCH 098/124] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek +Subject: [PATCH 094/120] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek dtsi Add the vcc_5v regulator used by the audio DAC chip diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch similarity index 91% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch index 69cae97343..1b691325b9 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0095-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch @@ -1,7 +1,7 @@ -From ff2202cf381c97d5a4f94205f11ffbdcc464135d Mon Sep 17 00:00:00 2001 +From 80342953ec8e2d955dfa2abfa522d0b165e6d1be Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 13:39:23 +0000 -Subject: [PATCH 099/124] WIP: arm64: dts: meson: add audio lineout to WeTek +Subject: [PATCH 095/120] WIP: arm64: dts: meson: add audio lineout to WeTek Play2 Add support for the ES7134LV headphone output on the WeTek Play2 diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch index c326070dc2..ebd509d719 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0096-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch @@ -1,7 +1,7 @@ -From 30b5be28577f5dbd13fa8cfef2db02c59fc9b1f1 Mon Sep 17 00:00:00 2001 +From 6c308ef81cfef32b67d12c4f3ab19cc71c19d41e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 29 Jul 2022 08:29:20 +0000 -Subject: [PATCH 100/124] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek +Subject: [PATCH 096/120] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek Hub The original submission in commit d537d289de06 ("ARM64: dts: meson-gxbb: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch index c29dd5c2a3..ca3dc15b80 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0097-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch @@ -1,7 +1,7 @@ -From 736ef97e9ea4e09a69380e65f1f95484e6d38d19 Mon Sep 17 00:00:00 2001 +From b10501e41c8bede399b8465a9f02de357726f940 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:21:16 +0000 -Subject: [PATCH 101/124] WIP: ASoC: dt-bindings: add compatible for es8323-i2c +Subject: [PATCH 097/120] WIP: ASoC: dt-bindings: add compatible for es8323-i2c Add a compatible for the everest,es8323 audio codec used with a number of Amlogic and Rockchip board devices. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch index 085747b1d4..e3c0af35f0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-ASoC-codecs-add-support-for-ES8323.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0098-WIP-ASoC-codecs-add-support-for-ES8323.patch @@ -1,7 +1,7 @@ -From be7b6b7be99be3c13c75553c04c9513d498ec520 Mon Sep 17 00:00:00 2001 +From a1c69fc092755a59b25b7a90be3c97796bc77dc7 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:29:32 +0000 -Subject: [PATCH 102/124] WIP: ASoC: codecs: add support for ES8323 +Subject: [PATCH 098/120] WIP: ASoC: codecs: add support for ES8323 The ES8323 is compatible with the existing ES8328 codec driver, so add compatibles allowing it to be used. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch index bf383c57da..20098fd1a3 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-add-dream-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0099-WIP-dt-bindings-add-dream-vendor-prefix.patch @@ -1,7 +1,7 @@ -From 5489e9d75d64df5ceaf47459f91482bf161bfff7 Mon Sep 17 00:00:00 2001 +From eefcf6ac4648114ce7c0d818ee0a2c32508d09f6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:47:52 +0000 -Subject: [PATCH 103/124] WIP: dt-bindings: add dream vendor prefix +Subject: [PATCH 099/120] WIP: dt-bindings: add dream vendor prefix Add vendor prefix for Dream Property GmbH diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch index 1c63c68b88..2fd6803bf6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0100-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch @@ -1,7 +1,7 @@ -From 3148a47be228f148c76b538daa4fcb44f77805ae Mon Sep 17 00:00:00 2001 +From 04dd3e0b7c2b58a169dbfc93dca5e16b1eac18da Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:48:34 +0000 -Subject: [PATCH 104/124] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 100/120] WIP: dt-bindings: arm: amlogic: add support for Dreambox One/Two The Dreambox One and Dreambox Two are DVBS/T2 receiver boxes based diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch index c465b9f5c9..57d7399c37 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0101-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch @@ -1,7 +1,7 @@ -From 454f410492f7aaf33eb39e948727b01c40d08970 Mon Sep 17 00:00:00 2001 +From 98ea0ea77819bebf2f5cfdb07020edabdd5cfbb0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:51:20 +0000 -Subject: [PATCH 105/124] WIP: arm64: dts: meson: add initial device-trees for +Subject: [PATCH 101/120] WIP: arm64: dts: meson: add initial device-trees for Dreambox One/Two Dreambox One and Dreambox Two are based on the Amlogic W400 reference diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch similarity index 88% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch index 797da57d03..01f72411a6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch @@ -1,7 +1,7 @@ -From 4ad7019b4d4e8977c4dc92dbd3ed1cf03425deac Mon Sep 17 00:00:00 2001 +From 740b7806615c9781caa1f40e390b6075764bb85e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 04:27:45 +0000 -Subject: [PATCH 106/124] WIP: dt-bindings: arm: amlogic: add support for Ugoos +Subject: [PATCH 102/120] WIP: dt-bindings: arm: amlogic: add support for Ugoos AM6 plus The AM6 plus is a revised version of the AM6 Android box based diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch index 55586572f0..6e0ff777a7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch @@ -1,7 +1,7 @@ -From 7502bd1a593179a0ecdcb3e2323ef5a01e2c7c6d Mon Sep 17 00:00:00 2001 +From 65a60781fde14e49a5dd4c422cc909b61542cc50 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 05:29:31 +0000 -Subject: [PATCH 107/124] WIP: arm64: dts: meson: add support for Ugoos AM6 +Subject: [PATCH 103/120] WIP: arm64: dts: meson: add support for Ugoos AM6 Plus The Ugoos AM6 Plus is based on the Amlogic W400 (G12B) reference design diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch index 524f48fb91..8dd3d818cf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-P.patch @@ -1,7 +1,7 @@ -From fe8d7fee0ad2ae5170cb6affd3fd2737a553bdd5 Mon Sep 17 00:00:00 2001 +From ebe052f07c62ef9836b8fbdd6a4a56c70d55587e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 24 Jan 2023 16:57:20 +0000 -Subject: [PATCH 108/124] WIP: arm64: dts: meson: add support for MeCool M8S +Subject: [PATCH 104/120] WIP: arm64: dts: meson: add support for MeCool M8S Pro Plus This is an S905X device based on the P212 reference design, but diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch index 117ded5746..7d834a5756 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch @@ -1,7 +1,7 @@ -From 8f943925f5928e8d5293e9929d5406b71749d058 Mon Sep 17 00:00:00 2001 +From 84eeb2347773a89ae03b936c4ba36267b6dcb28f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 109/124] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan +Subject: [PATCH 105/120] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan support The A311D on Zero2 needs active cooling and the board includes a header to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch index 65e492d9e3..ff5e0cfa2a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch @@ -1,7 +1,7 @@ -From f4f9ddf6dd331448affe7d2669038fcf63c8cb8f Mon Sep 17 00:00:00 2001 +From d9dd54c8b2d2f7ec05e42392205a67b20dba4e83 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 09:59:58 +0000 -Subject: [PATCH 110/124] WIP: dt-bindings: arm: amlogic: add support for Tanix +Subject: [PATCH 106/120] WIP: dt-bindings: arm: amlogic: add support for Tanix TX9 Pro The Oranth Tanix TX9 Pro is an Android STB using the Amlogic S912 chip diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch index 14a7e22353..e2fa019954 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0107-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch @@ -1,7 +1,7 @@ -From 922db6bdf5bf8f1aec97201b380e573332d6d567 Mon Sep 17 00:00:00 2001 +From 551f6b28a561c121f00222c0f101c75dfad93d4b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:01:14 +0000 -Subject: [PATCH 111/124] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 107/120] WIP: arm64: dts: meson: add initial device-tree for Tanix TX9 Pro Oranth Tanix TX9 Pro is based on the Amlogic Q200 reference design with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch index fb0f0ecb80..9128e8ebca 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch @@ -1,7 +1,7 @@ -From 28eb18b1d12aa935a3015d8fcd8b1a4e5b8aaee0 Mon Sep 17 00:00:00 2001 +From 0b2aaaf3f86a0b904b45cb7ef30ae5804a2b95b9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:11:39 +0000 -Subject: [PATCH 112/124] WIP: arm64: dts: meson: add 7-segment display to +Subject: [PATCH 108/120] WIP: arm64: dts: meson: add 7-segment display to Tanix TX9 Pro Add support for the 7-segment VFD display of the device diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch index 6c1eb2e6b4..522a52e986 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch @@ -1,7 +1,7 @@ -From 090ff084fb42a1554f4da542fa1969ba5c1514ec Mon Sep 17 00:00:00 2001 +From dbcc56c1a71911850208663846c93f80307eb455 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 12 Feb 2023 10:45:54 +0000 -Subject: [PATCH 113/124] WIP: net: phy: add support for Maxio MAE0621A +Subject: [PATCH 109/120] WIP: net: phy: add support for Maxio MAE0621A Maxio MAE0621A is the external PHY found in some Amlogic set-top box devices based on the S905D chipset. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch index fd500df66c..09dfe7290a 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-add-sunvell-vendor-prefix.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-dt-bindings-add-sunvell-vendor-prefix.patch @@ -1,7 +1,7 @@ -From 89929d27582c48cd8e25e52a850d4374d940b0ed Mon Sep 17 00:00:00 2001 +From ecd545158c8a7a097246012838dc9e06cb616c53 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:38:16 +0000 -Subject: [PATCH 114/124] WIP: dt-bindings: add sunvell vendor prefix +Subject: [PATCH 110/120] WIP: dt-bindings: add sunvell vendor prefix Add vendor prefix for Shenzhen Sunvell Electronics Co., Ltd diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch index f11e219107..16f76f5e0f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch @@ -1,7 +1,7 @@ -From b707c63b54c6cb6e778b357b77c984d08526f43e Mon Sep 17 00:00:00 2001 +From 60054b9f599a0bfca817da045fd8d0458395fd0b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 18:36:56 +0000 -Subject: [PATCH 115/124] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus +Subject: [PATCH 111/120] WIP: dt-bindings: media: rc: add rc-sunvell-t95z-plus Add a binding for the rc-sunvell-t95z-plus remote keymap diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch index 247ecc1be7..7c8c861018 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From 1cd5494d2e1d93a11f47e5fe7bdfc368e97d3606 Mon Sep 17 00:00:00 2001 +From 2e8380078a0b306ba9f71dcfca1f8c5ccf0152f0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 19:03:10 +0000 -Subject: [PATCH 116/124] WIP: media: rc: add keymap for Sunvell T95Z Plus +Subject: [PATCH 112/120] WIP: media: rc: add keymap for Sunvell T95Z Plus Signed-off-by: Christian Hewitt --- diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch similarity index 87% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch index 219f916cc5..1dbe59bf0c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch @@ -1,7 +1,7 @@ -From 11d54d85afabca95aeadad5d760495f2585ba0e5 Mon Sep 17 00:00:00 2001 +From 3cba9548f0cd3d983ffa349516afdb0adf4a62ee Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:41:09 +0000 -Subject: [PATCH 117/124] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 113/120] WIP: dt-bindings: arm: amlogic: add support for Sunvell T95Z Plus Sunvell T95Z Plus is an Android STB based on the Amlogic Q200 reference diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch similarity index 96% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch index 1e5aace150..d6e1d66a89 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch @@ -1,7 +1,7 @@ -From 0345ea076cc9f1728e5d5fefeeaf93a8f43a432a Mon Sep 17 00:00:00 2001 +From 44e39b9ad7a1094d7cfd788481a219138cf34336 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 11:46:39 +0000 -Subject: [PATCH 118/124] WIP: arm64: dts: meson: add support for Sunvell T95Z +Subject: [PATCH 114/120] WIP: arm64: dts: meson: add support for Sunvell T95Z Plus Sunvell T95Z Pluz is based on the Amlogic Q200 reference design with diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch index 75e07a166b..92d5cb56a4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch @@ -1,7 +1,7 @@ -From 1797ebac6c5364810954a07a9a4b9cad206e0a89 Mon Sep 17 00:00:00 2001 +From 573181cefb8ff2013dd1f1d796d681ea99ac579a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 13:11:14 +0000 -Subject: [PATCH 119/124] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z +Subject: [PATCH 115/120] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z Plus making guesses at the config.. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch index 726f7d5e22..83898d15b7 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch @@ -1,7 +1,7 @@ -From f1cd1ca3923a1b9f24b7c4e51f573808d43281fd Mon Sep 17 00:00:00 2001 +From eab9517d3b0b48c6b62442f5c8c0edcc2e3e95e2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 19:25:18 +0000 -Subject: [PATCH 120/124] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 116/120] WIP: dt-bindings: arm: amlogic: add support for BananaPi M2S variants BananaPi M2S ships in two variants with Amlogic S922X or A311D chips. diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch index 5bacba9e6f..02b73f5e25 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0121-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch @@ -1,7 +1,7 @@ -From 0dec4707acf8cd15da290abdaf10696406f0488f Mon Sep 17 00:00:00 2001 +From 612b811375ca47c232e4edba77ef886f1597d55b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 09:22:24 +0000 -Subject: [PATCH 121/124] WIP: arm64: dts: meson: add support for BananaPi M2S +Subject: [PATCH 117/120] WIP: arm64: dts: meson: add support for BananaPi M2S variants BananaPi M2S ships in Amlogic S922X and A311D variants with the diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch similarity index 92% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch index b818ad7545..695ab4f782 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0122-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -1,7 +1,7 @@ -From 8eded64d29097fd5915f3416d6353fa810f8bdb1 Mon Sep 17 00:00:00 2001 +From 295d65e7123908556d5fb78683c256459b9be871 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Feb 2023 08:28:00 +0000 -Subject: [PATCH 122/124] WIP: arm64: dts: meson: p23x-q20x: fix usb init - +Subject: [PATCH 118/120] WIP: arm64: dts: meson: p23x-q20x: fix usb init - don't force otg Forcing OTG in the p23x-q20x dtsi causes USB problems on multiple boards: diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch index a9cdf62fd7..ce8909e8c0 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0123-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch @@ -1,7 +1,7 @@ -From 5141028915365644abf578857b16ad3a882a4f73 Mon Sep 17 00:00:00 2001 +From 43a534f7b59e2364221f972df637f5cc8e8ab153 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 7 Mar 2023 13:17:16 +0000 -Subject: [PATCH 123/124] WIP: arm64: dts: meson: add WiFi/BT support to +Subject: [PATCH 119/120] WIP: arm64: dts: meson: add WiFi/BT support to BananaPi M5 The BPI-M5 has an optional RTL8822CS WiFi/BT mezzanine board. Describe diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch new file mode 100644 index 0000000000..ed6a7374c3 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -0,0 +1,29 @@ +From df325d11ba5958c576be5594b3fd08d934d4139f Mon Sep 17 00:00:00 2001 +From: Christian Hewitt +Date: Tue, 14 Mar 2023 01:13:15 +0000 +Subject: [PATCH 120/120] WIP: media: meson: vdec: fix memory leak of + 'new_frame' + +Reported-by: kernel test robot +Reported-by: Dan Carpenter +Link: https://lore.kernel.org/r/202303120441.YFGHDOya-lkp@intel.com/ +Signed-off-by: Christian Hewitt +--- + drivers/staging/media/meson/vdec/codec_hevc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/staging/media/meson/vdec/codec_hevc.c b/drivers/staging/media/meson/vdec/codec_hevc.c +index fcaaa1ad50b8..b0d8623c3c7d 100644 +--- a/drivers/staging/media/meson/vdec/codec_hevc.c ++++ b/drivers/staging/media/meson/vdec/codec_hevc.c +@@ -731,6 +731,7 @@ codec_hevc_prepare_new_frame(struct amvdec_session *sess) + vbuf = v4l2_m2m_dst_buf_remove(sess->m2m_ctx); + if (!vbuf) { + dev_err(sess->core->dev, "No dst buffer available\n"); ++ kfree(new_frame); + return NULL; + } + +-- +2.34.1 + diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index b9759631e0..3122a3c071 100644 --- a/projects/Amlogic/linux/linux.aarch64.conf +++ b/projects/Amlogic/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.14 Kernel Configuration +# Linux/arm64 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1224,7 +1224,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # Classification # # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set @@ -4383,8 +4382,6 @@ CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set CONFIG_DRM_MESON=y CONFIG_DRM_MESON_DW_HDMI=y # CONFIG_DRM_ARCPGU is not set @@ -6586,7 +6583,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From 0a31b3eb4e61ce6fd1dee215e238416f8bdd5ba5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 9 Mar 2023 10:44:14 +0100 Subject: [PATCH 018/157] linux (RPi): update to 6.1.15-78eb7ea Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 5b6728b543..d9b7527dab 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="0c9bfdb7d67b1b81079d14f17a50fc1a35242c85" # 6.1.14 - PKG_SHA256="f85e20a4b4c9f5a67101264b5f7af7a2d14ee4bcfb3f1ec07c73f518b9daadbb" + PKG_VERSION="78eb7eaf61cc71dc4bd06c6d9f773c3fc2620e41" # 6.1.15 + PKG_SHA256="5dd3e8b7605338de397c4284407759d470d45c5244ff28e46481f0977d410245" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From d6a255cd1ba98ede87f21d7cf80e01bde6f05415 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:01:07 +0100 Subject: [PATCH 019/157] RPi: update to firmware 379d5bf Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 129779c25a..08c3464504 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="489d3e2d025f5035491004f50d58cfe9690e3976" -PKG_SHA256="bb6f06f0cfd0d6d810a0cb07225daddea3c0490a2e9bd69c4095341dc45dfc55" +PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" +PKG_SHA256="1147fffb0e9de3990c118c164c1032e5f0965d6b6e12e727aa2c353d8b795f57" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 3f9c5cb5e7..53770cc6fe 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="489d3e2d025f5035491004f50d58cfe9690e3976" -PKG_SHA256="ac2f526fd17c6b15dd6e67aceffb93c5ca7afa7cc1e757fdd06123d318126b99" +PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" +PKG_SHA256="a3224060294e02acf7440446d37764e1dda65bdeb395c817e6d9df9c07de2bcf" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 184cf5295c6d8e0e7910af400a12638ec25b7a17 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:03:58 +0100 Subject: [PATCH 020/157] linux (RPi): update to 6.1.16-02928eb Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index d9b7527dab..251fa4b727 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="78eb7eaf61cc71dc4bd06c6d9f773c3fc2620e41" # 6.1.15 - PKG_SHA256="5dd3e8b7605338de397c4284407759d470d45c5244ff28e46481f0977d410245" + PKG_VERSION="02928eb7eb435c6ec86745dcbb6ff99992128149" # 6.1.16 + PKG_SHA256="52420a584d66279c61467c13619eceb305afd9f32a854ab1cb9134289f9d54d0" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From dfc23bf03ef0ae1961d454cda1147e5dbd2b92cd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 03:03:58 +0100 Subject: [PATCH 021/157] linux (RPi): config options for 6.1.16-02928eb Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 5 +---- projects/RPi/devices/RPi2/linux/linux.arm.conf | 5 +---- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 6 +----- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 06ae1188d9..f54fb6657c 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.13 Kernel Configuration +# Linux/arm 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -2486,7 +2486,6 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -3751,8 +3750,6 @@ CONFIG_DRM_VC4=y CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 252d771412..e46f3d168e 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.13 Kernel Configuration +# Linux/arm 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -2716,7 +2716,6 @@ CONFIG_SENSORS_GPIO_FAN=m # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -3984,8 +3983,6 @@ CONFIG_DRM_VC4=y CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_GM12U320 is not set # CONFIG_DRM_PANEL_MIPI_DBI is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 3951b3b883..e6ef07c4c9 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.13 Kernel Configuration +# Linux/arm64 6.1.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -4580,8 +4580,6 @@ CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set @@ -5734,7 +5732,6 @@ CONFIG_DMA_BCM2835=y # CONFIG_DW_AXI_DMAC is not set # CONFIG_FSL_EDMA is not set # CONFIG_FSL_QDMA is not set -# CONFIG_HISI_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_MV_XOR_V2 is not set # CONFIG_PL330_DMA is not set @@ -6213,7 +6210,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y From cbc7d3e75c12412677590d330c6abb55ccf0cebd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 11 Mar 2023 22:53:29 +0100 Subject: [PATCH 022/157] linux (RPi): add patch to fix color format check in vc4_hdmi This fixes "no video" issue when working around EDID problems with eg video=... kernel command line parameter. Signed-off-by: Matthias Reichl --- .../linux-010-fix-vc4-rgb-check.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch diff --git a/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch b/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch new file mode 100644 index 0000000000..b610cb8b02 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch @@ -0,0 +1,41 @@ +From affc6fdac5376701ea468270af1b6fd9ca7616be Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 11 Mar 2023 22:41:17 +0100 +Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format check + +RGB is a mandatory format for all DVI and HDMI monitors so there's +no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in +color_formats. + +More importantly this checks breaks working around EDID issues with +eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin +as the RGB444 bit is only set when a valid EDID with digital bit set in +the input byte is present - which isn't the case when no EDID can be +read from the display device at all or with the in-built kernel EDIDs, +which mimic analog (VGA) displays without the digital bit set. + +So drop the check, if we output video on the HDMI connector we can +assume that the display can accept 8bit RGB. + +Signed-off-by: Matthias Reichl +--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c +index bd762b4e3e8f2..3c60c93c0f888 100644 +--- a/drivers/gpu/drm/vc4/vc4_hdmi.c ++++ b/drivers/gpu/drm/vc4/vc4_hdmi.c +@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi, + case VC4_HDMI_OUTPUT_RGB: + drm_dbg(dev, "RGB Format, checking the constraints.\n"); + +- if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444)) +- return false; +- + if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) { + drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n"); + return false; +-- +2.39.2 + From 37ef5910933e68a243f9863c500192d82ae56352 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 12:23:42 +0100 Subject: [PATCH 023/157] linux (RPi): update to 6.1.19-e3376fb Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 251fa4b727..52be6dfca7 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="02928eb7eb435c6ec86745dcbb6ff99992128149" # 6.1.16 - PKG_SHA256="52420a584d66279c61467c13619eceb305afd9f32a854ab1cb9134289f9d54d0" + PKG_VERSION="e3376fb94fda798d2a322e9c70789286132a1a9f" # 6.1.19 + PKG_SHA256="f1b518ea84ad269ec0a926623aaba43ea0c176e8254438bb4e8c87f267e87e1e" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From df7391bef629471a0337abc63ca84d1752462e58 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 12:23:42 +0100 Subject: [PATCH 024/157] linux (RPi): config options for 6.1.19-e3376fb Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 +-- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index f54fb6657c..510f3aa77f 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.16 Kernel Configuration +# Linux/arm 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1061,7 +1061,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # Classification # # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index e46f3d168e..9f83e2c9b4 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.16 Kernel Configuration +# Linux/arm 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1243,7 +1243,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_CLS=y # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index e6ef07c4c9..7ac7dc8283 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.16 Kernel Configuration +# Linux/arm64 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -1325,7 +1325,6 @@ CONFIG_NET_SCH_FQ_CODEL=y # CONFIG_NET_CLS=y # CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set # CONFIG_NET_CLS_ROUTE4 is not set # CONFIG_NET_CLS_FW is not set # CONFIG_NET_CLS_U32 is not set From aadbd4cace86d402c1e0a33477ea94e192b572f8 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 14 Mar 2023 16:16:27 +0100 Subject: [PATCH 025/157] RPi: update to firmware 2c9ca22 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 08c3464504..811defdee9 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" -PKG_SHA256="1147fffb0e9de3990c118c164c1032e5f0965d6b6e12e727aa2c353d8b795f57" +PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" +PKG_SHA256="92d8e4b6afe864c82cb19db387ab3b089d9148a1eadbc467c441fda4450bc5c3" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 53770cc6fe..404452751e 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="379d5bfa60bf3b0afff413a18344aaaf3bde0083" -PKG_SHA256="a3224060294e02acf7440446d37764e1dda65bdeb395c817e6d9df9c07de2bcf" +PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" +PKG_SHA256="575d16dfd8e481abbe7410e284b30706e82bd69f1f56528520bcb7dea72766f1" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From aacd3629ff078ba2666b8dcdaabe272297362a00 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 16 Mar 2023 07:55:49 +0000 Subject: [PATCH 026/157] aspnet6-runtime: update to 6.0.15 --- .../aspnet6-runtime/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk index c6688dc25b..d2bffba87d 100644 --- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk +++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aspnet6-runtime" -PKG_VERSION="6.0.14" +PKG_VERSION="6.0.15" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" PKG_DEPENDS_TARGET="toolchain" @@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual" case "${ARCH}" in "aarch64") - PKG_SHA256="c25a09594965b241ee42ddb41d5fb68afab1b58e37a68317f2678a7cf7309a8b" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/10762208-8896-423a-b7f3-5084c7548ce7/620af5c42e5a4087478890294dbe39fb/aspnetcore-runtime-6.0.14-linux-arm64.tar.gz" + PKG_SHA256="b37cf63d5962b2f67288a78b6541151c458bc9e67baaf5d5852b2214e858070b" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/0d9619a1-af06-40c6-9816-46d08c9e42d6/744ecc09a1058822dc08ae17a3dc9c77/aspnetcore-runtime-6.0.15-linux-arm64.tar.gz" ;; "arm") - PKG_SHA256="da7f9e231476cfb5f52f1f469a1ef22b5bb052a0ce53af97b21b70bca0abef0a" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4fac9144-1998-4d99-8000-6f8c8a19e9a3/3d722a6e310cf82c898f91138971be5b/aspnetcore-runtime-6.0.14-linux-arm.tar.gz" + PKG_SHA256="70afd74a6a070f629fcf44571582eec026442c4530f69afc142b92667542932c" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c7eade0f-81ff-4587-a58e-647702814ec4/1b8c56efc82990ee986d8dd52a9a09ab/aspnetcore-runtime-6.0.15-linux-arm.tar.gz" ;; "x86_64") - PKG_SHA256="721dc8e29892dcaaaab4bc7d2e8630a98d349f2d832855156f7b7898d1a55b07" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/092f7e69-2e23-40b3-8f36-628d25ac7109/4995e4e141b26ea049163af84592222c/aspnetcore-runtime-6.0.14-linux-x64.tar.gz" + PKG_SHA256="930b6254500e53a4f0d87b5551840a3ac8882e93797cf1e23da40652085d44dd" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4518a0d8-9a6b-4836-ada9-096afa24efd0/ad0d8ccefb6b6a36dc108417b74775cb/aspnetcore-runtime-6.0.15-linux-x64.tar.gz" ;; esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" From b7240325562f34bbe7d5b7eb2837a19a341093b5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 16 Mar 2023 07:57:22 +0000 Subject: [PATCH 027/157] dotnet-runtime: update aspnet6-runtime to 6.0.15 --- packages/addons/tools/dotnet-runtime/changelog.txt | 3 ++- packages/addons/tools/dotnet-runtime/package.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt index 927b2407d4..e0041c9d05 100644 --- a/packages/addons/tools/dotnet-runtime/changelog.txt +++ b/packages/addons/tools/dotnet-runtime/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- aspnet6-runtime: update to 6.0.15 diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index a8b31ac470..c37df7ec11 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dotnet-runtime" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" From a798e0b5d8946d46752a4927a82d28d53e43e626 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Mar 2023 15:40:34 +0000 Subject: [PATCH 028/157] linux: update Amlogic 6.1.y patches Signed-off-by: Christian Hewitt --- ...son-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch | 62 +++++++++++++------ ...arm-amlogic-add-support-for-BananaPi.patch | 2 +- ...son-add-support-for-BananaPi-M2S-var.patch | 2 +- ...son-p23x-q20x-fix-usb-init-don-t-for.patch | 2 +- ...son-add-WiFi-BT-support-to-BananaPi-.patch | 2 +- ...on-vdec-fix-memory-leak-of-new_frame.patch | 2 +- 6 files changed, 47 insertions(+), 25 deletions(-) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch index 92d5cb56a4..d14a391270 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch @@ -1,4 +1,4 @@ -From 573181cefb8ff2013dd1f1d796d681ea99ac579a Mon Sep 17 00:00:00 2001 +From af63c7cf2d001f7c3e86c310e8e0c42e681c1e8a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 13 Feb 2023 13:11:14 +0000 Subject: [PATCH 115/120] WIP: arm64: dts: meson: add SPI VFD to Sunvell T95Z @@ -8,14 +8,35 @@ making guesses at the config.. Signed-off-by: Christian Hewitt --- - .../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 67 +++++++++++++++++++ - 1 file changed, 67 insertions(+) + .../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 79 ++++++++++++++++++- + 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts -index 30ed5b6d325f..54a08da0a7eb 100644 +index 30ed5b6d325f..5f4bd19d5d77 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts -@@ -38,6 +38,73 @@ button-function { +@@ -17,11 +17,18 @@ / { + leds { + compatible = "gpio-leds"; + +- led-white { +- color = ; ++ led-green { ++ color = ; + function = LED_FUNCTION_POWER; + gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; + default-state = "on"; ++ }; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio GPIODV_25 GPIO_ACTIVE_HIGH>; ++ default-state = "off"; + panic-indicator; + }; + }; +@@ -38,6 +45,74 @@ button-function { press-threshold-microvolt = <10000>; }; }; @@ -49,39 +70,40 @@ index 30ed5b6d325f..54a08da0a7eb 100644 + #size-cells = <0>; + + titanmec,segment-mapping = /bits/ 8 <4 5 6 1 2 3 7>; -+ titanmec,grid = /bits/ 8 <4 3 2 1>; ++ titanmec,grid = /bits/ 8 <2 3 4 5 1>; + -+ alarm@5,1 { -+ reg = <5 1>; ++ alarm@1,1 { ++ reg = <1 1>; + function = LED_FUNCTION_ALARM; + }; + -+ usb@5,2 { -+ reg = <5 2>; ++ usb@1,2 { ++ reg = <1 2>; + function = LED_FUNCTION_USB; + }; -+ play@5,3 { -+ reg = <5 3>; ++ ++ play@1,3 { ++ reg = <1 3>; + function = "play"; + }; + -+ pause@5,4 { -+ reg = <5 4>; ++ pause@1,4 { ++ reg = <1 4>; + function = "pause"; + }; + -+ colon@5,5 { -+ reg = <5 5>; ++ colon@1,5 { ++ reg = <1 5>; + function = "colon"; + }; + -+ lan@5,6 { -+ reg = <5 6>; ++ lan@1,6 { ++ reg = <1 6>; + function = LED_FUNCTION_LAN; + }; + -+ wlan@5,7 { -+ reg = <5 7>; ++ wlan@1,7 { ++ reg = <1 7>; + function = LED_FUNCTION_WLAN; + }; + }; diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch index 83898d15b7..79581ad39f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch @@ -1,4 +1,4 @@ -From eab9517d3b0b48c6b62442f5c8c0edcc2e3e95e2 Mon Sep 17 00:00:00 2001 +From b5c002dd9e9e461be065de69ee0e6d25ac32eeb4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 19:25:18 +0000 Subject: [PATCH 116/120] WIP: dt-bindings: arm: amlogic: add support for diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch index 02b73f5e25..d818bed222 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch @@ -1,4 +1,4 @@ -From 612b811375ca47c232e4edba77ef886f1597d55b Mon Sep 17 00:00:00 2001 +From e3881a15e8b7bae508479ca00187ccc44f6435f2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 17 Feb 2023 09:22:24 +0000 Subject: [PATCH 117/120] WIP: arm64: dts: meson: add support for BananaPi M2S diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch index 695ab4f782..0b063cdc0c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -1,4 +1,4 @@ -From 295d65e7123908556d5fb78683c256459b9be871 Mon Sep 17 00:00:00 2001 +From eebf83427d051da9c8424ab5c351d98e31256c95 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Feb 2023 08:28:00 +0000 Subject: [PATCH 118/120] WIP: arm64: dts: meson: p23x-q20x: fix usb init - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch index ce8909e8c0..dbd85864ea 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-WiFi-BT-support-to-BananaPi-.patch @@ -1,4 +1,4 @@ -From 43a534f7b59e2364221f972df637f5cc8e8ab153 Mon Sep 17 00:00:00 2001 +From 9aac0fbe0ef9eb783562b52461504fd221efe92b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 7 Mar 2023 13:17:16 +0000 Subject: [PATCH 119/120] WIP: arm64: dts: meson: add WiFi/BT support to diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch index ed6a7374c3..ab30533340 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0120-WIP-media-meson-vdec-fix-memory-leak-of-new_frame.patch @@ -1,4 +1,4 @@ -From df325d11ba5958c576be5594b3fd08d934d4139f Mon Sep 17 00:00:00 2001 +From ffd9b1381e35fb4244a7173dfa8fbddfcc37c195 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 14 Mar 2023 01:13:15 +0000 Subject: [PATCH 120/120] WIP: media: meson: vdec: fix memory leak of From 4747e6e6889e31c8c7de97404830496c4dc77e44 Mon Sep 17 00:00:00 2001 From: Peter Vicman Date: Fri, 17 Mar 2023 18:32:26 +0100 Subject: [PATCH 029/157] systemd: fix error in 70-local-keyboard.hwdb introduced in https://github.com/LibreELEC/LibreELEC.tv/pull/7386 LibreELEC:~ # udevadm hwdb --update /usr/lib/udev/hwdb.d/70-local-keyboard.hwdb:28: Property expected, ignoring record with no properties. --- packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb index a857bda9b1..0b50351285 100644 --- a/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb +++ b/packages/sysutils/systemd/hwdb.d/70-local-keyboard.hwdb @@ -24,7 +24,7 @@ evdev:input:b0005v0957p1001* # g7bts remote evdev:input:b0005v045Ep0041e0300* - KEYBOARD_KEY_c0041=enter + KEYBOARD_KEY_c0041=enter # g20bts remote evdev:input:b0005v2B54p1600e0000* From 5f5e719c480e107f707690c48b1e7f04b0457477 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 26 Feb 2023 05:27:08 +0000 Subject: [PATCH 030/157] rsyslog: update to 8.2302.0 --- packages/addons/service/rsyslog/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk index 26d277015d..369f3de094 100644 --- a/packages/addons/service/rsyslog/package.mk +++ b/packages/addons/service/rsyslog/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rsyslog" -PKG_VERSION="8.2212.0" -PKG_SHA256="53b59a872e3dc7384cdc149abe9744916776f7057d905f3df6722d2eb1b04f35" +PKG_VERSION="8.2302.0" +PKG_SHA256="25415f85b662615ce3c83077d53758029e8743cb5929044bfd3564e3d626a3b9" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" From ef67de1ff493c899dbe8820ac44af40aff37145f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 10 Jan 2023 23:30:16 +0000 Subject: [PATCH 031/157] librelp: update to 1.11.0 --- .../addons/addon-depends/rsyslog-depends/librelp/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk index 6b1b2f457d..31bff0ad4c 100644 --- a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librelp" -PKG_VERSION="1.10.0" -PKG_SHA256="148db4e4d1a23e8136e9ec08810929a55faf5d45e24c2e3186d5ab34355dab31" +PKG_VERSION="1.11.0" +PKG_SHA256="7719b5f31e07cbb9872289ad32b787c613b5355d407982a0a2c4d69938457fd6" PKG_LICENSE="GPL" PKG_SITE="https://www.rsyslog.com/category/librelp/" PKG_URL="https://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz" From 902c7dcf419ce398845f41ab2a1b85ec7741b0c9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 13 Jan 2023 08:12:26 +0000 Subject: [PATCH 032/157] libpcap: update to 1.10.3 --- .../network-tools-depends/depends/libpcap/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk index f8a6d0591d..c05d57df7c 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libpcap" -PKG_VERSION="1.10.2" -PKG_SHA256="db6d79d4ad03b8b15fb16c42447d093ad3520c0ec0ae3d331104dcfb1ce77560" +PKG_VERSION="1.10.3" +PKG_SHA256="2a8885c403516cf7b0933ed4b14d6caa30e02052489ebd414dc75ac52e7559e6" PKG_LICENSE="GPL" PKG_SITE="https://www.tcpdump.org/" PKG_URL="https://www.tcpdump.org/release/libpcap-${PKG_VERSION}.tar.gz" From 47aba0a344a8d1f70e15e4c644de0daa2eccd26f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 10 Jan 2023 23:29:12 +0000 Subject: [PATCH 033/157] rar2fs: update to 1.29.6 --- .../addon-depends/network-tools-depends/rar2fs/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk index 9bdabb1b35..e3d0f3660d 100644 --- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rar2fs" -PKG_VERSION="1.29.5" -PKG_SHA256="a56e9f2fd3d5037087b8405cff85ce7ffb74a904176f33f55b7bd15117cff2be" +PKG_VERSION="1.29.6" +PKG_SHA256="ba3a0b649f2322498d54168f03d2e8bca9b1c96d70d0d97d83ea336a7525d4cb" PKG_LICENSE="GPL3" PKG_SITE="https://github.com/hasse69/rar2fs" PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz" From 3077558ecb052c1ad147dbe42dcf04a79ced9917 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 17 Feb 2023 21:55:19 +0000 Subject: [PATCH 034/157] iperf: update to 3.13 --- .../addon-depends/network-tools-depends/iperf/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk index 8863242f72..fff0e0edc4 100644 --- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iperf" -PKG_VERSION="3.12" -PKG_SHA256="e38e0a97b30a97b4355da93467160a20dea10932f6c17473774802e03d61d4a7" +PKG_VERSION="3.13" +PKG_SHA256="a49d23fe0d3b1482047ad7f3b9e384c69657a63b486c4e3f0ce512a077d94434" PKG_LICENSE="BSD" PKG_SITE="http://software.es.net/iperf/" PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz" From c2dec8fd3f3d030c6a2624646c7f8928dcf56b44 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 13 Jan 2023 08:11:42 +0000 Subject: [PATCH 035/157] tcpdump: update to 4.99.3 --- .../addon-depends/network-tools-depends/tcpdump/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk index 5136e7a216..b4eb4476f0 100644 --- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tcpdump" -PKG_VERSION="4.99.2" -PKG_SHA256="f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5" +PKG_VERSION="4.99.3" +PKG_SHA256="ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3" PKG_SITE="https://www.tcpdump.org/" PKG_URL="https://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libpcap libtirpc" From cd5095bc107bffab3b9b4bf7e04749ec0af8f614 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 07:08:22 +0000 Subject: [PATCH 036/157] network-tools: update to addon (1) - iperf: update to 3.13 - libpcap: update to 1.10.3 - rar2fs: update to 1.29.6 - tcpdump: update to 4.99.3 --- packages/addons/tools/network-tools/changelog.txt | 6 +++++- packages/addons/tools/network-tools/package.mk | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt index 927b2407d4..31b2a1463c 100644 --- a/packages/addons/tools/network-tools/changelog.txt +++ b/packages/addons/tools/network-tools/changelog.txt @@ -1 +1,5 @@ -initial release +1 +- iperf: update to 3.13 +- libpcap: update to 1.10.3 +- rar2fs: update to 1.29.6 +- tcpdump: update to 4.99.3 diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 52fe1c7904..b026a62f89 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="network-tools" PKG_VERSION="1.0" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" From 4cb93f084aaee738d90d8b5a2b80ada483d7e217 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 1 Jan 2023 05:03:55 +0000 Subject: [PATCH 037/157] bottom: update to 0.8.0 release notes: - https://github.com/ClementTsang/bottom/releases/tag/0.7.0 - https://github.com/ClementTsang/bottom/releases/tag/0.7.1 - https://github.com/ClementTsang/bottom/releases/tag/0.8.0 --- .../addon-depends/system-tools-depends/bottom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk index ff7cf3569d..7b66b6470b 100644 --- a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bottom" -PKG_VERSION="0.6.8" -PKG_SHA256="4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9" +PKG_VERSION="0.8.0" +PKG_SHA256="0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ClementTsang/bottom" PKG_URL="https://github.com/ClementTsang/bottom/archive/${PKG_VERSION}.tar.gz" From 458f3e191ad9ebc74fc3fd227443ee1bd5221014 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 16 Jan 2023 20:16:44 +0000 Subject: [PATCH 038/157] diffutils: update to 3.9 --- .../addon-depends/system-tools-depends/diffutils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index 6b2c49506b..abe1dc3e69 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="diffutils" -PKG_VERSION="3.8" -PKG_SHA256="a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" +PKG_VERSION="3.9" +PKG_SHA256="d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/diffutils/" PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" From 0926cf2776e89042f0f94b7bcfcf4f6483b97318 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 5 Feb 2023 22:54:06 +0000 Subject: [PATCH 039/157] htop: update to 3.2.2 --- .../addons/addon-depends/system-tools-depends/htop/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk index b415b91a3b..96f162f176 100644 --- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="htop" -PKG_VERSION="3.2.1" -PKG_SHA256="b5ffac1949a8daaabcffa659c0964360b5008782aae4dfa7702d2323cfb4f438" +PKG_VERSION="3.2.2" +PKG_SHA256="3829c742a835a0426db41bb039d1b976420c21ec65e93b35cd9bfd2d57f44ac8" PKG_LICENSE="GPL" PKG_SITE="https://hisham.hm/htop" PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz" From 35c0915eac68c0dc437907cd49e05534ce07d545 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 18 Jan 2023 20:56:08 +0000 Subject: [PATCH 040/157] ttyd: update to 1.7.3 and addon (1) release notes: - https://github.com/tsl0922/ttyd/releases/tag/1.7.3 log: - https://github.com/tsl0922/ttyd/compare/1.7.2...1.7.3 --- packages/addons/service/ttyd/changelog.txt | 3 ++- packages/addons/service/ttyd/package.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/addons/service/ttyd/changelog.txt b/packages/addons/service/ttyd/changelog.txt index 927b2407d4..49989f817e 100644 --- a/packages/addons/service/ttyd/changelog.txt +++ b/packages/addons/service/ttyd/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- ttyd: update to 1.7.3 diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index 8083855328..3e868973bd 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ttyd" -PKG_VERSION="1.7.2" -PKG_SHA256="edc44cd5319c0c9d0858081496cae36fc5c54ee7722e0a547dde39537dfb63de" -PKG_REV="0" +PKG_VERSION="1.7.3" +PKG_SHA256="c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/tsl0922/ttyd" From f222356059fcf5fcf4aab08a2f8748aaf630969a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Feb 2023 08:07:34 +0000 Subject: [PATCH 041/157] ccid: update to 1.5.2 --- packages/addons/addon-depends/ccid/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/ccid/package.mk b/packages/addons/addon-depends/ccid/package.mk index 97a1af535c..11fda75936 100644 --- a/packages/addons/addon-depends/ccid/package.mk +++ b/packages/addons/addon-depends/ccid/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ccid" -PKG_VERSION="1.5.1" -PKG_SHA256="e7a78c398ec0d617a4f98bac70d5b64f78689284dd0ae87d4692e2857f117377" +PKG_VERSION="1.5.2" +PKG_SHA256="13934487e6f8b48f699a16d367cc7a1af7a3ca874de721ac6e9633beb86e7219" PKG_LICENSE="LGPL" PKG_SITE="https://ccid.apdu.fr" PKG_URL="https://ccid.apdu.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" From 5c9a3e81fabe511b70cd41776c10e6ec7f67ba79 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 08:51:50 +0000 Subject: [PATCH 042/157] pcscd: rebuild with ccid 1.5.2 and addon (1) --- packages/addons/service/pcscd/changelog.txt | 3 ++- packages/addons/service/pcscd/package.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/pcscd/changelog.txt b/packages/addons/service/pcscd/changelog.txt index 927b2407d4..2f3f7693de 100644 --- a/packages/addons/service/pcscd/changelog.txt +++ b/packages/addons/service/pcscd/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- ccid: update to 1.5.2 diff --git a/packages/addons/service/pcscd/package.mk b/packages/addons/service/pcscd/package.mk index 87b663e72b..e93b450f7e 100644 --- a/packages/addons/service/pcscd/package.mk +++ b/packages/addons/service/pcscd/package.mk @@ -5,7 +5,7 @@ PKG_NAME="pcscd" PKG_VERSION="1.0" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" From d7b5ed8645345d884b9583b81346831aa0a4aaa7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 09:01:27 +0000 Subject: [PATCH 043/157] snapclient: update to 0.27.0 and addon (1) --- packages/addons/service/snapclient/changelog.txt | 4 +++- packages/addons/service/snapclient/package.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/snapclient/changelog.txt b/packages/addons/service/snapclient/changelog.txt index 927b2407d4..d8ff4d89e6 100644 --- a/packages/addons/service/snapclient/changelog.txt +++ b/packages/addons/service/snapclient/changelog.txt @@ -1 +1,3 @@ -initial release +1 +- asio: update to 1.27.0 +- snapcast: update to 0.27.0 diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index a08db365d7..ebd711f292 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapclient" -PKG_VERSION="0.26.0" -PKG_REV="0" +PKG_VERSION="0.27.0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast" From a426a3d1993681f4863ecc50d818e36ca55181f8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 09:01:58 +0000 Subject: [PATCH 044/157] snapserver: update to 0.27.0 and addon (1) --- packages/addons/service/snapserver/changelog.txt | 4 +++- packages/addons/service/snapserver/package.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/snapserver/changelog.txt b/packages/addons/service/snapserver/changelog.txt index 927b2407d4..d8ff4d89e6 100644 --- a/packages/addons/service/snapserver/changelog.txt +++ b/packages/addons/service/snapserver/changelog.txt @@ -1 +1,3 @@ -initial release +1 +- asio: update to 1.27.0 +- snapcast: update to 0.27.0 diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index 09599cc56a..d4ccda5dd3 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapserver" -PKG_VERSION="0.26.0" -PKG_REV="0" +PKG_VERSION="0.27.0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast" From 9f01192546e6626bec97893c21212ecec447f851 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Mar 2023 12:49:04 +0000 Subject: [PATCH 045/157] asio: update to 1.27.0 --- .../addons/addon-depends/snapcast-depends/asio/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index 903513aa86..1c810b6045 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="asio" -PKG_VERSION="1.24.0" -PKG_SHA256="6bb8139ebc1c97a4364f6e517b9258ecc96345a3bfc4d110f931ac123dbdc824" +PKG_VERSION="1.27.0" +PKG_SHA256="9bee8e50236ce7752325efde38cae223cbc85759ed49509d9cbc5d55458332d9" PKG_LICENSE="BSL" PKG_SITE="http://think-async.com/Asio" PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip" From b3166cec475a8bafaf79e5c5daa58ba0236dca3e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 5 Feb 2023 06:22:29 +0000 Subject: [PATCH 046/157] snapcast: update to 0.27.0 changelog: - https://github.com/badaix/snapcast/blob/develop/changelog.md log: - https://github.com/badaix/snapcast/compare/v0.26.0...v0.27.0 --- .../snapcast-depends/snapcast/package.mk | 4 +- .../snapcast/patches/snapcast-03_boost.patch | 48 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03_boost.patch diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk index 0feefb818a..de1afdac36 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="snapcast" -PKG_VERSION="0.26.0" -PKG_SHA256="166353267a5c461a3a0e7cbd05d78c4bfdaebeda078801df3b76820b54f27683" +PKG_VERSION="0.27.0" +PKG_SHA256="c662c6eafbaa42a4797a4ed6ba4a7602332abf99f6ba6ea88ff8ae59978a86ba" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/snapcast" PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03_boost.patch b/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03_boost.patch deleted file mode 100644 index 2e751adf30..0000000000 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/patches/snapcast-03_boost.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 438b83b0b93f2914b1830347b4e24722618d9ba4 -Author: Rudi Heitbaum -Date: Wed Dec 21 11:31:29 2022 +0000 - - server/control_session_http: update for boost 1.81.0 - -diff --git a/server/control_session_http.cpp b/server/control_session_http.cpp -index 385b3197..6522f5a9 100644 ---- a/server/control_session_http.cpp -+++ b/server/control_session_http.cpp -@@ -127,8 +127,8 @@ boost::beast::string_view mime_type(boost::beast::string_view path) - std::string path_cat(boost::beast::string_view base, boost::beast::string_view path) - { - if (base.empty()) -- return path.to_string(); -- std::string result = base.to_string(); -+ return static_cast(path); -+ std::string result = static_cast(base); - char constexpr path_separator = '/'; - if (result.back() == path_separator) - result.resize(result.size() - 1); -@@ -171,7 +171,7 @@ void ControlSessionHttp::handle_request(http::request(why); - res.prepare_payload(); - return res; - }; -@@ -182,7 +182,7 @@ void ControlSessionHttp::handle_request(http::request(target) + "' was not found."; - res.prepare_payload(); - return res; - }; -@@ -204,7 +204,7 @@ void ControlSessionHttp::handle_request(http::request(what) + "'"; - res.prepare_payload(); - return res; - }; From 7f73298c2717a6fcf74efc1c384c805577d60984 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Jan 2023 03:38:13 +0000 Subject: [PATCH 047/157] mpg123: update to 1.31.3 --- .../addon-depends/multimedia-tools-depends/mpg123/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk index 5ec8292024..09bd562c2b 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpg123" -PKG_VERSION="1.31.1" -PKG_SHA256="5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a" +PKG_VERSION="1.31.3" +PKG_SHA256="1ca77d3a69a5ff845b7a0536f783fee554e1041139a6b978f6afe14f5814ad1a" PKG_LICENSE="LGPLv2" PKG_SITE="https://www.mpg123.org/" PKG_URL="https://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2" From afe8988f4d53b4d2cf9b25819a64078af3162e0e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 28 Jan 2023 23:00:02 +0000 Subject: [PATCH 048/157] mpv-drmprime: update to 0.35.1 --- .../multimedia-tools-depends/mpv-drmprime/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk index afab1e7abf..d7bcdc1797 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpv-drmprime" -PKG_VERSION="0.35.0" -PKG_SHA256="dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00" +PKG_VERSION="0.35.1" +PKG_SHA256="41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9" PKG_LICENSE="GPL" PKG_SITE="https://mpv.io/" PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz" From 98a35fd1004bc42ad78f98e60c8c6d3d0f28cdc7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 08:43:05 +0000 Subject: [PATCH 049/157] multimedia-tools: update addon to (1) - mpg123: update to 1.31.3 - mpv-drmprime: update to 0.35.1 --- packages/addons/tools/multimedia-tools/changelog.txt | 4 +++- packages/addons/tools/multimedia-tools/package.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/multimedia-tools/changelog.txt b/packages/addons/tools/multimedia-tools/changelog.txt index 927b2407d4..51b810aade 100644 --- a/packages/addons/tools/multimedia-tools/changelog.txt +++ b/packages/addons/tools/multimedia-tools/changelog.txt @@ -1 +1,3 @@ -initial release +1 +- mpg123: update to 1.31.3 +- mpv-drmprime: update to 0.35.1 diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk index c046f909c4..9b39cb0ffb 100644 --- a/packages/addons/tools/multimedia-tools/package.mk +++ b/packages/addons/tools/multimedia-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="multimedia-tools" PKG_VERSION="1.0" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" From 4d4de8c13d24d22d8e963dd24e7156f06cb10ecc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 19 Jan 2023 18:03:28 +0000 Subject: [PATCH 050/157] mpd: update to 0.23.12 and addon (1) release notes: - https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.12/NEWS log: - https://github.com/MusicPlayerDaemon/MPD/compare/v0.23.11...v0.23.12 --- packages/addons/service/mpd/changelog.txt | 3 +- packages/addons/service/mpd/package.mk | 6 ++-- .../addons/service/mpd/patches/mpd-1682.patch | 32 ------------------- 3 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 packages/addons/service/mpd/patches/mpd-1682.patch diff --git a/packages/addons/service/mpd/changelog.txt b/packages/addons/service/mpd/changelog.txt index 927b2407d4..b0dcc7acb6 100644 --- a/packages/addons/service/mpd/changelog.txt +++ b/packages/addons/service/mpd/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- mpd: update to 0.23.12 diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 7582b55e66..65dc6f6a94 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mpd" -PKG_VERSION="0.23.11" -PKG_SHA256="edb4e7a8f9dff238b5610f9e2461940ea98c727a5462fafb1cdf836304dfdca9" -PKG_REV="0" +PKG_VERSION="0.23.12" +PKG_SHA256="b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://www.musicpd.org" diff --git a/packages/addons/service/mpd/patches/mpd-1682.patch b/packages/addons/service/mpd/patches/mpd-1682.patch deleted file mode 100644 index 697cc7a13e..0000000000 --- a/packages/addons/service/mpd/patches/mpd-1682.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e4b055eb6d08c5c8f8d85828ce4005d410e462cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Thu, 1 Dec 2022 08:29:23 +0700 -Subject: [PATCH] v0.23.x: RemoteTagCache: add missing include - -Fix build with Boost 1.81.0. `` was included by one of those boost headers, -however, it's no longer included as of Boost 1.81.0. - -`master` doesn't use `std::array` in this file. - -While we're at it, add all necessary inclusion files. ---- - src/RemoteTagCache.hxx | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/RemoteTagCache.hxx b/src/RemoteTagCache.hxx -index ed87f9706f..e8b198a219 100644 ---- a/src/RemoteTagCache.hxx -+++ b/src/RemoteTagCache.hxx -@@ -28,7 +28,11 @@ - #include - #include - -+#include -+#include -+#include - #include -+#include - - class RemoteTagCacheHandler; - From 48eb53b64770f69bd5a70c72230feb67135350e8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 23 Mar 2023 11:13:53 +0000 Subject: [PATCH 051/157] kodi-binary-addons: update to latest versions - pvr.hts: update 20.6.1-Nexus to 20.6.2-Nexus - pvr.iptvsimple: update 20.8.1-Nexus to 20.9.1-Nexus - pvr.vdr.vnsi: update 20.4.0-Nexus to 20.4.1-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk | 6 +++--- .../kodi-binary-addons/pvr.iptvsimple/package.mk | 6 +++--- .../mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk index 68297e872d..226a0bc8d8 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.hts" -PKG_VERSION="20.6.1-Nexus" -PKG_SHA256="d56cf6673bd1008c50e76990f77ffb4a3b6af2ef26968fd217f0d6dbb11328b1" -PKG_REV="2" +PKG_VERSION="20.6.2-Nexus" +PKG_SHA256="e77bd87f1f4d1abc06e32d0347a0bb635bc129bec43a07864cb8a9e6b0e4d374" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.hts" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index 6e5ceeb004..f0d9809aff 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.iptvsimple" -PKG_VERSION="20.8.1-Nexus" -PKG_SHA256="9077b3cd7b74d05ef2ac1d30b9ffb32232e39fd9620a7bbd9a9cb01fcbb638f9" -PKG_REV="2" +PKG_VERSION="20.9.1-Nexus" +PKG_SHA256="9871e305db254b064d836242962d5b57560245984efa5bd76067baa893594bef" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.iptvsimple" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk index 138d3596fe..702ce8e494 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.vdr.vnsi" -PKG_VERSION="20.4.0-Nexus" -PKG_SHA256="a781cfdf3a9d5d592eed5152200e69acf1214712f06c6b99573a1a01dadd62f5" -PKG_REV="5" +PKG_VERSION="20.4.1-Nexus" +PKG_SHA256="f26e2a9f1e9d83c5b44a8875b1f9cd37a0dbe59faf08002f083a4db95c9f84e0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.vdr.vnsi" From 1e008188bacb1ba6da6aa239c0862207ba5b4c9e Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 21 Mar 2023 17:36:22 +0100 Subject: [PATCH 052/157] tools/ffmpeg/gen-patches.sh: switch RPi to jc/test/4.4.1/main branch Signed-off-by: Matthias Reichl --- tools/ffmpeg/gen-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ffmpeg/gen-patches.sh b/tools/ffmpeg/gen-patches.sh index 1d786f2bda..c78c0a09b4 100755 --- a/tools/ffmpeg/gen-patches.sh +++ b/tools/ffmpeg/gen-patches.sh @@ -46,7 +46,7 @@ create_patch() { ;; rpi) REPO="https://github.com/jc-kynesim/rpi-ffmpeg" - REFSPEC="dev/4.4/rpi_import_1" + REFSPEC="test/4.4.1/main" PATCH_CREATE_DIFF="yes" ;; kodi) From 98490c32180feac6c2f2734cfcac6dce18648a3b Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 21 Mar 2023 17:36:54 +0100 Subject: [PATCH 053/157] ffmpeg: update rpi patch Patch created using revisions 7e0d640..df6e6f0 from branch test/4.4.1/main of https://github.com/jc-kynesim/rpi-ffmpeg --- .../ffmpeg/patches/rpi/ffmpeg-001-rpi.patch | 396 +++++++++++++++--- 1 file changed, 333 insertions(+), 63 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch index 87a16f85db..998d86ff6c 100644 --- a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch +++ b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure -index d7a3f507e8..83383b0317 100755 +index 4ba72bf84b..f2fc33e89b 100755 --- a/configure +++ b/configure @@ -207,6 +207,7 @@ External library support: @@ -104,7 +104,7 @@ index d7a3f507e8..83383b0317 100755 huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llvidencdsp" hymt_decoder_select="huffyuv_decoder" -@@ -2919,6 +2941,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" +@@ -2920,6 +2942,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" ffnvcodec_deps_any="libdl LoadLibrary" nvdec_deps="ffnvcodec" @@ -112,7 +112,7 @@ index d7a3f507e8..83383b0317 100755 vaapi_x11_deps="xlib" videotoolbox_hwaccel_deps="videotoolbox pthreads" videotoolbox_hwaccel_extralibs="-framework QuartzCore" -@@ -2960,6 +2983,12 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" +@@ -2961,6 +2984,12 @@ hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC" hevc_dxva2_hwaccel_select="hevc_decoder" hevc_nvdec_hwaccel_deps="nvdec" hevc_nvdec_hwaccel_select="hevc_decoder" @@ -125,7 +125,7 @@ index d7a3f507e8..83383b0317 100755 hevc_vaapi_hwaccel_deps="vaapi VAPictureParameterBufferHEVC" hevc_vaapi_hwaccel_select="hevc_decoder" hevc_vdpau_hwaccel_deps="vdpau VdpPictureInfoHEVC" -@@ -3437,8 +3466,13 @@ sndio_indev_deps="sndio" +@@ -3438,8 +3467,13 @@ sndio_indev_deps="sndio" sndio_outdev_deps="sndio" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_indev_suggest="libv4l2" @@ -139,7 +139,7 @@ index d7a3f507e8..83383b0317 100755 vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" -@@ -3657,6 +3691,7 @@ tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping" +@@ -3658,6 +3692,7 @@ tonemap_vaapi_filter_deps="vaapi VAProcFilterParameterBufferHDRToneMapping" tonemap_opencl_filter_deps="opencl const_nan" transpose_opencl_filter_deps="opencl" transpose_vaapi_filter_deps="vaapi VAProcPipelineCaps_rotation_flags" @@ -147,7 +147,7 @@ index d7a3f507e8..83383b0317 100755 unsharp_opencl_filter_deps="opencl" uspp_filter_deps="gpl avcodec" vaguedenoiser_filter_deps="gpl" -@@ -6154,6 +6189,12 @@ check_func_headers glob.h glob +@@ -6155,6 +6190,12 @@ check_func_headers glob.h glob enabled xlib && check_lib xlib "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext @@ -160,7 +160,7 @@ index d7a3f507e8..83383b0317 100755 check_headers direct.h check_headers dirent.h check_headers dxgidebug.h -@@ -6491,11 +6532,12 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt +@@ -6492,11 +6533,12 @@ enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto || die "ERROR: mbedTLS not found"; } enabled mediacodec && { enabled jni || die "ERROR: mediacodec requires --enable-jni"; } @@ -175,7 +175,7 @@ index d7a3f507e8..83383b0317 100755 die "ERROR: mmal not found" && check_func_headers interface/mmal/mmal.h "MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS"; } enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal" "-lOpenAL32"; do -@@ -6536,8 +6578,16 @@ enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/r +@@ -6537,8 +6579,16 @@ enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/r { enabled libdrm || die "ERROR: rkmpp requires --enable-libdrm"; } } @@ -192,7 +192,7 @@ index d7a3f507e8..83383b0317 100755 if enabled gcrypt; then GCRYPT_CONFIG="${cross_prefix}libgcrypt-config" -@@ -6617,6 +6667,10 @@ if enabled v4l2_m2m; then +@@ -6618,6 +6668,10 @@ if enabled v4l2_m2m; then check_cc vp9_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VP9;" fi @@ -203,7 +203,7 @@ index d7a3f507e8..83383b0317 100755 check_headers sys/videoio.h test_code cc sys/videoio.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete -@@ -7104,6 +7158,9 @@ check_deps $CONFIG_LIST \ +@@ -7105,6 +7159,9 @@ check_deps $CONFIG_LIST \ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86" enabled avresample && warn "Building with deprecated library libavresample" @@ -214,10 +214,10 @@ index d7a3f507e8..83383b0317 100755 haiku) disable memalign diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c -index 46bb014de8..0502ff71b8 100644 +index dec012a299..8aa13007f9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c -@@ -2186,8 +2186,8 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) +@@ -2189,8 +2189,8 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) ifilter->channel_layout != frame->channel_layout; break; case AVMEDIA_TYPE_VIDEO: @@ -228,7 +228,7 @@ index 46bb014de8..0502ff71b8 100644 break; } -@@ -2198,6 +2198,9 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) +@@ -2201,6 +2201,9 @@ static int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame) (ifilter->hw_frames_ctx && ifilter->hw_frames_ctx->data != frame->hw_frames_ctx->data)) need_reinit = 1; @@ -238,7 +238,7 @@ index 46bb014de8..0502ff71b8 100644 if (need_reinit) { ret = ifilter_parameters_from_frame(ifilter, frame); if (ret < 0) -@@ -2466,8 +2469,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ +@@ -2469,8 +2472,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ decoded_frame->top_field_first = ist->top_field_first; ist->frames_decoded++; @@ -248,7 +248,7 @@ index 46bb014de8..0502ff71b8 100644 err = ist->hwaccel_retrieve_data(ist->dec_ctx, decoded_frame); if (err < 0) goto fail; -@@ -2671,7 +2673,12 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo +@@ -2674,7 +2676,12 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo case AVMEDIA_TYPE_VIDEO: ret = decode_video (ist, repeating ? NULL : avpkt, &got_output, &duration_pts, !pkt, &decode_failed); @@ -262,7 +262,7 @@ index 46bb014de8..0502ff71b8 100644 if (pkt && pkt->duration) { duration_dts = av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); } else if(ist->dec_ctx->framerate.num != 0 && ist->dec_ctx->framerate.den != 0) { -@@ -2895,6 +2902,16 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat +@@ -2898,6 +2905,16 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat } else { const HWAccel *hwaccel = NULL; int i; @@ -279,7 +279,7 @@ index 46bb014de8..0502ff71b8 100644 for (i = 0; hwaccels[i].name; i++) { if (hwaccels[i].pix_fmt == *p) { hwaccel = &hwaccels[i]; -@@ -2990,6 +3007,15 @@ static int init_input_stream(int ist_index, char *error, int error_len) +@@ -2993,6 +3010,15 @@ static int init_input_stream(int ist_index, char *error, int error_len) return ret; } @@ -53003,11 +53003,15 @@ index b67b216331..ded1478a49 100644 + #endif /* AVCODEC_V4L2_M2M_H */ diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index ab07c0a24a..2bd113facb 100644 +index ab07c0a24a..4c5ad55547 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c -@@ -23,6 +23,10 @@ +@@ -21,8 +21,14 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ ++#include "config.h" ++ #include #include + @@ -53017,7 +53021,7 @@ index ab07c0a24a..2bd113facb 100644 #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" -@@ -30,75 +34,267 @@ +@@ -30,75 +36,274 @@ #include "libavcodec/decode.h" #include "libavcodec/internal.h" @@ -53031,6 +53035,13 @@ index ab07c0a24a..2bd113facb 100644 +#include "v4l2_req_dmabufs.h" -static int v4l2_try_start(AVCodecContext *avctx) ++#if CONFIG_H264_DECODER ++#include "h264_parse.h" ++#endif ++#if CONFIG_HEVC_DECODER ++#include "hevc_parse.h" ++#endif ++ +// Pick 64 for max last count - that is >1sec at 60fps +#define STATS_LAST_COUNT_MAX 64 +#define STATS_INTERVAL_MAX (1 << 30) @@ -53090,13 +53101,13 @@ index ab07c0a24a..2bd113facb 100644 + for (i = 0; i != 8; ++i) { + *s++ = ' '; + s = len > i + offset ? hex2(s, *m++) : dash2(s); - } ++ } + *s++ = ' '; + *s++ = ':'; + for (; i != 16; ++i) { + *s++ = ' '; + s = len > i + offset ? hex2(s, *m++) : dash2(s); -+ } + } + *s++ = 0; +} @@ -53333,7 +53344,7 @@ index ab07c0a24a..2bd113facb 100644 return 0; } -@@ -133,58 +329,548 @@ static int v4l2_prepare_decoder(V4L2m2mContext *s) +@@ -133,58 +338,742 @@ static int v4l2_prepare_decoder(V4L2m2mContext *s) return 0; } @@ -53541,23 +53552,23 @@ index ab07c0a24a..2bd113facb 100644 + } + return NQ_DRAINING; + } ++ ++ if (!s->buf_pkt.size) ++ return NQ_NONE; ++ ++ if ((ret = check_output_streamon(avctx, s)) != 0) ++ return ret; - ret = ff_v4l2_context_enqueue_packet(output, &s->buf_pkt); - if (ret < 0 && ret != AVERROR(EAGAIN)) - goto fail; -+ if (!s->buf_pkt.size) -+ return NQ_NONE; - -- /* if EAGAIN don't unref packet and try to enqueue in the next iteration */ -- if (ret != AVERROR(EAGAIN)) -+ if ((ret = check_output_streamon(avctx, s)) != 0) -+ return ret; -+ + if (s->extdata_sent) + ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, NULL, 0); + else + ret = ff_v4l2_context_enqueue_packet(&s->output, &s->buf_pkt, s->extdata_data, s->extdata_size); -+ + +- /* if EAGAIN don't unref packet and try to enqueue in the next iteration */ +- if (ret != AVERROR(EAGAIN)) + if (ret == AVERROR(EAGAIN)) { + // Out of input buffers - keep packet + ret = NQ_Q_FULL; @@ -53576,15 +53587,6 @@ index ab07c0a24a..2bd113facb 100644 - goto fail; + av_log(avctx, AV_LOG_ERROR, "Packet enqueue failure: err=%d\n", ret); + return ret; -+ } -+ } -+ -+ // Start if we haven't -+ { -+ const int ret2 = v4l2_try_start(avctx); -+ if (ret2) { -+ av_log(avctx, AV_LOG_DEBUG, "Start failure: err=%d\n", ret2); -+ ret = (ret2 == AVERROR(ENOMEM)) ? ret2 : NQ_DEAD; } } @@ -53592,9 +53594,18 @@ index ab07c0a24a..2bd113facb 100644 - return ff_v4l2_context_dequeue_frame(capture, frame, -1); -fail: - av_packet_unref(&s->buf_pkt); - return ret; - } - ++ // Start if we haven't ++ { ++ const int ret2 = v4l2_try_start(avctx); ++ if (ret2) { ++ av_log(avctx, AV_LOG_DEBUG, "Start failure: err=%d\n", ret2); ++ ret = (ret2 == AVERROR(ENOMEM)) ? ret2 : NQ_DEAD; ++ } ++ } ++ ++ return ret; ++} ++ +static int qbuf_wait(AVCodecContext * const avctx, V4L2Context * const ctx) +{ + int rv = 0; @@ -53751,10 +53762,131 @@ index ab07c0a24a..2bd113facb 100644 + ret = v4l2_receive_frame2(avctx, frame); + done = us_time(); + av_log(avctx, AV_LOG_TRACE, ">>> %s: rx time=%" PRId64 ", rv=%d\n", __func__, done - now, ret); -+ return ret; -+} + return ret; + } +#endif + ++static uint32_t ++avprofile_to_v4l2(const enum AVCodecID codec_id, const int avprofile) ++{ ++ switch (codec_id) { ++ case AV_CODEC_ID_H264: ++ switch (avprofile) { ++ case FF_PROFILE_H264_BASELINE: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE; ++ case FF_PROFILE_H264_CONSTRAINED_BASELINE: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE; ++ case FF_PROFILE_H264_MAIN: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_MAIN; ++ case FF_PROFILE_H264_EXTENDED: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED; ++ case FF_PROFILE_H264_HIGH: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH; ++ case FF_PROFILE_H264_HIGH_10: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10; ++ case FF_PROFILE_H264_HIGH_10_INTRA: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_10_INTRA; ++ case FF_PROFILE_H264_MULTIVIEW_HIGH: ++ case FF_PROFILE_H264_HIGH_422: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422; ++ case FF_PROFILE_H264_HIGH_422_INTRA: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_422_INTRA; ++ case FF_PROFILE_H264_STEREO_HIGH: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH; ++ case FF_PROFILE_H264_HIGH_444_PREDICTIVE: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_PREDICTIVE; ++ case FF_PROFILE_H264_HIGH_444_INTRA: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_HIGH_444_INTRA; ++ case FF_PROFILE_H264_CAVLC_444: ++ return V4L2_MPEG_VIDEO_H264_PROFILE_CAVLC_444_INTRA; ++ case FF_PROFILE_H264_HIGH_444: ++ default: ++ break; ++// V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_BASELINE = 12, ++// V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH = 13, ++// V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA = 14, ++// V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH = 16, ++// V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH = 17, ++ } ++ break; ++ case AV_CODEC_ID_MPEG2VIDEO: ++ case AV_CODEC_ID_MPEG4: ++ case AV_CODEC_ID_VC1: ++ case AV_CODEC_ID_VP8: ++ case AV_CODEC_ID_VP9: ++ case AV_CODEC_ID_AV1: ++ // Most profiles are a simple number that matches the V4L2 enum ++ return avprofile; ++ default: ++ break; ++ } ++ return ~(uint32_t)0; ++} ++ ++// This check mirrors Chrome's profile check by testing to see if the profile ++// exists as a possible value for the V4L2 profile control ++static int ++check_profile(AVCodecContext *const avctx, V4L2m2mContext *const s) ++{ ++ struct v4l2_queryctrl query_ctrl; ++ struct v4l2_querymenu query_menu; ++ uint32_t profile_id; ++ ++ // An unset profile is almost certainly zero or -99 - do not reject ++ if (avctx->profile <= 0) { ++ av_log(avctx, AV_LOG_VERBOSE, "Profile <= 0 - check skipped\n"); ++ return 0; ++ } ++ ++ memset(&query_ctrl, 0, sizeof(query_ctrl)); ++ switch (avctx->codec_id) { ++ case AV_CODEC_ID_MPEG2VIDEO: ++ profile_id = V4L2_CID_MPEG_VIDEO_MPEG2_PROFILE; ++ break; ++ case AV_CODEC_ID_MPEG4: ++ profile_id = V4L2_CID_MPEG_VIDEO_MPEG4_PROFILE; ++ break; ++ case AV_CODEC_ID_H264: ++ profile_id = V4L2_CID_MPEG_VIDEO_H264_PROFILE; ++ break; ++ case AV_CODEC_ID_VP8: ++ profile_id = V4L2_CID_MPEG_VIDEO_VP8_PROFILE; ++ break; ++ case AV_CODEC_ID_VP9: ++ profile_id = V4L2_CID_MPEG_VIDEO_VP9_PROFILE; ++ break; ++#ifdef V4L2_CID_MPEG_VIDEO_AV1_PROFILE ++ case AV_CODEC_ID_AV1: ++ profile_id = V4L2_CID_MPEG_VIDEO_AV1_PROFILE; ++ break; ++#endif ++ default: ++ av_log(avctx, AV_LOG_VERBOSE, "Can't map profile for codec id %d; profile check skipped\n", avctx->codec_id); ++ return 0; ++ } ++ ++ query_ctrl = (struct v4l2_queryctrl){.id = profile_id}; ++ if (ioctl(s->fd, VIDIOC_QUERYCTRL, &query_ctrl) != 0) { ++ av_log(avctx, AV_LOG_VERBOSE, "Query profile ctrl (%#x) not supported: assume OK\n", query_ctrl.id); ++ } ++ else { ++ av_log(avctx, AV_LOG_DEBUG, "%s: Control supported: %#x\n", __func__, query_ctrl.id); ++ ++ query_menu = (struct v4l2_querymenu){ ++ .id = query_ctrl.id, ++ .index = avprofile_to_v4l2(avctx->codec_id, avctx->profile), ++ }; ++ ++ if (query_menu.index > query_ctrl.maximum || ++ query_menu.index < query_ctrl.minimum || ++ ioctl(s->fd, VIDIOC_QUERYMENU, &query_menu) != 0) { ++ return AVERROR(ENOENT); ++ } ++ } ++ ++ return 0; ++}; ++ +static int +check_size(AVCodecContext * const avctx, V4L2m2mContext * const s) +{ @@ -53875,6 +54007,78 @@ index ab07c0a24a..2bd113facb 100644 + return size + (1 << 16); +} + ++static void ++parse_extradata(AVCodecContext *avctx) ++{ ++ if (!avctx->extradata || !avctx->extradata_size) ++ return; ++ ++ switch (avctx->codec_id) { ++#if CONFIG_H264_DECODER ++ case AV_CODEC_ID_H264: ++ { ++ H264ParamSets ps = {{NULL}}; ++ int is_avc = 0; ++ int nal_length_size = 0; ++ int ret; ++ ++ ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size, ++ &ps, &is_avc, &nal_length_size, ++ avctx->err_recognition, avctx); ++ if (ret > 0) { ++ const SPS * sps = NULL; ++ unsigned int i; ++ for (i = 0; i != MAX_SPS_COUNT; ++i) { ++ if (ps.sps_list[i]) { ++ sps = (const SPS *)ps.sps_list[i]->data; ++ break; ++ } ++ } ++ if (sps) { ++ avctx->profile = ff_h264_get_profile(sps); ++ avctx->level = sps->level_idc; ++ } ++ } ++ ff_h264_ps_uninit(&ps); ++ break; ++ } ++#endif ++#if CONFIG_HEVC_DECODER ++ case AV_CODEC_ID_HEVC: ++ { ++ HEVCParamSets ps = {{NULL}}; ++ HEVCSEI sei = {{{{0}}}}; ++ int is_nalff = 0; ++ int nal_length_size = 0; ++ int ret; ++ ++ ret = ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size, ++ &ps, &sei, &is_nalff, &nal_length_size, ++ avctx->err_recognition, 0, avctx); ++ if (ret > 0) { ++ const HEVCSPS * sps = NULL; ++ unsigned int i; ++ for (i = 0; i != HEVC_MAX_SPS_COUNT; ++i) { ++ if (ps.sps_list[i]) { ++ sps = (const HEVCSPS *)ps.sps_list[i]->data; ++ break; ++ } ++ } ++ if (sps) { ++ avctx->profile = sps->ptl.general_ptl.profile_idc; ++ avctx->level = sps->ptl.general_ptl.level_idc; ++ } ++ } ++ ff_hevc_ps_uninit(&ps); ++ ff_hevc_reset_sei(&sei); ++ break; ++ } ++#endif ++ default: ++ break; ++ } ++} + static av_cold int v4l2_decode_init(AVCodecContext *avctx) { V4L2Context *capture, *output; @@ -53895,7 +54099,8 @@ index ab07c0a24a..2bd113facb 100644 + avctx->ticks_per_frame = 2; + } + -+ av_log(avctx, AV_LOG_INFO, "level=%d\n", avctx->level); ++ parse_extradata(avctx); ++ ret = ff_v4l2_m2m_create_context(priv, &s); if (ret < 0) return ret; @@ -53906,7 +54111,7 @@ index ab07c0a24a..2bd113facb 100644 capture = &s->capture; output = &s->output; -@@ -192,14 +878,65 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) +@@ -192,14 +1081,65 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) * by the v4l2 driver; this event will trigger a full pipeline reconfig and * the proper values will be retrieved from the kernel driver. */ @@ -53974,7 +54179,7 @@ index ab07c0a24a..2bd113facb 100644 s->avctx = avctx; ret = ff_v4l2_m2m_codec_init(priv); -@@ -208,12 +945,84 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) +@@ -208,12 +1148,88 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) return ret; } @@ -53997,6 +54202,10 @@ index ab07c0a24a..2bd113facb 100644 + if ((ret = check_size(avctx, s)) != 0) + return ret; + ++ if ((ret = check_profile(avctx, s)) != 0) { ++ av_log(avctx, AV_LOG_WARNING, "Profile %d not supported by decode\n", avctx->profile); ++ return ret; ++ } + return 0; } @@ -54061,7 +54270,7 @@ index ab07c0a24a..2bd113facb 100644 } #define OFFSET(x) offsetof(V4L2m2mPriv, x) -@@ -222,10 +1031,17 @@ static av_cold int v4l2_decode_close(AVCodecContext *avctx) +@@ -222,10 +1238,17 @@ static av_cold int v4l2_decode_close(AVCodecContext *avctx) static const AVOption options[] = { V4L_M2M_DEFAULT_OPTS, { "num_capture_buffers", "Number of buffers in the capture context", @@ -54080,7 +54289,7 @@ index ab07c0a24a..2bd113facb 100644 #define M2MDEC_CLASS(NAME) \ static const AVClass v4l2_m2m_ ## NAME ## _dec_class = { \ .class_name = #NAME "_v4l2m2m_decoder", \ -@@ -246,9 +1062,15 @@ static const AVOption options[] = { +@@ -246,9 +1269,15 @@ static const AVOption options[] = { .init = v4l2_decode_init, \ .receive_frame = v4l2_receive_frame, \ .close = v4l2_decode_close, \ @@ -59855,7 +60064,7 @@ index 0000000000..99c90064ea + +#endif diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c -index ea93e11588..a9e0c6323e 100644 +index d4ceb60791..fb7f839c5e 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -486,7 +486,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) @@ -62325,6 +62534,67 @@ index f6b572b3de..44fe8b679c 100644 if (ret < 0) return ret; av_log(log_ctx, AV_LOG_ERROR, +diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c +index 15d897cff6..c134759bbf 100644 +--- a/libavfilter/buffersink.c ++++ b/libavfilter/buffersink.c +@@ -58,6 +58,11 @@ typedef struct BufferSinkContext { + int sample_rates_size; + + AVFrame *peeked_frame; ++ ++ union { ++ av_buffersink_alloc_video_frame * video; ++ } alloc_cb; ++ void * alloc_v; + } BufferSinkContext; + + #define NB_ITEMS(list) (list ## _size / sizeof(*list)) +@@ -148,6 +153,22 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, + return get_frame_internal(ctx, frame, 0, nb_samples); + } + ++static AVFrame * alloc_video_buffer(AVFilterLink *link, int w, int h) ++{ ++ AVFilterContext * const ctx = link->dst; ++ BufferSinkContext * const bs = ctx->priv; ++ return bs->alloc_cb.video ? bs->alloc_cb.video(ctx, bs->alloc_v, w, h) : ++ ff_default_get_video_buffer(link, w, h); ++} ++ ++int av_buffersink_set_alloc_video_frame(AVFilterContext *ctx, av_buffersink_alloc_video_frame * cb, void * v) ++{ ++ BufferSinkContext * const bs = ctx->priv; ++ bs->alloc_cb.video = cb; ++ bs->alloc_v = v; ++ return 0; ++} ++ + #if FF_API_BUFFERSINK_ALLOC + AVBufferSinkParams *av_buffersink_params_alloc(void) + { +@@ -331,6 +352,7 @@ static const AVFilterPad avfilter_vsink_buffer_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, ++ .get_video_buffer = alloc_video_buffer, + }, + { NULL } + }; +diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h +index 69ed0f29a8..a3aa6fcb3c 100644 +--- a/libavfilter/buffersink.h ++++ b/libavfilter/buffersink.h +@@ -198,6 +198,9 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame); + */ + int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples); + ++typedef AVFrame * av_buffersink_alloc_video_frame(AVFilterContext * ctx, void * v, int w, int h); ++int av_buffersink_set_alloc_video_frame(AVFilterContext *ctx, av_buffersink_alloc_video_frame * cb, void * v); ++ + /** + * @} + */ diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index da1cf9941e..c588ed23cb 100644 --- a/libavfilter/buffersrc.c @@ -64695,7 +64965,7 @@ index 0000000000..61c03a385c +}; + diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c -index bbf231f2a4..22571c89a3 100644 +index b4284a8778..692265593c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -58,6 +58,9 @@ @@ -64723,7 +64993,7 @@ index bbf231f2a4..22571c89a3 100644 case AV_CODEC_ID_HEVC: return ff_isom_write_hvcc(dyn_cp, par->extradata, par->extradata_size, 0); -@@ -2258,7 +2265,9 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) +@@ -2259,7 +2266,9 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) break; // FIXME: Remove the following once libaom starts propagating extradata during init() // See https://bugs.chromium.org/p/aomedia/issues/detail?id=2012 @@ -64733,7 +65003,7 @@ index bbf231f2a4..22571c89a3 100644 if (side_data_size && mkv->track.bc && !par->extradata_size) { AVIOContext *dyn_cp; uint8_t *codecpriv; -@@ -2266,7 +2275,10 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) +@@ -2267,7 +2276,10 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) ret = avio_open_dyn_buf(&dyn_cp); if (ret < 0) return ret; @@ -64745,7 +65015,7 @@ index bbf231f2a4..22571c89a3 100644 codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); if ((ret = dyn_cp->error) < 0 || !codecpriv_size && (ret = AVERROR_INVALIDDATA)) { -@@ -2274,8 +2286,25 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) +@@ -2275,8 +2287,25 @@ static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) return ret; } avio_seek(mkv->track.bc, track->codecpriv_offset, SEEK_SET); @@ -64774,10 +65044,10 @@ index bbf231f2a4..22571c89a3 100644 ret = ff_alloc_extradata(par, side_data_size); if (ret < 0) diff --git a/libavformat/movenc.c b/libavformat/movenc.c -index bade57dcea..d23101b23f 100644 +index 2cd5773dc5..0cbbc094de 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c -@@ -5913,6 +5913,7 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) +@@ -5926,6 +5926,7 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) if (trk->par->codec_id == AV_CODEC_ID_MP4ALS || trk->par->codec_id == AV_CODEC_ID_AAC || trk->par->codec_id == AV_CODEC_ID_AV1 || @@ -64786,10 +65056,10 @@ index bade57dcea..d23101b23f 100644 buffer_size_t side_size; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); diff --git a/libavformat/utils.c b/libavformat/utils.c -index 1384b56771..27479e3c40 100644 +index 75e5350a27..e10b493dae 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c -@@ -3011,6 +3011,40 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr) +@@ -3013,6 +3013,40 @@ static int has_codec_parameters(AVStream *st, const char **errmsg_ptr) return 1; } @@ -64830,7 +65100,7 @@ index 1384b56771..27479e3c40 100644 /* returns 1 or 0 if or if not decoded data was returned, or a negative error */ static int try_decode_frame(AVFormatContext *s, AVStream *st, const AVPacket *avpkt, AVDictionary **options) -@@ -3049,7 +3083,11 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, +@@ -3051,7 +3085,11 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, av_dict_set(options ? options : &thread_opt, "lowres", "0", 0); if (s->codec_whitelist) av_dict_set(options ? options : &thread_opt, "codec_whitelist", s->codec_whitelist, 0); @@ -64843,7 +65113,7 @@ index 1384b56771..27479e3c40 100644 if (!options) av_dict_free(&thread_opt); if (ret < 0) { -@@ -3080,6 +3118,14 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, +@@ -3082,6 +3120,14 @@ static int try_decode_frame(AVFormatContext *s, AVStream *st, if (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO) { ret = avcodec_send_packet(avctx, &pkt); @@ -64858,7 +65128,7 @@ index 1384b56771..27479e3c40 100644 if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) break; if (ret >= 0) -@@ -3708,9 +3754,20 @@ FF_ENABLE_DEPRECATION_WARNINGS +@@ -3710,9 +3756,20 @@ FF_ENABLE_DEPRECATION_WARNINGS // Try to just open decoders, in case this is enough to get parameters. if (!has_codec_parameters(st, NULL) && st->internal->request_probe <= 0) { if (codec && !avctx->codec) From c1fd8cdbe6bd6ff5f6fb41292131fc68d256211f Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 21 Mar 2023 17:46:17 +0100 Subject: [PATCH 054/157] kodi (RPi): add patches to support arbitrary pixel formats Signed-off-by: Matthias Reichl --- ...DRMPRIME-Also-support-YUV420-buffers.patch | 4 +- ...et-max-bpc-for-high-bit-depth-videos.patch | 4 +- ...eDRMPRIME-add-colourspace-connector-.patch | 4 +- ...MPRIME-Adjust-av-formats-to-match-re.patch | 4 +- ...PRIME-Support-YUV422-and-YUV444-form.patch | 93 +++++ ...A-Support-exporting-YCbCr444-buffers.patch | 55 +++ ...PRIME-Add-support-for-arbitrary-outp.patch | 332 ++++++++++++++++++ 7 files changed, 488 insertions(+), 8 deletions(-) create mode 100644 projects/RPi/patches/kodi/0005-DVDVideoCodecDRMPRIME-Support-YUV422-and-YUV444-form.patch create mode 100644 projects/RPi/patches/kodi/0006-VideoBufferDMA-Support-exporting-YCbCr444-buffers.patch create mode 100644 projects/RPi/patches/kodi/0007-DVDVideoCodecDRMPRIME-Add-support-for-arbitrary-outp.patch diff --git a/projects/RPi/patches/kodi/0001-CDVDVideoCodecDRMPRIME-Also-support-YUV420-buffers.patch b/projects/RPi/patches/kodi/0001-CDVDVideoCodecDRMPRIME-Also-support-YUV420-buffers.patch index 0f2c93f4c2..c4b3d66cb3 100644 --- a/projects/RPi/patches/kodi/0001-CDVDVideoCodecDRMPRIME-Also-support-YUV420-buffers.patch +++ b/projects/RPi/patches/kodi/0001-CDVDVideoCodecDRMPRIME-Also-support-YUV420-buffers.patch @@ -1,7 +1,7 @@ From 97d39a46091b65e4355ce7e545bdec46ff2f87de Mon Sep 17 00:00:00 2001 From: popcornmix Date: Sat, 11 Sep 2021 14:03:05 +0100 -Subject: [PATCH 1/4] CDVDVideoCodecDRMPRIME: Also support YUV420 buffers +Subject: [PATCH 1/7] CDVDVideoCodecDRMPRIME: Also support YUV420 buffers CDVDVideoCodecDRMPRIME: Add support for deinterlace of sw decoded buffers @@ -50,5 +50,5 @@ index 20a5c24f53..a36107c515 100644 if (ret < 0) { -- -2.39.0 +2.39.2 diff --git a/projects/RPi/patches/kodi/0002-gbm-Set-max-bpc-for-high-bit-depth-videos.patch b/projects/RPi/patches/kodi/0002-gbm-Set-max-bpc-for-high-bit-depth-videos.patch index b0abba97ed..6e4b0e8da5 100644 --- a/projects/RPi/patches/kodi/0002-gbm-Set-max-bpc-for-high-bit-depth-videos.patch +++ b/projects/RPi/patches/kodi/0002-gbm-Set-max-bpc-for-high-bit-depth-videos.patch @@ -1,7 +1,7 @@ From 42b30508bfe5451d4dc2884acfde9e0ec2d58c92 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Fri, 3 Dec 2021 16:00:50 +0000 -Subject: [PATCH 2/4] gbm: Set max bpc for high bit depth videos +Subject: [PATCH 2/7] gbm: Set max bpc for high bit depth videos --- .../HwDecRender/VideoLayerBridgeDRMPRIME.cpp | 16 ++++++++++++++++ @@ -42,5 +42,5 @@ index 4b8ee5afbb..bd6623e8d1 100644 void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, const CRect& destRect) -- -2.39.0 +2.39.2 diff --git a/projects/RPi/patches/kodi/0003-CVideoLayerBridgeDRMPRIME-add-colourspace-connector-.patch b/projects/RPi/patches/kodi/0003-CVideoLayerBridgeDRMPRIME-add-colourspace-connector-.patch index 7fe34c3654..12b7d57cf4 100644 --- a/projects/RPi/patches/kodi/0003-CVideoLayerBridgeDRMPRIME-add-colourspace-connector-.patch +++ b/projects/RPi/patches/kodi/0003-CVideoLayerBridgeDRMPRIME-add-colourspace-connector-.patch @@ -1,7 +1,7 @@ From 0b9b204c6560f3aff39697f92616b48102840dfe Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 29 Apr 2019 18:48:45 -0700 -Subject: [PATCH 3/4] CVideoLayerBridgeDRMPRIME add colourspace connector +Subject: [PATCH 3/7] CVideoLayerBridgeDRMPRIME add colourspace connector property --- @@ -83,5 +83,5 @@ index bd6623e8d1..a1342595c6 100644 void CVideoLayerBridgeDRMPRIME::SetVideoPlane(CVideoBufferDRMPRIME* buffer, const CRect& destRect) -- -2.39.0 +2.39.2 diff --git a/projects/RPi/patches/kodi/0004-CDVDVideoCodecDRMPRIME-Adjust-av-formats-to-match-re.patch b/projects/RPi/patches/kodi/0004-CDVDVideoCodecDRMPRIME-Adjust-av-formats-to-match-re.patch index 94e221e1a6..c996f21873 100644 --- a/projects/RPi/patches/kodi/0004-CDVDVideoCodecDRMPRIME-Adjust-av-formats-to-match-re.patch +++ b/projects/RPi/patches/kodi/0004-CDVDVideoCodecDRMPRIME-Adjust-av-formats-to-match-re.patch @@ -1,7 +1,7 @@ From 518d8487d090af854fb72a7d0e5efc075d97228c Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 18 Jan 2023 16:41:00 +0000 -Subject: [PATCH 4/4] CDVDVideoCodecDRMPRIME: Adjust av formats to match recent +Subject: [PATCH 4/7] CDVDVideoCodecDRMPRIME: Adjust av formats to match recent ffmpeg changes --- @@ -45,5 +45,5 @@ index a36107c515..d5b3289680 100644 if (ret < 0) { -- -2.39.0 +2.39.2 diff --git a/projects/RPi/patches/kodi/0005-DVDVideoCodecDRMPRIME-Support-YUV422-and-YUV444-form.patch b/projects/RPi/patches/kodi/0005-DVDVideoCodecDRMPRIME-Support-YUV422-and-YUV444-form.patch new file mode 100644 index 0000000000..b36915dbd4 --- /dev/null +++ b/projects/RPi/patches/kodi/0005-DVDVideoCodecDRMPRIME-Support-YUV422-and-YUV444-form.patch @@ -0,0 +1,93 @@ +From a11461db2d442e0648ebb9255a2399a647d8f5be Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Wed, 25 Jan 2023 18:42:24 +0000 +Subject: [PATCH 5/7] DVDVideoCodecDRMPRIME: Support YUV422 and YUV444 formats + +See: https://github.com/xbmc/xbmc/issues/20017 + +We currently can't play YUV422 and YUV444 videos with drm +but they can be made to work with straightforward plumbing +--- + .../Buffers/VideoBufferPoolDMA.cpp | 6 +++++ + .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 27 +++++++++++++++---- + 2 files changed, 28 insertions(+), 5 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/Buffers/VideoBufferPoolDMA.cpp b/xbmc/cores/VideoPlayer/Buffers/VideoBufferPoolDMA.cpp +index fb2dfc6c78..e6b071117e 100644 +--- a/xbmc/cores/VideoPlayer/Buffers/VideoBufferPoolDMA.cpp ++++ b/xbmc/cores/VideoPlayer/Buffers/VideoBufferPoolDMA.cpp +@@ -123,6 +123,12 @@ uint32_t CVideoBufferPoolDMA::TranslateFormat(AVPixelFormat format) + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUVJ420P: + return DRM_FORMAT_YUV420; ++ case AV_PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ return DRM_FORMAT_YUV422; ++ case AV_PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ return DRM_FORMAT_YUV444; + default: + return 0; + } +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +index d5b3289680..4af903ecf5 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +@@ -142,7 +142,8 @@ static bool IsSupportedHwFormat(const enum AVPixelFormat fmt) + + static bool IsSupportedSwFormat(const enum AVPixelFormat fmt) + { +- return fmt == AV_PIX_FMT_YUV420P || fmt == AV_PIX_FMT_YUVJ420P; ++ return fmt == AV_PIX_FMT_YUV420P || fmt == AV_PIX_FMT_YUVJ420P || fmt == AV_PIX_FMT_YUV422P || ++ fmt == AV_PIX_FMT_YUVJ422P || fmt == AV_PIX_FMT_YUV444P || fmt == AV_PIX_FMT_YUVJ444P; + } + + static const AVCodecHWConfig* FindHWConfig(const AVCodec* codec) +@@ -206,7 +207,14 @@ enum AVPixelFormat CDVDVideoCodecDRMPRIME::GetFormat(struct AVCodecContext* avct + } + } + +- CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - unsupported pixel format", __FUNCTION__); ++ std::vector formats; ++ for (int n = 0; fmt[n] != AV_PIX_FMT_NONE; n++) ++ { ++ formats.emplace_back(av_get_pix_fmt_name(fmt[n])); ++ } ++ CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::{} - no supported pixel formats: {}", __FUNCTION__, ++ StringUtils::Join(formats, ", ")); ++ + return AV_PIX_FMT_NONE; + } + +@@ -226,6 +234,14 @@ int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* fra + case AV_PIX_FMT_YUVJ420P: + size = width * height * 3 / 2; + break; ++ case AV_PIX_FMT_YUV422P: ++ case AV_PIX_FMT_YUVJ422P: ++ size = width * height * 2; ++ break; ++ case AV_PIX_FMT_YUV444P: ++ case AV_PIX_FMT_YUVJ444P: ++ size = width * height * 3; ++ break; + default: + return -1; + } +@@ -512,9 +528,10 @@ bool CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture) + (static_cast(lrint(pVideoPicture->iWidth / aspect_ratio))) & -3; + } + +- pVideoPicture->color_range = m_pFrame->color_range == AVCOL_RANGE_JPEG || +- m_pFrame->format == AV_PIX_FMT_YUVJ420P || +- m_hints.colorRange == AVCOL_RANGE_JPEG; ++ pVideoPicture->color_range = ++ m_pFrame->color_range == AVCOL_RANGE_JPEG || m_pFrame->format == AV_PIX_FMT_YUVJ420P || ++ m_pFrame->format == AV_PIX_FMT_YUVJ422P || m_pFrame->format == AV_PIX_FMT_YUVJ444P || ++ m_hints.colorRange == AVCOL_RANGE_JPEG; + pVideoPicture->color_primaries = m_pFrame->color_primaries == AVCOL_PRI_UNSPECIFIED + ? m_hints.colorPrimaries + : m_pFrame->color_primaries; +-- +2.39.2 + diff --git a/projects/RPi/patches/kodi/0006-VideoBufferDMA-Support-exporting-YCbCr444-buffers.patch b/projects/RPi/patches/kodi/0006-VideoBufferDMA-Support-exporting-YCbCr444-buffers.patch new file mode 100644 index 0000000000..a76667adef --- /dev/null +++ b/projects/RPi/patches/kodi/0006-VideoBufferDMA-Support-exporting-YCbCr444-buffers.patch @@ -0,0 +1,55 @@ +From 7b820fa6812e8389613238c6ab3a12fc1dee0276 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 31 Jan 2023 14:13:00 +0000 +Subject: [PATCH 6/7] VideoBufferDMA: Support exporting YCbCr444 buffers + +The current code assumes chroma is decimated by two, but that is not necessarily the case. +DRMPRIME decode with EGL rendering of YCbCr444 video will have corrupted colours. + +Ask ffmpeg what the chroma decimation is. +--- + .../VideoPlayer/Buffers/VideoBufferDMA.cpp | 21 ++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/Buffers/VideoBufferDMA.cpp b/xbmc/cores/VideoPlayer/Buffers/VideoBufferDMA.cpp +index 2dd7c1341d..3e6bf0dc7a 100644 +--- a/xbmc/cores/VideoPlayer/Buffers/VideoBufferDMA.cpp ++++ b/xbmc/cores/VideoPlayer/Buffers/VideoBufferDMA.cpp +@@ -119,20 +119,27 @@ bool CVideoBufferDMA::Alloc() + + void CVideoBufferDMA::Export(AVFrame* frame, uint32_t width, uint32_t height) + { +- m_planes = av_pix_fmt_count_planes(static_cast(frame->format)); ++ AVPixelFormat pix_fmt = static_cast(frame->format); ++ m_planes = av_pix_fmt_count_planes(pix_fmt); ++ int h_shift; ++ int v_shift; + +- if (m_planes < 2) +- throw std::runtime_error( +- "non-planar formats not supported: " + +- std::string(av_get_pix_fmt_name(static_cast(frame->format)))); ++ if (av_pix_fmt_get_chroma_sub_sample(pix_fmt, &h_shift, &v_shift)) ++ throw std::runtime_error("unable to determine chroma_sub_sample: " + ++ std::string(av_get_pix_fmt_name(pix_fmt))); ++ ++ if (m_planes < 2 || m_planes > 3) ++ throw std::runtime_error("only 2 or 3 plane formats supported: " + ++ std::string(av_get_pix_fmt_name(pix_fmt))); + + for (uint32_t plane = 0; plane < m_planes; plane++) + { + m_strides[plane] = + av_image_get_linesize(static_cast(frame->format), width, plane); +- m_offsets[plane] = +- plane == 0 ? 0 : (m_offsets[plane - 1] + m_strides[plane - 1] * (height >> (plane - 1))); + } ++ m_offsets[0] = 0; ++ m_offsets[1] = m_strides[0] * height; ++ m_offsets[2] = m_offsets[1] + (m_strides[1] * height >> v_shift); + + if (CServiceBroker::GetLogging().CanLogComponent(LOGVIDEO)) + { +-- +2.39.2 + diff --git a/projects/RPi/patches/kodi/0007-DVDVideoCodecDRMPRIME-Add-support-for-arbitrary-outp.patch b/projects/RPi/patches/kodi/0007-DVDVideoCodecDRMPRIME-Add-support-for-arbitrary-outp.patch new file mode 100644 index 0000000000..219c7f5974 --- /dev/null +++ b/projects/RPi/patches/kodi/0007-DVDVideoCodecDRMPRIME-Add-support-for-arbitrary-outp.patch @@ -0,0 +1,332 @@ +From ae91030c1a84693fd0d34b919f9f8434b08e00c9 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 6 Feb 2023 15:19:51 +0000 +Subject: [PATCH 7/7] DVDVideoCodecDRMPRIME: Add support for arbitrary output + pixel formats + +This enables any ffmpeg pixel formats to be supported by DRMPRIME decoder +by creating a scale ffmpeg filter to convert it to a supported format. + +This allows formats like h264 Hi10P and hevc 12-bit 444 to be software decoded, +converted and displayed through DRM. + +This will be a cheaper path than disabling DRMPRIME, which is also +software decode, convert, but then needs convert to texture and display through GL. + +And it happens automatically without requiring user video settings +--- + .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 124 +++++++++++------- + .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.h | 3 +- + 2 files changed, 77 insertions(+), 50 deletions(-) + +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +index 4af903ecf5..92a182608d 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +@@ -199,7 +199,7 @@ enum AVPixelFormat CDVDVideoCodecDRMPRIME::GetFormat(struct AVCodecContext* avct + { + for (int n = 0; fmt[n] != AV_PIX_FMT_NONE; n++) + { +- if (IsSupportedHwFormat(fmt[n]) || IsSupportedSwFormat(fmt[n])) ++ //if (IsSupportedHwFormat(fmt[n]) || IsSupportedSwFormat(fmt[n])) + { + CDVDVideoCodecDRMPRIME* ctx = static_cast(avctx->opaque); + ctx->UpdateProcessInfo(avctx, fmt[n]); +@@ -220,7 +220,8 @@ enum AVPixelFormat CDVDVideoCodecDRMPRIME::GetFormat(struct AVCodecContext* avct + + int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* frame, int flags) + { +- if (IsSupportedSwFormat(static_cast(frame->format))) ++ AVPixelFormat pix_fmt = static_cast(frame->format); ++ if (IsSupportedSwFormat(pix_fmt)) + { + int width = frame->width; + int height = frame->height; +@@ -228,7 +229,7 @@ int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* fra + AlignedSize(avctx, width, height); + + int size; +- switch (avctx->pix_fmt) ++ switch (pix_fmt) + { + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUVJ420P: +@@ -248,13 +249,12 @@ int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* fra + + CDVDVideoCodecDRMPRIME* ctx = static_cast(avctx->opaque); + auto buffer = dynamic_cast( +- ctx->m_processInfo.GetVideoBufferManager().Get(avctx->pix_fmt, size, nullptr)); ++ ctx->m_processInfo.GetVideoBufferManager().Get(pix_fmt, size, nullptr)); + if (!buffer) + return -1; + +- frame->opaque = static_cast(buffer); + frame->opaque_ref = +- av_buffer_create(nullptr, 0, ReleaseBuffer, frame->opaque, AV_BUFFER_FLAG_READONLY); ++ av_buffer_create(nullptr, 0, ReleaseBuffer, static_cast(buffer), AV_BUFFER_FLAG_READONLY); + + buffer->Export(frame, width, height); + buffer->SyncStart(); +@@ -608,9 +608,9 @@ bool CDVDVideoCodecDRMPRIME::SetPictureParams(VideoPicture* pVideoPicture) + buffer->SetRef(m_pFrame); + pVideoPicture->videoBuffer = buffer; + } +- else if (m_pFrame->opaque) ++ else if (IsSupportedSwFormat(static_cast(m_pFrame->format))) + { +- CVideoBufferDMA* buffer = static_cast(m_pFrame->opaque); ++ CVideoBufferDMA* buffer = static_cast(av_buffer_get_opaque(m_pFrame->buf[0])); + buffer->SetPictureParams(*pVideoPicture); + buffer->Acquire(); + buffer->SyncEnd(); +@@ -644,13 +644,13 @@ void CDVDVideoCodecDRMPRIME::FilterTest() + + if (name.find("deinterlace") != std::string::npos) + { +- if (FilterOpen(name, true)) ++ bool ret = FilterOpen(name, false, true); ++ FilterClose(); ++ if (ret) + { + m_deintFilterName = name; +- + CLog::Log(LOGDEBUG, "CDVDVideoCodecDRMPRIME::{} - found deinterlacing filter {}", + __FUNCTION__, name); +- + return; + } + } +@@ -660,14 +660,31 @@ void CDVDVideoCodecDRMPRIME::FilterTest() + __FUNCTION__); + } + +-bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) ++AVFrame *CDVDVideoCodecDRMPRIME::alloc_filter_frame(AVFilterContext * ctx, void * v, int w, int h) ++{ ++ int result; ++ CDVDVideoCodecDRMPRIME* me = static_cast(v); ++ AVFrame *frame = av_frame_alloc(); ++ frame->width = w; ++ frame->height = h; ++ frame->format = AV_PIX_FMT_YUV420P; ++ ++ if ((result = CDVDVideoCodecDRMPRIME::GetBuffer(me->m_pCodecContext, frame, 0)) < 0) ++ { ++ CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::alloc_filter_frame - failed to GetBuffer ({})", result); ++ return nullptr; ++ } ++ return frame; ++} ++ ++bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool scale, bool test) + { + int result; + + if (m_pFilterGraph) + FilterClose(); + +- if (filters.empty()) ++ if (filters.empty() && !scale) + return true; + + if (!(m_pFilterGraph = avfilter_graph_alloc())) +@@ -678,13 +695,13 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + + const AVFilter* srcFilter = avfilter_get_by_name("buffer"); + const AVFilter* outFilter = avfilter_get_by_name("buffersink"); +- enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_DRM_PRIME, AV_PIX_FMT_NONE }; ++ enum AVPixelFormat pix_fmts[] = { scale ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_DRM_PRIME, AV_PIX_FMT_NONE }; + + std::string args = StringUtils::Format("video_size={}x{}:pix_fmt={}:time_base={}/{}:" + "pixel_aspect={}/{}", + m_pCodecContext->width, + m_pCodecContext->height, +- AV_PIX_FMT_DRM_PRIME, ++ scale ? m_pCodecContext->pix_fmt : AV_PIX_FMT_DRM_PRIME, + m_pCodecContext->time_base.num ? + m_pCodecContext->time_base.num : 1, + m_pCodecContext->time_base.num ? +@@ -703,7 +720,6 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + CLog::Log(LOGERROR, + "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_graph_create_filter: src: {} ({})", + err, result); +- FilterClose(); + return false; + } + +@@ -711,7 +727,6 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + if (!par) + { + CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - unable to alloc buffersrc"); +- FilterClose(); + return false; + } + +@@ -727,7 +742,6 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + CLog::Log(LOGERROR, + "CDVDVideoCodecDRMPRIME::FilterOpen - av_buffersrc_parameters_set: {} ({})", + err, result); +- FilterClose(); + return false; + } + av_freep(&par); +@@ -741,7 +755,6 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + CLog::Log(LOGERROR, + "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_graph_create_filter: out: {} ({})", + err, result); +- FilterClose(); + return false; + } + +@@ -750,32 +763,46 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + if (result < 0) + { + CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - failed settings pix formats"); +- FilterClose(); + return false; + } + +- AVFilterInOut* outputs = avfilter_inout_alloc(); +- AVFilterInOut* inputs = avfilter_inout_alloc(); ++ if (!filters.empty()) ++ { ++ AVFilterInOut* outputs = avfilter_inout_alloc(); ++ AVFilterInOut* inputs = avfilter_inout_alloc(); + +- outputs->name = av_strdup("in"); +- outputs->filter_ctx = m_pFilterIn; +- outputs->pad_idx = 0; +- outputs->next = nullptr; ++ outputs->name = av_strdup("in"); ++ outputs->filter_ctx = m_pFilterIn; ++ outputs->pad_idx = 0; ++ outputs->next = nullptr; + +- inputs->name = av_strdup("out"); +- inputs->filter_ctx = m_pFilterOut; +- inputs->pad_idx = 0; +- inputs->next = nullptr; ++ inputs->name = av_strdup("out"); ++ inputs->filter_ctx = m_pFilterOut; ++ inputs->pad_idx = 0; ++ inputs->next = nullptr; + +- result = avfilter_graph_parse_ptr(m_pFilterGraph, filters.c_str(), &inputs, &outputs, NULL); +- avfilter_inout_free(&outputs); +- avfilter_inout_free(&inputs); ++ result = avfilter_graph_parse_ptr(m_pFilterGraph, filters.c_str(), &inputs, &outputs, NULL); ++ avfilter_inout_free(&outputs); ++ avfilter_inout_free(&inputs); + +- if (result < 0) ++ if (result < 0) ++ { ++ CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_graph_parse"); ++ return false; ++ } ++ } ++ else + { +- CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_graph_parse"); +- FilterClose(); +- return false; ++ if ((result = av_buffersink_set_alloc_video_frame(m_pFilterOut, alloc_filter_frame, static_cast(this))) < 0) ++ { ++ CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - av_buffersink_set_alloc_video_frame = {}", result); ++ return result; ++ } ++ if ((result = avfilter_link(m_pFilterIn, 0, m_pFilterOut, 0)) < 0) ++ { ++ CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_link"); ++ return false; ++ } + } + + if ((result = avfilter_graph_config(m_pFilterGraph, nullptr)) < 0) +@@ -784,15 +811,11 @@ bool CDVDVideoCodecDRMPRIME::FilterOpen(const std::string& filters, bool test) + av_strerror(result, err, AV_ERROR_MAX_STRING_SIZE); + CLog::Log(LOGERROR, "CDVDVideoCodecDRMPRIME::FilterOpen - avfilter_graph_config: {} ({})", + err, result); +- FilterClose(); + return false; + } + + if (test) +- { +- FilterClose(); + return true; +- } + + m_processInfo.SetVideoDeintMethod(filters); + +@@ -827,16 +850,16 @@ void CDVDVideoCodecDRMPRIME::FilterClose() + CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::ProcessFilterIn() + { + // sw decoded buffers need cache flush and for descripter to be set +- if (!IsSupportedHwFormat(static_cast(m_pFrame->format)) && m_pFrame->opaque != nullptr) ++ if (!IsSupportedHwFormat(static_cast(m_pFrame->format)) && IsSupportedSwFormat(static_cast(m_pFrame->format))) + { +- CVideoBufferDMA* buffer = static_cast(m_pFrame->opaque); ++ CVideoBufferDMA* buffer = static_cast(av_buffer_get_opaque(m_pFrame->buf[0])); + buffer->SetDimensions(m_pFrame->width, m_pFrame->height); + buffer->SyncEnd(); + auto descriptor = buffer->GetDescriptor(); + m_pFrame->data[0] = reinterpret_cast(descriptor); ++ m_pFrame->format = AV_PIX_FMT_DRM_PRIME; + } + +- m_pFrame->format = AV_PIX_FMT_DRM_PRIME; + int ret = av_buffersrc_add_frame(m_pFilterIn, m_pFrame); + if (ret < 0) + { +@@ -929,25 +952,28 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo + return VC_ERROR; + } + ++ // we need to scale if the buffer isn't in DRM_PRIME format ++ bool need_scale = !IsSupportedSwFormat(static_cast(m_pFrame->format)) && !IsSupportedHwFormat(static_cast(m_pFrame->format)); ++ + if (!m_processInfo.GetVideoInterlaced() && m_pFrame->interlaced_frame) + m_processInfo.SetVideoInterlaced(true); + + std::string filterChain = GetFilterChain(m_pFrame->interlaced_frame); +- if (!filterChain.empty()) ++ if (!filterChain.empty() || need_scale) + { + bool reopenFilter = false; + if (m_filters != filterChain) + reopenFilter = true; + + if (m_pFilterGraph && +- (m_pFilterIn->outputs[0]->w != m_pCodecContext->width || +- m_pFilterIn->outputs[0]->h != m_pCodecContext->height)) ++ (m_pFilterIn->outputs[0]->w != m_pFrame->width || ++ m_pFilterIn->outputs[0]->h != m_pFrame->height)) + reopenFilter = true; + +- if (reopenFilter) ++ if (reopenFilter || (need_scale && m_pFilterGraph == nullptr)) + { + m_filters = filterChain; +- if (!FilterOpen(filterChain, false)) ++ if (!FilterOpen(filterChain, need_scale, false)) + FilterClose(); + } + +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h +index fab3431d40..bb88fde1f9 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.h +@@ -44,7 +44,8 @@ protected: + CDVDVideoCodec::VCReturn ProcessFilterOut(); + static enum AVPixelFormat GetFormat(struct AVCodecContext* avctx, const enum AVPixelFormat* fmt); + static int GetBuffer(struct AVCodecContext* avctx, AVFrame* frame, int flags); +- bool FilterOpen(const std::string& filters, bool test); ++ static AVFrame *alloc_filter_frame(AVFilterContext * ctx, void * v, int w, int h); ++ bool FilterOpen(const std::string& filters, bool scale, bool test); + void FilterClose(); + void FilterTest(); + std::string GetFilterChain(bool interlaced); +-- +2.39.2 + From 7b3313a17dde90b914920a87df8bfdd13a7fb21e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 23 Mar 2023 10:31:10 +0000 Subject: [PATCH 055/157] tz: update to 2023b --- packages/sysutils/tz/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/tz/package.mk b/packages/sysutils/tz/package.mk index 974963038e..b135e768ac 100644 --- a/packages/sysutils/tz/package.mk +++ b/packages/sysutils/tz/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tz" -PKG_VERSION="2022g" -PKG_SHA256="cc1169a43591201964ba6977ce8a63bb9cbe2d6e6bdcde34cd609f50e9866039" +PKG_VERSION="2023b" +PKG_SHA256="1d4f516a6a6fa8948e2c6e47352756a7bb922b236930eebacbadd784f883acf4" PKG_LICENSE="Public Domain" PKG_SITE="http://www.iana.org/time-zones" PKG_URL="https://github.com/eggert/tz/archive/${PKG_VERSION}.tar.gz" From 0da28ba159c366f30dccb887eae18951db933378 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 26 Mar 2023 11:40:17 +0000 Subject: [PATCH 056/157] tigervnc: copy missing library libXtst to addon directory --- packages/addons/service/tigervnc/package.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk index a56bafe6f7..088cc4449b 100644 --- a/packages/addons/service/tigervnc/package.mk +++ b/packages/addons/service/tigervnc/package.mk @@ -24,10 +24,20 @@ makeinstall_target() { : # nothing to do } +# find ${1}.so.[0-9]* in ${2} and copy it to dest +_pkg_copy_lib() { + find "${2}/usr/lib" -regextype sed -regex ".*/${1}\.so\.[0-9]*" \ + -exec cp {} "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" \; +} + addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib} + cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig \ ${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd \ ${PKG_BUILD}/.${TARGET_NAME}/unix/x0vncserver/x0vncserver \ ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + + # copy required libraries for tigervnc + _pkg_copy_lib libXtst $(get_install_dir libXtst) } From 34b1b6f77e783d6276a00277a1627288d57371ca Mon Sep 17 00:00:00 2001 From: CvH Date: Mon, 27 Mar 2023 19:54:39 +0200 Subject: [PATCH 057/157] tigervnc: update addon to (1) --- packages/addons/service/tigervnc/changelog.txt | 3 ++- packages/addons/service/tigervnc/package.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/tigervnc/changelog.txt b/packages/addons/service/tigervnc/changelog.txt index 927b2407d4..b56e752ce6 100644 --- a/packages/addons/service/tigervnc/changelog.txt +++ b/packages/addons/service/tigervnc/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- fix not working TigerVNC diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk index 088cc4449b..57c066aa42 100644 --- a/packages/addons/service/tigervnc/package.mk +++ b/packages/addons/service/tigervnc/package.mk @@ -4,7 +4,7 @@ PKG_NAME="tigervnc" PKG_VERSION="1.10.1" PKG_SHA256="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="GPLv2" PKG_SITE="http://www.tigervnc.org" From d996527193ffc52740c15044f9a5d11664867284 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 28 Mar 2023 06:55:48 +0000 Subject: [PATCH 058/157] iwd: update to 2.4 --- packages/network/iwd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk index df882fc198..260d059a77 100644 --- a/packages/network/iwd/package.mk +++ b/packages/network/iwd/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iwd" -PKG_VERSION="2.3" -PKG_SHA256="b0506d797a8bfb88f3c3eeea5e49dcf4ee8e6cef118f57c118e587eeb377ac64" +PKG_VERSION="2.4" +PKG_SHA256="3a9c5e7ade45162e5c78b3d7035a2f4a6e20ba6b5974097c35a8f615493012f9" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/cgit/network/wireless/iwd.git/about/" PKG_URL="https://www.kernel.org/pub/linux/network/wireless/iwd-${PKG_VERSION}.tar.xz" From ceb3783c78fbe85342a43331ccb3410f53e4cdf4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 29 Mar 2023 08:37:11 +0000 Subject: [PATCH 059/157] tz: update to 2023c log: - https://github.com/eggert/tz/compare/2023b...2023c --- packages/sysutils/tz/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/tz/package.mk b/packages/sysutils/tz/package.mk index b135e768ac..b1729cfb51 100644 --- a/packages/sysutils/tz/package.mk +++ b/packages/sysutils/tz/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tz" -PKG_VERSION="2023b" -PKG_SHA256="1d4f516a6a6fa8948e2c6e47352756a7bb922b236930eebacbadd784f883acf4" +PKG_VERSION="2023c" +PKG_SHA256="9aa20ef838183e58f09acca92098cf6aa6d8e229aecf24e098c3af2a38e596f8" PKG_LICENSE="Public Domain" PKG_SITE="http://www.iana.org/time-zones" PKG_URL="https://github.com/eggert/tz/archive/${PKG_VERSION}.tar.gz" From 1d502b32428241842d4c39a477461ac1de4eca8e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 1 Mar 2023 11:45:15 +0000 Subject: [PATCH 060/157] btrfs-progs: update to 6.2.2 and addon (1) changes: - https://btrfs.readthedocs.io/en/latest/CHANGES.html --- packages/addons/tools/btrfs-progs/changelog.txt | 3 ++- packages/addons/tools/btrfs-progs/package.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/addons/tools/btrfs-progs/changelog.txt b/packages/addons/tools/btrfs-progs/changelog.txt index 927b2407d4..a195358cf9 100644 --- a/packages/addons/tools/btrfs-progs/changelog.txt +++ b/packages/addons/tools/btrfs-progs/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- btrfs-progs: update to 6.2.2 diff --git a/packages/addons/tools/btrfs-progs/package.mk b/packages/addons/tools/btrfs-progs/package.mk index 8211448027..b2e32b4e51 100644 --- a/packages/addons/tools/btrfs-progs/package.mk +++ b/packages/addons/tools/btrfs-progs/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="btrfs-progs" -PKG_VERSION="6.1.3" -PKG_SHA256="e6512ff305963bc68f11803fa759fecbead778a3a951aeb4f7f3f76dabb31db4" -PKG_REV="0" +PKG_VERSION="6.2.2" +PKG_SHA256="140d3d98f2cba4c7f05c16aec3038f044e11555a40c27a5006185c99a10c7ca2" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page" From c44ef45e999b150071dfbdc676d5a60bac7c7dc5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 9 Mar 2023 12:15:30 +0000 Subject: [PATCH 061/157] samba: update to 4.17.7 release notes: - https://www.samba.org/samba/history/samba-4.17.6.html - https://www.samba.org/samba/history/samba-4.17.7.html --- packages/network/samba/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 9e2487d84b..4f5ebadf54 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.17.5" -PKG_SHA256="ebb7880d474ffc09d73b5fc77bcbd657f6235910337331a9c24d7f69ca11442b" +PKG_VERSION="4.17.7" +PKG_SHA256="95c9c16b654a88cfaefd958052dd573e2f85ecdf114e4ecec3187537a094d919" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz" From 25c52d4e55c6a4ae0b8fe70e945ed0a9a1d9fce1 Mon Sep 17 00:00:00 2001 From: Peter Vicman Date: Wed, 29 Mar 2023 17:03:36 +0200 Subject: [PATCH 062/157] mariadb: include mariadb-upgrade and mariadb-check and update addon (1) fixes https://github.com/LibreELEC/LibreELEC.tv/issues/7701 --- packages/addons/service/mariadb/changelog.txt | 4 +- packages/addons/service/mariadb/package.mk | 14 +++--- .../service/mariadb/source/bin/mariadb.start | 46 ++++++++++++------- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/packages/addons/service/mariadb/changelog.txt b/packages/addons/service/mariadb/changelog.txt index 927b2407d4..3a0ffce00b 100644 --- a/packages/addons/service/mariadb/changelog.txt +++ b/packages/addons/service/mariadb/changelog.txt @@ -1 +1,3 @@ -initial release +1 +- include mariadb-upgrade and mariadb-check + copy mariadb* binaries and make symbolic links to mysql* diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index e71ae4d817..b25ec2b9ad 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -3,7 +3,7 @@ PKG_NAME="mariadb" PKG_VERSION="10.11.2" -PKG_REV="0" +PKG_REV="1" PKG_SHA256="1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc" PKG_LICENSE="GPL2" PKG_SITE="https://mariadb.org" @@ -89,13 +89,15 @@ addon() { mkdir -p ${ADDON}/config cp ${MARIADB}/bin/mariadbd \ - ${MARIADB}/bin/mysql \ - ${MARIADB}/bin/mysqladmin \ - ${MARIADB}/bin/mysqldump \ - ${MARIADB}/bin/mysql_secure_installation \ + ${MARIADB}/bin/mariadb \ + ${MARIADB}/bin/mariadb-admin \ + ${MARIADB}/bin/mariadb-check \ + ${MARIADB}/bin/mariadb-dump \ + ${MARIADB}/bin/mariadb-secure-installation \ + ${MARIADB}/bin/mariadb-upgrade \ ${MARIADB}/bin/my_print_defaults \ ${MARIADB}/bin/resolveip \ - ${MARIADB}/scripts/mysql_install_db \ + ${MARIADB}/scripts/mariadb-install-db \ ${ADDON}/bin cp -PR ${MARIADB}/share ${ADDON} diff --git a/packages/addons/service/mariadb/source/bin/mariadb.start b/packages/addons/service/mariadb/source/bin/mariadb.start index 65e9e9fddd..a15b61b9ad 100755 --- a/packages/addons/service/mariadb/source/bin/mariadb.start +++ b/packages/addons/service/mariadb/source/bin/mariadb.start @@ -3,6 +3,10 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) +_create_bin_link() { + [ ! -L ${ADDON_DIR}/bin/${2} ] && ln -sfn ${1} ${ADDON_DIR}/bin/${2} +} + . /etc/profile oe_setup_addon service.mariadb @@ -11,49 +15,57 @@ mkdir -p /run/mysqld # exit if already running PID=$(ps aux | awk '/\/bin\/mariadbd/ {print $1; exit 0}') -if [ -n "$PID" ]; then +if [ -n "${PID}" ]; then echo "MariaDB server is already running" exit 0 fi +# create symbolic links +_create_bin_link mariadb mysql +_create_bin_link mariadb-admin mysqladmin +_create_bin_link mariadb-dump mysqldump +_create_bin_link mariadb-secure-installation mysql_secure_installation +_create_bin_link mariadb-upgrade mysql_upgrade +_create_bin_link mariadb-install-db mysql_install_db + # copy config file -if [ ! -f $ADDON_HOME/my.cnf ]; then - cp $ADDON_DIR/config/my.cnf $ADDON_HOME +if [ ! -f ${ADDON_HOME}/my.cnf ]; then + cp ${ADDON_DIR}/config/my.cnf ${ADDON_HOME} fi # install database -if [ ! -d "$ADDON_HOME/data/mysql" ]; then - mkdir -p $ADDON_HOME/data +if [ ! -d "${ADDON_HOME}/data/mysql" ]; then + mkdir -p ${ADDON_HOME}/data echo "Installing database" - $ADDON_DIR/bin/mysql_install_db --basedir=$ADDON_DIR --datadir=$ADDON_HOME/data + ${ADDON_DIR}/bin/mariadb-install-db --basedir=${ADDON_DIR} --datadir=${ADDON_HOME}/data fi # check for first run and generate passwords -if grep -q "@MYSQL_ROOT_PASS@" $ADDON_HOME/settings.xml; then +if grep -q "@MYSQL_ROOT_PASS@" ${ADDON_HOME}/settings.xml; then MYSQL_ROOT_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)" MYSQL_KODI_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)" - sed -e "s|@MYSQL_ROOT_PASS@|$MYSQL_ROOT_PASS|g" \ - -e "s|@MYSQL_KODI_PASS@|$MYSQL_KODI_PASS|g" \ - -i $ADDON_HOME/settings.xml + sed -e "s|@MYSQL_ROOT_PASS@|${MYSQL_ROOT_PASS}|g" \ + -e "s|@MYSQL_KODI_PASS@|${MYSQL_KODI_PASS}|g" \ + -i ${ADDON_HOME}/settings.xml fi # init script to create user kodi and change passwords init_file="" -if [[ ! -f $ADDON_HOME/set_mysql_passwords.sql ]] || [[ $ADDON_HOME/settings.xml -nt $ADDON_HOME/set_mysql_passwords.sql ]]; then - cat << SQL_DATA > $ADDON_HOME/set_mysql_passwords.sql -SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS'); +if [[ ! -f ${ADDON_HOME}/set_mysql_passwords.sql ]] || [[ ${ADDON_HOME}/settings.xml -nt ${ADDON_HOME}/set_mysql_passwords.sql ]]; then + cat << SQL_DATA > ${ADDON_HOME}/set_mysql_passwords.sql +SET PASSWORD FOR 'root'@'localhost'=PASSWORD('${MYSQL_ROOT_PASS}'); CREATE USER IF NOT EXISTS 'kodi'; CREATE USER IF NOT EXISTS 'kodi'@'localhost'; -SET PASSWORD FOR 'kodi'=PASSWORD('$MYSQL_KODI_PASS'); -SET PASSWORD FOR 'kodi'@'localhost'=PASSWORD('$MYSQL_KODI_PASS'); +SET PASSWORD FOR 'kodi'=PASSWORD('${MYSQL_KODI_PASS}'); +SET PASSWORD FOR 'kodi'@'localhost'=PASSWORD('${MYSQL_KODI_PASS}'); GRANT ALL ON *.* TO 'kodi'; GRANT ALL ON *.* TO 'kodi'@'localhost'; flush privileges; SQL_DATA - init_file="--init-file=$ADDON_HOME/set_mysql_passwords.sql" + init_file="--init-file=${ADDON_HOME}/set_mysql_passwords.sql" fi echo "Starting mariadbd" -MYSQL_HOME="$ADDON_HOME" exec $ADDON_DIR/bin/mariadbd $init_file & +MYSQL_HOME="${ADDON_HOME}" exec ${ADDON_DIR}/bin/mariadbd ${init_file} & From f5f9a9e1cca3b7030be1741816df6eda36ce9a32 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 30 Mar 2023 16:57:59 +0200 Subject: [PATCH 063/157] scripts/build: properly honor strip build flag Package building honor's the strip flag so we can prevent executables from being stripped. But copying files to INSTALL ignored that flag which meant the flag had practically no effect. Fix this by using the same logic as we do in the meson strip handling in line 170 and in config/functions. Also add the missing quotes in scripts/build to align it with config/functions Signed-off-by: Matthias Reichl --- scripts/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build b/scripts/build index 6cf9068feb..311ba6c5c4 100755 --- a/scripts/build +++ b/scripts/build @@ -167,7 +167,7 @@ TARGET_MESON_OPTS="--prefix=/usr \ --libexecdir=/usr/lib \ --localstatedir=/var \ --buildtype=${MESON_BUILD_TYPE}" -if [ ${BUILD_WITH_DEBUG} != yes ] && flag_enabled "strip" "yes"; then +if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then TARGET_MESON_OPTS+=" -Dstrip=true" fi @@ -524,7 +524,7 @@ if [ "${TARGET}" = "target" -o "${TARGET}" = "init" ]; then python_fix_abi "${INSTALL}" - if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then + if [ "${BUILD_WITH_DEBUG}" != "yes" ] && flag_enabled "strip" "yes"; then ${STRIP} $(find ${INSTALL} \ -type f -name "*.so*" \ ! -name "ld-*.so" \ From 0adb58209862be3a297ab7a97ce3c45d6998bbbc Mon Sep 17 00:00:00 2001 From: mglae Date: Sun, 2 Apr 2023 12:23:21 +0200 Subject: [PATCH 064/157] udevil: improve mount.ntfs script Explicit mount ntfs3 fs. Avoid log spam by performing automatic mount over all file systems. Explicit Ntfs3 module load can be dropped. --- packages/sysutils/udevil/package.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/sysutils/udevil/package.mk b/packages/sysutils/udevil/package.mk index 562649abf0..051343de29 100644 --- a/packages/sysutils/udevil/package.mk +++ b/packages/sysutils/udevil/package.mk @@ -28,9 +28,7 @@ post_makeinstall_target() { cp -PR src/udevil ${INSTALL}/usr/bin mkdir -p ${INSTALL}/usr/sbin - echo '#!/bin/sh' > ${INSTALL}/usr/sbin/mount.ntfs - echo '/usr/sbin/modprobe ntfs3' >> ${INSTALL}/usr/sbin/mount.ntfs - echo '/usr/bin/mount "$@"' >> ${INSTALL}/usr/sbin/mount.ntfs + echo -e '#!/bin/sh\nexec /usr/bin/mount -tntfs3 "$@"' > ${INSTALL}/usr/sbin/mount.ntfs chmod 755 ${INSTALL}/usr/sbin/mount.ntfs } From 636bc77df6ae5c1e7f92c3404be2a93c709f9e34 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 3 Apr 2023 08:07:22 +0000 Subject: [PATCH 065/157] kodi-binary-addons: update to latest versions - pvr.nextpvr: update 20.4.0-Nexus to 20.4.1-Nexus - pvr.zattoo: update 20.3.6-Nexus to 20.3.7-Nexus --- .../mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk | 6 +++--- .../mediacenter/kodi-binary-addons/pvr.zattoo/package.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index 6680213a78..c71af8b033 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -3,9 +3,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.nextpvr" -PKG_VERSION="20.4.0-Nexus" -PKG_SHA256="9b9ae55b126ee0ca42a94d2a447167c0d61be36de336a4b236c0879b9b0832e3" -PKG_REV="3" +PKG_VERSION="20.4.1-Nexus" +PKG_SHA256="bad9e7dd4f67348015f8fc477e0c4c8447e00dbd38b9f6548d1ce04f0845b1fd" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.nextpvr" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk index 0a27f6cc44..f5fe7f7765 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.zattoo" -PKG_VERSION="20.3.6-Nexus" -PKG_SHA256="82e4aa32e794c35c3b718c55fdbc27ed387c59b45a11e25fc4b5d066526a463d" -PKG_REV="2" +PKG_VERSION="20.3.7-Nexus" +PKG_SHA256="c75ba4710d7e85cf516005ee3eca6d677e2fc018abaf490c881bc6552eb32929" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rbuehlma/pvr.zattoo" From 1bca26e8ba22cdb7d72bd514b57f2be8860f2e5f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 5 Apr 2023 12:23:09 +0000 Subject: [PATCH 066/157] inputstream.adaptive: update 20.3.5-Nexus to 20.3.6-Nexus --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index 6e3a7c1026..be54e27fd1 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="inputstream.adaptive" -PKG_VERSION="20.3.5-Nexus" -PKG_SHA256="3851e1ac48aa38681b6ff6cfb39ab2cc24156b859d1a257be63f3c4d9fd926de" +PKG_VERSION="20.3.6-Nexus" +PKG_SHA256="907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 77192d1f3759d676456231dc06ca7deed97d9d8b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 5 Feb 2023 10:51:58 +0000 Subject: [PATCH 067/157] libseccomp: initial package --- .../addons/addon-depends/libseccomp/package.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/addons/addon-depends/libseccomp/package.mk diff --git a/packages/addons/addon-depends/libseccomp/package.mk b/packages/addons/addon-depends/libseccomp/package.mk new file mode 100644 index 0000000000..e2350aedb2 --- /dev/null +++ b/packages/addons/addon-depends/libseccomp/package.mk @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="libseccomp" +PKG_VERSION="2.5.4" +PKG_SHA256="d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb" +PKG_LICENSE="LGPLv2.1" +PKG_SITE="https://github.com/seccomp/libseccomp" +PKG_URL="https://github.com/seccomp/libseccomp/releases/download/v${PKG_VERSION}/libseccomp-${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="An easy to use, platform independent, interface to the Linux Kernel syscall filtering mechanism" +PKG_BUILD_FLAGS="-sysroot" + +PKG_CONFIGURE_OPTS_TARGET+=" --enable-static --enable-shared" From ded92d470ee049a5d1424f0b5faa7dc77c7f4a33 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 6 Feb 2023 11:32:38 +0000 Subject: [PATCH 068/157] runc: build with seccomp --- packages/addons/addon-depends/docker/runc/package.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/runc/package.mk b/packages/addons/addon-depends/docker/runc/package.mk index 56e75e505f..47e8633976 100644 --- a/packages/addons/addon-depends/docker/runc/package.mk +++ b/packages/addons/addon-depends/docker/runc/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain go:host" +PKG_DEPENDS_TARGET="toolchain go:host libseccomp" PKG_LONGDESC="A CLI tool for spawning and running containers according to the OCI specification." PKG_TOOLCHAIN="manual" @@ -19,6 +19,7 @@ pre_make_target() { go_configure export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld ${CC}" + export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" mkdir -p ${GOPATH} if [ -d ${PKG_BUILD}/vendor ]; then @@ -30,5 +31,5 @@ pre_make_target() { make_target() { mkdir -p bin - ${GOLANG} build -v -o bin/runc -a -tags "cgo static_build" -ldflags "${LDFLAGS}" ./ + ${GOLANG} build -v -o bin/runc -a -tags "cgo seccomp static_build" -ldflags "${LDFLAGS}" ./ } From 2aa26eb5b04fee7a8a0200585ce37d3cdbccb3ee Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 12 Feb 2023 09:23:10 +0000 Subject: [PATCH 069/157] runc: used by both docker and podman --- packages/addons/addon-depends/{docker => }/runc/package.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/addons/addon-depends/{docker => }/runc/package.mk (100%) diff --git a/packages/addons/addon-depends/docker/runc/package.mk b/packages/addons/addon-depends/runc/package.mk similarity index 100% rename from packages/addons/addon-depends/docker/runc/package.mk rename to packages/addons/addon-depends/runc/package.mk From 9ead1e460a4c2f110a915143e807a680ce4152d4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 30 Mar 2023 08:24:47 +0000 Subject: [PATCH 070/157] runc: update to 1.1.5 --- packages/addons/addon-depends/runc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 47e8633976..9e5fd7a0cd 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="runc" -PKG_VERSION="1.1.4" -PKG_SHA256="4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34" +PKG_VERSION="1.1.5" +PKG_SHA256="76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" From db0e96ae9770a281a92527a0677f1ed53e2c48d6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 14 Mar 2023 11:27:50 +0000 Subject: [PATCH 071/157] lshw: fix lshw -version display --- .../addons/addon-depends/system-tools-depends/lshw/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk index 0973d638f3..5597788bb8 100644 --- a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk @@ -12,5 +12,6 @@ PKG_LONGDESC="A small tool to provide detailed information on the hardware confi PKG_BUILD_FLAGS="-sysroot" make_target() { + export VERSION="B.${PKG_VERSION}" make CXX=${CXX} -C src/ } From f2801aa47cd34a45d9f0bb5741eda22c0bdf6737 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 14 Jan 2023 03:55:18 +0000 Subject: [PATCH 072/157] stress-ng: update to 0.15.06 --- .../addon-depends/system-tools-depends/stress-ng/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk index ce8ff9d8ce..9951d0e21a 100644 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="stress-ng" -PKG_VERSION="0.15.01" -PKG_SHA256="2168627350d8e3b7f4571732d6117ab054a9851600899c30ad82fd3c9649d644" +PKG_VERSION="0.15.06" +PKG_SHA256="c38cefcf0a83f6c65aed7c36e57a9a1ee8373418ef71cf089a75b0661dcd4623" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/ColinIanKing/stress-ng" PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz" From 841b70d00926d9f70cd7cd922c73f38fdad85434 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 15 Jan 2023 07:33:53 +0000 Subject: [PATCH 073/157] vim: update to 9.0.1413 --- .../addons/addon-depends/system-tools-depends/vim/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk index 78c3382c97..2db288dcee 100644 --- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vim" -PKG_VERSION="9.0.1065" -PKG_SHA256="f3db36c8ebe665ee750f6b729d6fe25de9dac202829f1f7390ceb62955750dc9" +PKG_VERSION="9.0.1413" +PKG_SHA256="c2b4fdb50ec2ac5f83bd87661563af9298877a14dc174d7492e562565f1c0815" PKG_LICENSE="VIM" PKG_SITE="http://www.vim.org/" PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz" From 728ba5f3e6a494e3a8fe92c776df3ffc98fe3fc1 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 14 Jan 2023 21:31:37 +0000 Subject: [PATCH 074/157] mc: update to 4.8.29 --- .../addons/addon-depends/system-tools-depends/mc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk index d81141cf8c..40d0e8c829 100644 --- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mc" -PKG_VERSION="4.8.28" -PKG_SHA256="e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803" +PKG_VERSION="4.8.29" +PKG_SHA256="01d8a3b94f58180cca5bf17257b5078d1fd6fd27a9b5c0e970ec767549540ad4" PKG_LICENSE="GPL" PKG_SITE="http://www.midnight-commander.org" PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz" From 7ec62a02425fe72d7e001765bbee3df22b32b9eb Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 24 Jan 2023 03:21:45 +0000 Subject: [PATCH 075/157] unrar: update to 6.2.6 --- .../addon-depends/system-tools-depends/unrar/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index abef04b6d3..245477ed66 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="unrar" -PKG_VERSION="6.2.3" -PKG_SHA256="120936e41f826cd63d77a580aeea64c1b79fd3e2434f58ce8184e783b51e5b01" +PKG_VERSION="6.2.6" +PKG_SHA256="0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318" PKG_LICENSE="free" PKG_SITE="https://www.rarlab.com/rar_add.htm" PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz" From f3adad642dc7c6411140fdf42d0a4c7c64ea3445 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 20 Mar 2023 10:57:11 +0000 Subject: [PATCH 076/157] vim: update to 9.0.1417 --- .../addons/addon-depends/system-tools-depends/vim/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk index 2db288dcee..6aad569dbf 100644 --- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="vim" -PKG_VERSION="9.0.1413" -PKG_SHA256="c2b4fdb50ec2ac5f83bd87661563af9298877a14dc174d7492e562565f1c0815" +PKG_VERSION="9.0.1417" +PKG_SHA256="02c67859046f7c0206afb909061763cf40747c6bf40c22bb6efaf9c06be41591" PKG_LICENSE="VIM" PKG_SITE="http://www.vim.org/" PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz" From 0f41381753b204ebd7737778b8e9e89247bb62cf Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 07:26:30 +0000 Subject: [PATCH 077/157] system-tools: update to addon (1) - bottom: update to 0.8.0 - diffutils: update to 3.9 - htop: update to 3.2.2 - lshw: fix lshw -version display - mc: update to 4.8.29 - stress-ng: update to 0.15.06 - unrar: update to 6.2.6 - vim: update to 9.0.1417 --- packages/addons/tools/system-tools/changelog.txt | 10 +++++++++- packages/addons/tools/system-tools/package.mk | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index 927b2407d4..0d4638af04 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -1 +1,9 @@ -initial release +1 +- bottom: update to 0.8.0 +- diffutils: update to 3.9 +- htop: update to 3.2.2 +- lshw: fix lshw -version display +- mc: update to 4.8.29 +- stress-ng: update to 0.15.06 +- unrar: update to 6.2.6 +- vim: update to 9.0.1417 diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 96625fbac4..802feaddaa 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="system-tools" PKG_VERSION="1.0" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" From 8890cb5dc88da35742b60cf4e5712d34fca54dfe Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 17 Mar 2023 12:40:32 +0100 Subject: [PATCH 078/157] RPi: update to firmware a585b37 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 811defdee9..174d22f1d6 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" -PKG_SHA256="92d8e4b6afe864c82cb19db387ab3b089d9148a1eadbc467c441fda4450bc5c3" +PKG_VERSION="a585b376a2e7e657287543d196ae1f8881ede559" +PKG_SHA256="7994c299c32cf6a452b53dfe7cbc7713945ee4b863584c3927082a8a395a5247" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 404452751e..49e59d2266 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="2c9ca22c4aedd1a8a6bc14698be5861525f2bfdf" -PKG_SHA256="575d16dfd8e481abbe7410e284b30706e82bd69f1f56528520bcb7dea72766f1" +PKG_VERSION="a585b376a2e7e657287543d196ae1f8881ede559" +PKG_SHA256="829489987d02b3e74d566f1b54ed37e74e56e7aa98e4c73086cfdbc91a1687dd" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 806b9eed614da2f94c31bde1bd16bf0160c29175 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 21 Mar 2023 18:40:08 +0100 Subject: [PATCH 079/157] linux (RPi): update to 6.1.20-e10a5ef Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 +- .../linux-010-fix-vc4-rgb-check.patch | 41 ------------------- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 52be6dfca7..67cbfd398b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="e3376fb94fda798d2a322e9c70789286132a1a9f" # 6.1.19 - PKG_SHA256="f1b518ea84ad269ec0a926623aaba43ea0c176e8254438bb4e8c87f267e87e1e" + PKG_VERSION="e10a5ef8afd834cc3f3cb7ccaa45be312e116efb" # 6.1.20 + PKG_SHA256="35129d12e776850deef685c7df1934bc9567bdaa395faf0f0e97c9dae0727e99" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; diff --git a/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch b/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch deleted file mode 100644 index b610cb8b02..0000000000 --- a/packages/linux/patches/raspberrypi/linux-010-fix-vc4-rgb-check.patch +++ /dev/null @@ -1,41 +0,0 @@ -From affc6fdac5376701ea468270af1b6fd9ca7616be Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sat, 11 Mar 2023 22:41:17 +0100 -Subject: [PATCH] drm/vc4: drop unnecessary and harmful HDMI RGB format check - -RGB is a mandatory format for all DVI and HDMI monitors so there's -no need to check for presence of the DRM_COLOR_FORMAT_RGB444 bit in -color_formats. - -More importantly this checks breaks working around EDID issues with -eg video=HDMI-A-1:1024x768D or drm.edid_firmware=edid/1024x768.bin -as the RGB444 bit is only set when a valid EDID with digital bit set in -the input byte is present - which isn't the case when no EDID can be -read from the display device at all or with the in-built kernel EDIDs, -which mimic analog (VGA) displays without the digital bit set. - -So drop the check, if we output video on the HDMI connector we can -assume that the display can accept 8bit RGB. - -Signed-off-by: Matthias Reichl ---- - drivers/gpu/drm/vc4/vc4_hdmi.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index bd762b4e3e8f2..3c60c93c0f888 100644 ---- a/drivers/gpu/drm/vc4/vc4_hdmi.c -+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1962,9 +1962,6 @@ vc4_hdmi_sink_supports_format_bpc(const struct vc4_hdmi *vc4_hdmi, - case VC4_HDMI_OUTPUT_RGB: - drm_dbg(dev, "RGB Format, checking the constraints.\n"); - -- if (!(info->color_formats & DRM_COLOR_FORMAT_RGB444)) -- return false; -- - if (bpc == 10 && !(info->edid_hdmi_rgb444_dc_modes & DRM_EDID_HDMI_DC_30)) { - drm_dbg(dev, "10 BPC but sink doesn't support Deep Color 30.\n"); - return false; --- -2.39.2 - From aab96fceacef098f8b4b8a38a4d2a1e18dd079df Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 22 Mar 2023 14:39:43 +0100 Subject: [PATCH 080/157] RPi: update to firmware c4122b8 Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 174d22f1d6..70351624f4 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="a585b376a2e7e657287543d196ae1f8881ede559" -PKG_SHA256="7994c299c32cf6a452b53dfe7cbc7713945ee4b863584c3927082a8a395a5247" +PKG_VERSION="c4122b8708d2d1e8a123e45b188d0bc2d0105bca" +PKG_SHA256="b4c9701d6e5803a5e42cc55f117feee27f35549c5156d165fe120282f9b98544" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 49e59d2266..223e5e1fca 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="a585b376a2e7e657287543d196ae1f8881ede559" -PKG_SHA256="829489987d02b3e74d566f1b54ed37e74e56e7aa98e4c73086cfdbc91a1687dd" +PKG_VERSION="c4122b8708d2d1e8a123e45b188d0bc2d0105bca" +PKG_SHA256="99e562ca8b94c8eb0fbf8222f35c805b6dfdb96e8efe62be6c8cce6fab19bf8b" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From 719f02112a91048c0488362d794c02fa6e04112c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 24 Mar 2023 20:32:06 +0100 Subject: [PATCH 081/157] linux (RPi): update to 6.1.21-b70f2a8 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 67cbfd398b..7bbeeba227 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="e10a5ef8afd834cc3f3cb7ccaa45be312e116efb" # 6.1.20 - PKG_SHA256="35129d12e776850deef685c7df1934bc9567bdaa395faf0f0e97c9dae0727e99" + PKG_VERSION="b70f2a8883802e33e1aeb1a25f570c69976ca6fb" # 6.1.21 + PKG_SHA256="ba237f138a198b6aa27857228b9b796efcbc651fe284f52a466ce0906528f490" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From e878ad774a4e477898b7808e7497a4c5d6e1137d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 11 Apr 2023 22:21:04 +0200 Subject: [PATCH 082/157] linux (RPi): update to 6.1.23-cb8d82a Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7bbeeba227..b184c8a607 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="b70f2a8883802e33e1aeb1a25f570c69976ca6fb" # 6.1.21 - PKG_SHA256="ba237f138a198b6aa27857228b9b796efcbc651fe284f52a466ce0906528f490" + PKG_VERSION="cb8d82ae0059dd19f0f24a3c1e1081c87d73b0ea" # 6.1.23 + PKG_SHA256="bb447497dddae03d6cf9235e8e8a9613a637c0143ea4ca6cb842d0f5c805c577" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 63e3a0cacefc9b354fb84a4c3a86d9958d1c691e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 31 Mar 2023 23:37:06 +0000 Subject: [PATCH 083/157] linux: rtw88: USB bug fixes --- .../default/linux-122-rtw88-USB-fixes2.patch | 277 ++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 packages/linux/patches/default/linux-122-rtw88-USB-fixes2.patch diff --git a/packages/linux/patches/default/linux-122-rtw88-USB-fixes2.patch b/packages/linux/patches/default/linux-122-rtw88-USB-fixes2.patch new file mode 100644 index 0000000000..ff56acd447 --- /dev/null +++ b/packages/linux/patches/default/linux-122-rtw88-USB-fixes2.patch @@ -0,0 +1,277 @@ +From: Sascha Hauer +To: linux-wireless +Cc: Hans Ulli Kroll , + Larry Finger , + Pkshih , Tim K , + "Alex G ." , + Nick Morrow , + Viktor Petrenko , + Andreas Henriksson , + ValdikSS , kernel@pengutronix.de, + stable@vger.kernel.org, Sascha Hauer +Subject: [PATCH 0/2] RTW88 USB bug fixes +Date: Fri, 31 Mar 2023 14:10:52 +0200 +Message-Id: <20230331121054.112758-1-s.hauer@pengutronix.de> +X-Mailer: git-send-email 2.39.2 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 +X-SA-Exim-Mail-From: sha@pengutronix.de +X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false +X-PTX-Original-Recipient: linux-wireless@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-wireless@vger.kernel.org + +This series fixes two bugs in the RTW88 USB driver I was reported from +several people and that I also encountered myself. + +The first one resulted in "timed out to flush queue 3" messages from the +driver and sometimes a complete stall of the TX queues. + +The second one is specific to the RTW8821CU chipset. Here 2GHz networks +were hardly seen and impossible to connect to. This goes down to +misinterpreting the rfe_option field in the efuse. + +Sascha Hauer (2): + wifi: rtw88: usb: fix priority queue to endpoint mapping + wifi: rtw88: rtw8821c: Fix rfe_option field width + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +- + drivers/net/wireless/realtek/rtw88/usb.c | 70 +++++++++++++------ + 2 files changed, 48 insertions(+), 25 deletions(-) + +-- +2.39.2 + + +From: Sascha Hauer +To: linux-wireless +Cc: Hans Ulli Kroll , + Larry Finger , + Pkshih , Tim K , + "Alex G ." , + Nick Morrow , + Viktor Petrenko , + Andreas Henriksson , + ValdikSS , kernel@pengutronix.de, + stable@vger.kernel.org, Sascha Hauer +Subject: [PATCH 1/2] wifi: rtw88: usb: fix priority queue to endpoint mapping +Date: Fri, 31 Mar 2023 14:10:53 +0200 +Message-Id: <20230331121054.112758-2-s.hauer@pengutronix.de> +X-Mailer: git-send-email 2.39.2 +In-Reply-To: <20230331121054.112758-1-s.hauer@pengutronix.de> +References: <20230331121054.112758-1-s.hauer@pengutronix.de> +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 +X-SA-Exim-Mail-From: sha@pengutronix.de +X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false +X-PTX-Original-Recipient: linux-wireless@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-wireless@vger.kernel.org + +The RTW88 chipsets have four different priority queues in hardware. For +the USB type chipsets the packets destined for a specific priority queue +must be sent through the endpoint corresponding to the queue. This was +not fully understood when porting from the RTW88 USB out of tree driver +and thus violated. + +This patch implements the qsel to endpoint mapping as in +get_usb_bulkout_id_88xx() in the downstream driver. + +Without this the driver often issues "timed out to flush queue 3" +warnings and often TX stalls completely. + +Signed-off-by: Sascha Hauer +--- + drivers/net/wireless/realtek/rtw88/usb.c | 70 ++++++++++++++++-------- + 1 file changed, 47 insertions(+), 23 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/usb.c b/drivers/net/wireless/realtek/rtw88/usb.c +index 2a8336b1847a5..a10d6fef4ffaf 100644 +--- a/drivers/net/wireless/realtek/rtw88/usb.c ++++ b/drivers/net/wireless/realtek/rtw88/usb.c +@@ -118,6 +118,22 @@ static void rtw_usb_write32(struct rtw_dev *rtwdev, u32 addr, u32 val) + rtw_usb_write(rtwdev, addr, val, 4); + } + ++static int dma_mapping_to_ep(enum rtw_dma_mapping dma_mapping) ++{ ++ switch (dma_mapping) { ++ case RTW_DMA_MAPPING_HIGH: ++ return 0; ++ case RTW_DMA_MAPPING_NORMAL: ++ return 1; ++ case RTW_DMA_MAPPING_LOW: ++ return 2; ++ case RTW_DMA_MAPPING_EXTRA: ++ return 3; ++ default: ++ return -EINVAL; ++ } ++} ++ + static int rtw_usb_parse(struct rtw_dev *rtwdev, + struct usb_interface *interface) + { +@@ -129,6 +145,8 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev, + int num_out_pipes = 0; + int i; + u8 num; ++ const struct rtw_chip_info *chip = rtwdev->chip; ++ const struct rtw_rqpn *rqpn; + + for (i = 0; i < interface_desc->bNumEndpoints; i++) { + endpoint = &host_interface->endpoint[i].desc; +@@ -183,31 +201,34 @@ static int rtw_usb_parse(struct rtw_dev *rtwdev, + + rtwdev->hci.bulkout_num = num_out_pipes; + +- switch (num_out_pipes) { +- case 4: +- case 3: +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = 2; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = 2; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = 2; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = 2; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = 1; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = 1; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = 0; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = 0; +- break; +- case 2: +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = 1; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = 1; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = 1; +- rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = 1; +- break; +- case 1: +- break; +- default: +- rtw_err(rtwdev, "failed to get out_pipes(%d)\n", num_out_pipes); ++ if (num_out_pipes < 1 || num_out_pipes > 4) { ++ rtw_err(rtwdev, "invalid number of endpoints %d\n", num_out_pipes); + return -EINVAL; + } + ++ rqpn = &chip->rqpn_table[num_out_pipes]; ++ ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID0] = dma_mapping_to_ep(rqpn->dma_map_be); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID1] = dma_mapping_to_ep(rqpn->dma_map_bk); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID2] = dma_mapping_to_ep(rqpn->dma_map_bk); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID3] = dma_mapping_to_ep(rqpn->dma_map_be); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID4] = dma_mapping_to_ep(rqpn->dma_map_vi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID5] = dma_mapping_to_ep(rqpn->dma_map_vi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID6] = dma_mapping_to_ep(rqpn->dma_map_vo); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID7] = dma_mapping_to_ep(rqpn->dma_map_vo); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID8] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID9] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID10] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID11] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID12] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID13] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID14] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_TID15] = -EINVAL; ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_BEACON] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_HIGH] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_MGMT] = dma_mapping_to_ep(rqpn->dma_map_mg); ++ rtwusb->qsel_to_ep[TX_DESC_QSEL_H2C] = dma_mapping_to_ep(rqpn->dma_map_hi); ++ + return 0; + } + +@@ -250,7 +271,7 @@ static void rtw_usb_write_port_tx_complete(struct urb *urb) + static int qsel_to_ep(struct rtw_usb *rtwusb, unsigned int qsel) + { + if (qsel >= ARRAY_SIZE(rtwusb->qsel_to_ep)) +- return 0; ++ return -EINVAL; + + return rtwusb->qsel_to_ep[qsel]; + } +@@ -265,6 +286,9 @@ static int rtw_usb_write_port(struct rtw_dev *rtwdev, u8 qsel, struct sk_buff *s + int ret; + int ep = qsel_to_ep(rtwusb, qsel); + ++ if (ep < 0) ++ return ep; ++ + pipe = usb_sndbulkpipe(usbd, rtwusb->out_ep[ep]); + urb = usb_alloc_urb(0, GFP_ATOMIC); + if (!urb) +-- +2.39.2 + + +From: Sascha Hauer +To: linux-wireless +Cc: Hans Ulli Kroll , + Larry Finger , + Pkshih , Tim K , + "Alex G ." , + Nick Morrow , + Viktor Petrenko , + Andreas Henriksson , + ValdikSS , kernel@pengutronix.de, + stable@vger.kernel.org, Sascha Hauer +Subject: [PATCH 2/2] wifi: rtw88: rtw8821c: Fix rfe_option field width +Date: Fri, 31 Mar 2023 14:10:54 +0200 +Message-Id: <20230331121054.112758-3-s.hauer@pengutronix.de> +X-Mailer: git-send-email 2.39.2 +In-Reply-To: <20230331121054.112758-1-s.hauer@pengutronix.de> +References: <20230331121054.112758-1-s.hauer@pengutronix.de> +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 +X-SA-Exim-Mail-From: sha@pengutronix.de +X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false +X-PTX-Original-Recipient: linux-wireless@vger.kernel.org +Precedence: bulk +List-ID: +X-Mailing-List: linux-wireless@vger.kernel.org + +On my RTW8821CU chipset rfe_option reads as 0x22. Looking at the +downstream driver suggests that the field width of rfe_option is 5 bit, +so rfe_option should be masked with 0x1f. + +Without this the rfe_option comparisons with 2 further down the +driver evaluate as false when they should really evaluate as true. +The effect is that 2G channels do not work. + +rfe_option is also used as an array index into rtw8821c_rfe_defs[]. +rtw8821c_rfe_defs[34] (0x22) was added as part of adding USB support, +likely because rfe_option reads as 0x22. As this now becomes 0x2, +rtw8821c_rfe_defs[34] is no longer used and can be removed. + +Signed-off-by: Sascha Hauer +--- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c +index 17f800f6efbd0..67efa58dd78ee 100644 +--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c ++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c +@@ -47,7 +47,7 @@ static int rtw8821c_read_efuse(struct rtw_dev *rtwdev, u8 *log_map) + + map = (struct rtw8821c_efuse *)log_map; + +- efuse->rfe_option = map->rfe_option; ++ efuse->rfe_option = map->rfe_option & 0x1f; + efuse->rf_board_option = map->rf_board_option; + efuse->crystal_cap = map->xtal_k; + efuse->pa_type_2g = map->pa_type; +@@ -1537,7 +1537,6 @@ static const struct rtw_rfe_def rtw8821c_rfe_defs[] = { + [2] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2), + [4] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2), + [6] = RTW_DEF_RFE(8821c, 0, 0), +- [34] = RTW_DEF_RFE(8821c, 0, 0), + }; + + static struct rtw_hw_reg rtw8821c_dig[] = { +-- +2.39.2 + + From d71f38c1017ae54cf999db9d08273bfe54cc5b41 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 17 Mar 2023 09:54:12 +0000 Subject: [PATCH 084/157] linux: update to 6.1.23 --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 52be6dfca7..6ff18a6181 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "${LINUX}" in PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) - PKG_VERSION="6.1.19" - PKG_SHA256="9e991c6e5f6c1ca45eea98c55e82ef6ae3dccc73b3e8a655c8665e585f5a8647" + PKG_VERSION="6.1.23" + PKG_SHA256="7458372e8750afe37fd1ac3e7ab3c22f2c6018f760f8134055a03f54aba3ebeb" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; From 1cb93803d5969ae4a34ec7f61a629a478f3709c7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 12 Apr 2023 19:01:17 +0000 Subject: [PATCH 085/157] aspnet6-runtime: update to 6.0.16 --- .../aspnet6-runtime/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk index d2bffba87d..37cc5423d8 100644 --- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk +++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aspnet6-runtime" -PKG_VERSION="6.0.15" +PKG_VERSION="6.0.16" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" PKG_DEPENDS_TARGET="toolchain" @@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual" case "${ARCH}" in "aarch64") - PKG_SHA256="b37cf63d5962b2f67288a78b6541151c458bc9e67baaf5d5852b2214e858070b" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/0d9619a1-af06-40c6-9816-46d08c9e42d6/744ecc09a1058822dc08ae17a3dc9c77/aspnetcore-runtime-6.0.15-linux-arm64.tar.gz" + PKG_SHA256="eba3d57245dcc02ef7b9677a6f205d8a0b932a4aa1e552c9e9094cefab6b52c2" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/5fe35f73-59e4-462e-b7aa-98b5b8782051/74a27e03d896663a9483eb72bc59b275/aspnetcore-runtime-6.0.16-linux-arm64.tar.gz" ;; "arm") - PKG_SHA256="70afd74a6a070f629fcf44571582eec026442c4530f69afc142b92667542932c" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/c7eade0f-81ff-4587-a58e-647702814ec4/1b8c56efc82990ee986d8dd52a9a09ab/aspnetcore-runtime-6.0.15-linux-arm.tar.gz" + PKG_SHA256="717d98c382cdc3abb5e25cc7437b7ffe4b195c072a233b5be44b762d374683c7" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4054a868-d2c9-4e04-84ea-d78b6b77c8cb/f69efb40d4cc84fa5f792d0bb821eea8/aspnetcore-runtime-6.0.16-linux-arm.tar.gz" ;; "x86_64") - PKG_SHA256="930b6254500e53a4f0d87b5551840a3ac8882e93797cf1e23da40652085d44dd" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4518a0d8-9a6b-4836-ada9-096afa24efd0/ad0d8ccefb6b6a36dc108417b74775cb/aspnetcore-runtime-6.0.15-linux-x64.tar.gz" + PKG_SHA256="099a6aa6516413b88fb877d10deb1d171c1a772f1cd83cdb46003de72aec07cd" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/877a2d48-74ed-484b-85a1-605078f5e718/752ce1e38b76ffb5ebfc2ee1772307bf/aspnetcore-runtime-6.0.16-linux-x64.tar.gz" ;; esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" From 171bbd5cfb716051ea236a13f095c55a96681b85 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 14 Apr 2023 12:06:43 +0000 Subject: [PATCH 086/157] dotnet-runtime: update aspnet6-runtime to 6.0.16 --- packages/addons/tools/dotnet-runtime/changelog.txt | 3 +++ packages/addons/tools/dotnet-runtime/package.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt index e0041c9d05..21dfca6287 100644 --- a/packages/addons/tools/dotnet-runtime/changelog.txt +++ b/packages/addons/tools/dotnet-runtime/changelog.txt @@ -1,2 +1,5 @@ 1 - aspnet6-runtime: update to 6.0.15 + +2 +- aspnet6-runtime: update to 6.0.16 diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index c37df7ec11..7af96313dc 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dotnet-runtime" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" From 3a8ef09613a3275fff0ac947c04fcf7675df0fb4 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sun, 16 Apr 2023 11:28:11 +0200 Subject: [PATCH 087/157] Allwinner: u-boot: Fix sporadic DRAM size misdetection --- .../patches/u-boot/0014-unreliable-dram.patch | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 projects/Allwinner/patches/u-boot/0014-unreliable-dram.patch diff --git a/projects/Allwinner/patches/u-boot/0014-unreliable-dram.patch b/projects/Allwinner/patches/u-boot/0014-unreliable-dram.patch new file mode 100644 index 0000000000..222c60b429 --- /dev/null +++ b/projects/Allwinner/patches/u-boot/0014-unreliable-dram.patch @@ -0,0 +1,40 @@ +From: megous@megous.com +Date: Mon, 29 Jul 2019 01:39:42 +0200 +Subject: [U-Boot] [PATCH] Fix unreliable detection of DRAM size on Orange Pi 3 + +From: Ondrej Jirman + +Orange Pi 3 has 2 GiB of DRAM, that sometime get misdetected +as 4 GiB, due to false negative result from mctl_mem_matches() +when detecting number of column address bits. This leads to +u-boot detecting more address bits than there are and the +boot process hangs shortly after. + +In mctl_mem_matches() we need to wait for each write to finish, +separately. Without this, the check is not reliable for some +unknown reason, probably having to do with unpredictable memory +access ordering. + +Patch was made with help from André Przywara, who noticed that +my original idea about detection failing due to read-back from +cache without involving DRAM was false, because data cache is +still of at the time of the DRAM size autodetection. + +Signed-off-by: Ondrej Jirman +Cc: André Przywara +--- + arch/arm/mach-sunxi/dram_helpers.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/mach-sunxi/dram_helpers.c b/arch/arm/mach-sunxi/dram_helpers.c +index 239ab421a8..6dba448638 100644 +--- a/arch/arm/mach-sunxi/dram_helpers.c ++++ b/arch/arm/mach-sunxi/dram_helpers.c +@@ -30,6 +30,7 @@ bool mctl_mem_matches(u32 offset) + { + /* Try to write different values to RAM at two addresses */ + writel(0, CONFIG_SYS_SDRAM_BASE); ++ dsb(); + writel(0xaa55aa55, (ulong)CONFIG_SYS_SDRAM_BASE + offset); + dsb(); + /* Check if the same value is actually observed when reading back */ From e10d59f7506132cc323b7b71b181d0930e88220a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 29 Mar 2023 08:15:28 +0000 Subject: [PATCH 088/157] moby: update to 23.0.4 log: - https://github.com/moby/moby/compare/v23.0.1...v23.0.3 - https://github.com/moby/moby/compare/v23.0.3...v23.0.4 - https://github.com/moby/moby/milestone/117?closed=1 release notes: - https://github.com/moby/moby/releases/tag/v23.0.2 - https://github.com/moby/moby/releases/tag/v23.0.3 - https://github.com/moby/moby/releases/tag/v23.0.4 --- packages/addons/addon-depends/docker/moby/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index 8e7c9eac9d..fc0edf6c49 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="moby" -PKG_VERSION="23.0.1" -PKG_SHA256="c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56" +PKG_VERSION="23.0.4" +PKG_SHA256="6c6e965974335595eaccb17ccec927aebbc10d44b1a95262871b16c0be4c0179" PKG_LICENSE="ASL" PKG_SITE="https://mobyproject.org/" PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/moby/moby -export PKG_GIT_COMMIT="bc3805a0a0d3b5bd3f0e6c69f46ac08dd53377c7" +export PKG_GIT_COMMIT="cbce3319305c39df3405c969a12e0a5d2bad3f4f" PKG_MOBY_BUILDTAGS="daemon \ autogen \ From c0788bf03496c06f097c0a16e3c79e30469bd384 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 29 Mar 2023 08:15:36 +0000 Subject: [PATCH 089/157] cli: update to 23.0.4 log: - https://github.com/docker/cli/compare/v23.0.1...v23.0.3 - https://github.com/docker/cli/compare/v23.0.3...v23.0.4 --- packages/addons/addon-depends/docker/cli/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index 5ce6526b0c..45ed59fea0 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cli" PKG_VERSION="$(get_pkg_version moby)" -PKG_SHA256="37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94" +PKG_SHA256="477c37f128db7bb6926dc410f337cb525af4f26ea9719d38dc2978460dbe2de8" PKG_LICENSE="ASL" PKG_SITE="https://github.com/docker/cli" PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI" PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/docker/cli/releases -export PKG_GIT_COMMIT="a5ee5b1dfc9b8f08ed9e020bb54fc18550173ef6" +export PKG_GIT_COMMIT="f480fb1e374b16c8a1419e84f465f2562456145e" configure_target() { go_configure From b943cd209bc0f695ba93c0877b8f945416f8bc20 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 16 Feb 2023 08:23:15 +0000 Subject: [PATCH 090/157] go: update to 1.20.3 --- packages/addons/addon-depends/go/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 8161986a46..e72aa1d84b 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.19.5" -PKG_SHA256="1c24a6a2bf71d64d0ca8e228028d6108521f06b6edc7bf6b34ed6d767a795809" +PKG_VERSION="1.20.3" +PKG_SHA256="991a67cecebb7b9b1237fdbca76c4754a9f5e1669d5d49b58a9931813047e905" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" From 1680dbaf12a1b34c0a4c880f4a35626604d8a273 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 12 Feb 2023 06:23:20 +0000 Subject: [PATCH 091/157] containerd: update to 1.7.0 release notes: - https://github.com/containerd/containerd/releases/tag/v1.6.17 - https://github.com/containerd/containerd/releases/tag/v1.6.18 - https://github.com/containerd/containerd/releases/tag/v1.6.19 - https://github.com/containerd/containerd/releases/tag/v1.7.0 --- packages/addons/addon-depends/docker/containerd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index 2221ab1307..977aa49714 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.6.16" -PKG_SHA256="e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a" +PKG_VERSION="1.7.0" +PKG_SHA256="c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" From 3d675c9a530b60897ad9a4a6c939ca6ce23281d0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 19 Mar 2023 05:17:22 +0000 Subject: [PATCH 092/157] docker: update containerd to 1.7.0 and runc now depends on seccomp --- packages/addons/service/docker/changelog.txt | 4 +++- packages/addons/service/docker/package.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt index 927b2407d4..742392169d 100644 --- a/packages/addons/service/docker/changelog.txt +++ b/packages/addons/service/docker/changelog.txt @@ -1 +1,3 @@ -initial release +1 +- runc: build with seccomp +- containerd: update to 1.7.0 diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index dbbeb1e8c6..ecb0a0dea2 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" From b350c79dc3e2d98d22e20f5a88344f13d9a33e4f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 3 Apr 2023 12:17:07 +0000 Subject: [PATCH 093/157] docker: yadutaf/ctop is not longer maintained - drop Errors with: (because it doesn't support cgroup2) [ERROR] Failed to locate cgroup mountpoints. - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009800 - https://github.com/yadutaf/ctop/ to be replaced with - https://ctop.sh - https://github.com/bcicen/ctop --- .../addons/service/docker/source/bin/ctop | 1043 ----------------- 1 file changed, 1043 deletions(-) delete mode 100644 packages/addons/service/docker/source/bin/ctop diff --git a/packages/addons/service/docker/source/bin/ctop b/packages/addons/service/docker/source/bin/ctop deleted file mode 100644 index 29fbd495db..0000000000 --- a/packages/addons/service/docker/source/bin/ctop +++ /dev/null @@ -1,1043 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -''' -Monitor local cgroups as used by Docker, LXC, SystemD, ... - -Usage: - ctop [--tree] [--refresh=] [--columns=] [--sort-col=] [--follow=] [--fold=, ...] - ctop (-h | --help) - -Options: - --tree Show tree view by default. - --fold= Start with cgroup path folded - --follow= Follow/highlight cgroup at path. - --refresh= Refresh display every [default: 1]. - --columns= List of optional columns to display. Always includes 'name'. [default: owner,processes,memory,cpu-sys,cpu-user,blkio,cpu-time]. - --sort-col= Select column to sort by initially. Can be changed dynamically. [default: cpu-user] - --type=[types] Only keep containers of this types - -h --help Show this screen. - -''' - -from __future__ import print_function -import os -import re -import sys -import stat -import pwd -import time -import pty -import errno -import subprocess -import multiprocessing -import json - -from collections import defaultdict -from collections import namedtuple - -from optparse import OptionParser - - -try: - import curses, _curses -except ImportError: - print("Curse is not available on this system. Exiting.", file=sys.stderr) - sys.exit(0) - -def cmd_exists(cmd): - try: - return subprocess.call(["which", cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 - except OSError: - return False - -HAS_LXC = cmd_exists('lxc-start') -HAS_DOCKER = cmd_exists('docker') -HAS_OPENVZ = cmd_exists('vzctl') -regexp_ovz_container = re.compile('^/\d+$') - - -HIDE_EMPTY_CGROUP = True -CGROUP_MOUNTPOINTS={} -CONFIGURATION = { - 'sort_by': 'cpu_total', - 'sort_asc': False, - 'tree': False, - 'follow': False, - 'pause_refresh': False, - 'refresh_interval': 1.0, - 'columns': [], - 'selected_line': None, - 'offset': 0, - 'selected_line_num': 0, - 'selected_line_name': '/', - 'cgroups': [], - 'fold': [], - 'type': [], -} - -Column = namedtuple('Column', ['title', 'width', 'align', 'col_fmt', 'col_data', 'col_sort']) - -COLUMNS = [] -COLUMNS_MANDATORY = ['name'] -COLUMNS_AVAILABLE = { - 'owner': Column("OWNER", 10, '<', '{0:%ss}', 'owner', 'owner'), - 'type': Column("TYPE", 10, '<', '{0:%ss}', 'type', 'type'), - 'processes': Column("PROC", 11, '>', '{0:%ss}', 'tasks', 'tasks'), - 'memory': Column("MEMORY", 17, '^', '{0:%ss}', 'memory_cur_str', 'memory_cur_bytes'), - 'cpu-sys': Column("SYST", 5, '^', '{0: >%s.1%%}', 'cpu_syst', 'cpu_total'), - 'cpu-user': Column("USER", 5, '^', '{0: >%s.1%%}', 'cpu_user', 'cpu_total'), - 'blkio': Column("BLKIO", 10, '^', '{0: >%s}', 'blkio_bw', 'blkio_bw_bytes'), - 'cpu-time': Column("TIME+", 14, '^', '{0: >%ss}', 'cpu_total_str', 'cpu_total_seconds'), - 'name': Column("CGROUP", '', '<', '{0:%ss}', 'cgroup', 'cgroup'), -} - -DOCKER_PREFIXES = ["/docker/", "/system.slice/docker-", "/system.slice/docker/"] - -# TODO: -# - visual CPU/memory usage -# - auto-color -# - persist preferences -# - dynamic column width -# - handle small screens -# - massive refactoring. This code U-G-L-Y - -## Utils - - -def strip_prefix(prefix, text): - if text.startswith(prefix): - return text[len(prefix):] - return text - - -def docker_container_name(container_id, default, cache=dict()): - # Python's default arguments are evaluated when the function is - # defined, not when the function is called. - # We potentially cache and return a default value so we don't spend time - # pointlessly retrying to get the container name if something goes wrong. - cached_name = cache.get(container_id) - if cached_name: - return cached_name - - try: - sp = subprocess.Popen(['docker', 'inspect', container_id], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) - except OSError: - # `docker` is not on PATH - cache[container_id] = default - return default - - for _ in range(10): - sp.poll() - if sp.returncode is not None: - break - time.sleep(0.1) - - if sp.returncode is None: - try: - sp.kill() - except OSError: - # OSError: [Errno 3] No such process - pass - elif sp.returncode == 0: - stdout, _stderr = sp.communicate() - try: - containers = json.loads(stdout) - if len(containers) == 1: - container = containers[0] - container_name = container['Name'].lstrip('/') - name = '/docker/' + container_name - cache[container_id] = name - return name - except Exception: - pass - - cache[container_id] = default - return default - - -def to_human(num, suffix='B'): - num = int(num) - for unit in [' ','K','M','G','T','P','E','Z']: - if abs(num) < 1024.0: - return "{0:.1f}{1}{2}".format(num, unit, suffix) - num /= 1024.0 - return "{0:5.1d}{1}{2}" % (num, 'Y', suffix) - -def div(num, by): - res = num / by - mod = num % by - return res, mod - -def to_human_time(seconds): - minutes, seconds = div(seconds, 60) - hours, minutes = div(minutes, 60) - days, hours = div(hours, 24) - if days: - return '%3dd %02d:%02d.%02d' % (days, hours, minutes, seconds) - else: - return '%02d:%02d.%02d' % (hours, minutes, seconds) - -def get_total_memory(): - ''' - Get total memory from /proc if available. - ''' - try: - with open('/proc/meminfo') as f: - content = f.read() - except OSError: - content = '' - - for line in content.split('\n'): - fields = re.split(' +', line) - if fields[0].strip() == "MemTotal:": - return int(fields[1])*1024 - - return -1 - -def run(user, cmd, interactive=False): - ''' - Run ``cmd`` as ``user``. If ``interactive`` is True, save any curses status - and synchronously run the command in foreground. Otherwise, run the command - in background, discarding any output. - - special user -2 means: current user - ''' - prefix = [] - cur_uid = os.getuid() - try: - cur_user = pwd.getpwuid(cur_uid).pw_name - except: - cur_user = cur_uid - - if user != cur_user and user != -2: - if cur_uid == 0: - prefix = ['su', user] - if user == 'root': - prefix = ['sudo'] - else: - prefix = ['sudo', '-u', user] - - if interactive: - # Prepare screen for interactive command - curses.savetty() - curses.nocbreak() - curses.echo() - curses.endwin() - - # Run command - pty.spawn(prefix+cmd) - - # Restore screen - init_screen() - curses.resetty() - else: - with open('/dev/null', 'w') as dev_null: - subprocess.Popen( - prefix+cmd, - stdout=dev_null, - stderr=dev_null, - close_fds=True, - ) - -class Cgroup(object): - def __init__(self, path, base_path): - self.path = path - self.base_path = base_path - - @property - def short_path(self): - return self.path[len(self.base_path):] or '/' - - @property - def name(self): - if HAS_DOCKER and self.type == 'docker': - container_id = self.short_path - for prefix in DOCKER_PREFIXES: - container_id = strip_prefix(prefix, container_id) - return docker_container_name(container_id, default=self.short_path) - - return self.short_path - - @property - def owner(self): - path = os.path.join(self.base_path, self.path, 'tasks') - uid = os.stat(path).st_uid - try: - return pwd.getpwuid(uid).pw_name - except: - return uid - - @property - def type(self): - path = self.short_path - - # Guess cgroup owner - if any(path.startswith(prefix) for prefix in DOCKER_PREFIXES): - return 'docker' - elif path.startswith('/lxc/'): - return 'lxc' - elif path.startswith('/user.slice/'): - _, parent, name = path.rsplit('/', 2) - if parent.endswith('.scope'): - if os.path.isdir('/home/%s/.local/share/lxc/%s' % (self.owner, name)): - return 'lxc-user' - return 'systemd' - elif path == '/user.slice' or path == '/system.slice' or path.startswith('/system.slice/'): - return 'systemd' - elif regexp_ovz_container.match(path) and path != '/0' and HAS_OPENVZ: - return 'openvz' - else: - return '-' - - def _coerce(self, value): - try: - return int(value) - except: - pass - - try: - return float(value) - except: - pass - - return value - - def __getitem__(self, name): - path = os.path.join(self.base_path, self.path, name) - - with open(path) as f: - content = f.read().strip() - - if name == 'tasks' or '\n' in content or ' ' in content: - content = content.split('\n') - - if ' ' in content[0]: - content = dict((re.split(' +', l, 1) for l in content if content)) - for k, v in content.items(): - content[k] = self._coerce(v) - else: - content = [self._coerce(v) for v in content if v] - - else: - content = self._coerce(content) - - return content - -def cgroups(base_path): - ''' - Generator of cgroups under path ``name`` - ''' - for cgroup_path, dirs, files in os.walk(base_path): - yield Cgroup(cgroup_path, base_path) - -## Grab cgroup data - -def init(): - # Get all cgroup subsystems avalaible on this system - with open("/proc/cgroups") as f: - cgroups = f.read().strip() - - subsystems = [] - for cgroup in cgroups.split('\n'): - if cgroup[0] == '#': continue - subsystems.append(cgroup.split()[0]) - - # Match cgroup mountpoints to susbsytems. Always take the first matching - with open("/proc/mounts") as f: - mounts = f.read().strip() - - for mount in mounts.split('\n'): - mount = mount.split(' ') - - if mount[2] != "cgroup": - continue - - for arg in mount[3].split(','): - if arg in subsystems and arg not in CGROUP_MOUNTPOINTS: - CGROUP_MOUNTPOINTS[arg] = mount[1] - -def collect_ensure_common(data, cgroup): - ''' - Some cgroup exists in only one controller. Attempt to collect common metrics - (tasks clount, owner, ...) from the first controller we find the task in. - ''' - if 'tasks' in data: - return - - # Collect - data['tasks'] = cgroup['tasks'] - data['owner'] = cgroup.owner - data['type'] = cgroup.type - -def get_user_beacounts(): - ''' - get memory stats(via privvmpages) from vzlist output to openvz containers - ''' - prefix = [] - if os.getuid() != 0: - prefix = ['sudo'] - - command = prefix + ['vzlist', '-o', 'ctid,privvmpages,privvmpages.l', '-H'] - output, err = subprocess.Popen(command, shell=False, stdout=subprocess.PIPE).communicate() - return output - - -def collect(measures): - cur = defaultdict(dict) - prev = measures['data'] - - - # Collect CPU statistics - if 'cpuacct' in CGROUP_MOUNTPOINTS: - # list all "folders" under mountpoint - for cgroup in cgroups(CGROUP_MOUNTPOINTS['cpuacct']): - collect_ensure_common(cur[cgroup.name], cgroup) - - # Collect CPU stats - cur[cgroup.name]['cpuacct.stat'] = cgroup['cpuacct.stat'] - cur[cgroup.name]['cpuacct.stat.diff'] = {'user':0, 'system':0} - - # Collect CPU increase on run > 1 - if cgroup.name in prev: - for key, value in cur[cgroup.name]['cpuacct.stat'].items(): - cur[cgroup.name]['cpuacct.stat.diff'][key] = value - prev[cgroup.name]['cpuacct.stat'][key] - - # Collect BlockIO statistics - if 'blkio' in CGROUP_MOUNTPOINTS: - # list all "folders" under mountpoint - for cgroup in cgroups(CGROUP_MOUNTPOINTS['blkio']): - collect_ensure_common(cur[cgroup.name], cgroup) - - # Collect BlockIO stats - try: - cur[cgroup.name]['blkio.throttle.io_service_bytes'] = cgroup['blkio.throttle.io_service_bytes'] - cur[cgroup.name]['blkio.throttle.io_service_bytes.diff'] = {'total':0} - except IOError as e: - # Workaround broken systems (see #15) - if e.errno == errno.ENOENT: - continue - raise - - # Collect BlockIO increase on run > 1 - if cgroup.name in prev: - cur_val = cur[cgroup.name]['blkio.throttle.io_service_bytes']['Total'] - prev_val = prev[cgroup.name]['blkio.throttle.io_service_bytes']['Total'] - cur[cgroup.name]['blkio.throttle.io_service_bytes.diff']['total'] = cur_val - prev_val - - # Collect memory statistics - if 'memory' in CGROUP_MOUNTPOINTS: - # list all "folders" under mountpoint - for cgroup in cgroups(CGROUP_MOUNTPOINTS['memory']): - collect_ensure_common(cur[cgroup.name], cgroup) - cur[cgroup.name]['memory.usage_in_bytes'] = cgroup['memory.usage_in_bytes'] - cur[cgroup.name]['memory.limit_in_bytes'] = min(int(cgroup['memory.limit_in_bytes']), measures['global']['total_memory']) - - # Collect PIDs constraints. Root cgroup does *not* have the controller files - if 'pids' in CGROUP_MOUNTPOINTS: - # list all "folders" under mountpoint - for cgroup in cgroups(CGROUP_MOUNTPOINTS['pids']): - if cgroup.name == "/": - continue - collect_ensure_common(cur[cgroup.name], cgroup) - cur[cgroup.name]['pids.max'] = cgroup['pids.max'] - - #Collect memory statistics for openvz - if HAS_OPENVZ: - user_beancounters = get_user_beacounts() - # We have lines like - - # 1202 202419 2457600 - # 1203 299835 2457600 - # 1207 54684 2457600 - # 1210 304939 2457600 - #1000001212 13493 2457600 - for line in user_beancounters.split('\n'): - if line == '': - continue - line = re.sub(r'^\s+', '', line) - splited_line = re.split('\s+', line) - if len(splited_line) != 3: - continue - ctid, privvmpages, limit = splited_line - ctid = '/' + ctid - if 'tasks' not in cur[ctid]: - continue - privvmpages = int(privvmpages) - privvmpages = privvmpages * 4096 - limit = int(limit) - limit = limit * 4096 - cur[ctid]['memory.usage_in_bytes'] = privvmpages - cur[ctid]['memory.limit_in_bytes'] = min(limit, measures['global']['total_memory']) - - # Sanity check: any data at all ? - if not len(cur): - raise KeyboardInterrupt() - - # Apply - measures['data'] = cur - -def built_statistics(measures, conf): - # Time - prev_time = measures['global'].get('time', -1) - cur_time = time.time() - time_delta = cur_time - prev_time - measures['global']['time'] = cur_time - cpu_to_percent = measures['global']['scheduler_frequency'] * measures['global']['total_cpu'] * time_delta - - # Build data lines - results = [] - for cgroup, data in measures['data'].items(): - cpu_usage = data.get('cpuacct.stat.diff', {}) - line = { - 'owner': str(data.get('owner', 'nobody')), - 'type': str(data.get('type', 'cgroup')), - 'cur_tasks': len(data['tasks']), - 'max_tasks': data.get('pids.max', 'max'), - 'memory_cur_bytes': data.get('memory.usage_in_bytes', 0), - 'memory_limit_bytes': data.get('memory.limit_in_bytes', measures['global']['total_memory']), - 'cpu_total_seconds': data.get('cpuacct.stat', {}).get('system', 0) + data.get('cpuacct.stat', {}).get('user', 0), - 'cpu_syst': cpu_usage.get('system', 0) / cpu_to_percent, - 'cpu_user': cpu_usage.get('user', 0) / cpu_to_percent, - 'blkio_bw_bytes': data.get('blkio.throttle.io_service_bytes.diff', {}).get('total', 0), - 'cgroup': cgroup, - } - line['cpu_total'] = line['cpu_syst'] + line['cpu_user'], - line['cpu_total_str'] = to_human_time(line['cpu_total_seconds']) - line['memory_cur_percent'] = line['memory_cur_bytes'] / line['memory_limit_bytes'] - line['memory_cur_str'] = "{0: >7}/{1: <7}".format(to_human(line['memory_cur_bytes']), to_human(line['memory_limit_bytes'])) - line['tasks'] = "{0: >5}/{1: <5}".format(line['cur_tasks'], line['max_tasks']) - line['blkio_bw'] = to_human(line['blkio_bw_bytes'], 'B/s') - results.append(line) - - return results - -def render_tree(results, tree, level=0, prefix=[], node='/'): - # Exit condition - if node not in tree: - return - - # Iteration - for i, line in enumerate(tree[node]): - cgroup = line['cgroup'] - - # Build name - if i == len(tree[node]) - 1: - line['_tree'] = prefix + [curses.ACS_LLCORNER, curses.ACS_HLINE, ' '] - _child_prefix = prefix + [' ', ' ', ' '] - else: - line['_tree'] = prefix + [curses.ACS_LTEE, curses.ACS_HLINE, ' '] - _child_prefix = prefix + [curses.ACS_VLINE, ' ', ' '] - - # Commit, fold or recurse - results.append(line) - if cgroup not in CONFIGURATION['fold']: - render_tree(results, tree, level+1, _child_prefix, cgroup) - else: - line['_tree'] [-2] = '+' - -def filter_tree(tree, keep, node='/'): - ''' - Keep a branch if and only if it is of of a 'keep' type or has a child of - the 'keep' type - ''' - filtered = [] - - # Filter - for cgroup in tree.get(node, []): - if filter_tree(tree, keep, cgroup['cgroup']): - filtered.append(cgroup) - elif cgroup['type'] in keep: - filtered.append(cgroup) - - # Commit - if filtered: - tree[node] = filtered - else: - tree.pop(node, None) - - return bool(filtered) - -def prepare_tree(results): - ''' - Filter results for matching types and render tree - ''' - ## List view - if not CONFIGURATION['tree']: - # Fast track: if there is no filter, do not filter - if not CONFIGURATION['type']: - return results - - # Slow track: do filter - return [l for l in results if l['type'] in CONFIGURATION['type']] - - ## Tree view - tree = {} - rendered = [] - - # Build tree - for line in results: - cgroup = line['cgroup'] - parent = os.path.dirname(cgroup) - - # Root cgroup ? - if parent == cgroup: - rendered.append(line) - continue - - # Insert in hierarchie as needed - if parent not in tree: - tree[parent] = [] - tree[parent].append(line) - - # If there are filters, filter - if CONFIGURATION['type']: - filter_tree(tree, CONFIGURATION['type']) - - # Render tree, starting from root - render_tree(rendered, tree) - return rendered - -def display(scr, results, conf): - # Sort and render - results = sorted(results, key=lambda line: line.get(conf['sort_by'], 0), reverse=not conf['sort_asc']) - results = prepare_tree(results) - - CONFIGURATION['cgroups'] = [cgroup['cgroup'] for cgroup in results] - - # Ensure selected line name synced with num - if CONFIGURATION['follow']: - while True: - try: - i = CONFIGURATION['cgroups'].index(CONFIGURATION['selected_line_name']) - CONFIGURATION['selected_line_num'] = i - break - except: - CONFIGURATION['selected_line_name'] = os.path.dirname(CONFIGURATION['selected_line_name']) - else: - CONFIGURATION['selected_line_num'] = min(len(results)-1, CONFIGURATION['selected_line_num']) - CONFIGURATION['selected_line_name'] = CONFIGURATION['cgroups'][CONFIGURATION['selected_line_num']] - CONFIGURATION['selected_line'] = results[CONFIGURATION['selected_line_num']] - - # Get display informations - height, width = scr.getmaxyx() - list_height = height - 2 # title + status lines - - # Update offset - max_offset = max(0, len(results) - list_height) - # selected line above screen limit - if CONFIGURATION['selected_line_num'] < CONFIGURATION['offset']: - CONFIGURATION['offset'] = CONFIGURATION['selected_line_num'] - # selected line below screen limit - elif CONFIGURATION['selected_line_num'] - CONFIGURATION['offset'] > list_height - 1: - CONFIGURATION['offset'] = CONFIGURATION['selected_line_num'] - list_height + 1 - # offset non consistent - elif CONFIGURATION['offset'] > max_offset: - CONFIGURATION['offset'] = max_offset - - # Display statistics - scr.clear() - - # Title line && templates - x = 0 - line_tpl = [] - scr.addstr(0, 0, ' '*width, curses.color_pair(1)) - - for col in COLUMNS: - # Build templates - title_fmt = '{0:%s%ss}' % (col.align, col.width) - line_tpl.append(col.col_fmt % (col.width)) - - # Build title line - color = 2 if col.col_sort == conf['sort_by'] else 1 - try: - scr.addstr(0, x, title_fmt.format(col.title)+' ', curses.color_pair(color)) - except: - # Handle narrow screens - break - if col.width: - x += col.width + 1 - - # Content - lineno = 1 - for line in results[CONFIGURATION['offset']:]: - y = 0 - if lineno-1 == CONFIGURATION['selected_line_num']-CONFIGURATION['offset']: - col_reg, col_tree = curses.color_pair(2), curses.color_pair(2) - else: - col_reg, col_tree = colors = curses.color_pair(0), curses.color_pair(4) - - # Draw line background - try: - scr.addstr(lineno, 0, ' '*width, col_reg) - except _curses.error: - # Handle small screens - break - - # Draw line content - try: - for col in COLUMNS: - cell_tpl = col.col_fmt % (col.width if col.width else 1) - data_point = line.get(col.col_data, '') - - if col.title == 'CGROUP' and CONFIGURATION['tree']: - data_point = os.path.basename(data_point) or '[root]' - - for c in line.get('_tree', []): - scr.addch(c, col_tree) - y+=1 - - scr.addstr(lineno, y, cell_tpl.format(data_point)+' ', col_reg) - if col.width: - y += col.width + 1 - except _curses.error: - # Handle narrow screens - pass - lineno += 1 - else: - # Make sure last line did not wrap, clear it if needed - try: scr.addstr(lineno, 0, ' '*width) - except _curses.error: pass - - # status line - try: - color = curses.color_pair(2) - try: - scr.addstr(height-1, 0, ' '*(width), color) - except: - # Last char wraps, on purpose: draw full line - pass - - selected = results[CONFIGURATION['selected_line_num']] - - scr.addstr(height-1, 0, " CTOP ", color) - scr.addch(curses.ACS_VLINE, color) - scr.addstr(" [P]ause: "+('On ' if CONFIGURATION['pause_refresh'] else 'Off '), color) - scr.addch(curses.ACS_VLINE, color) - scr.addstr(" [F]ollow: "+('On ' if CONFIGURATION['follow'] else 'Off ') , color) - scr.addch(curses.ACS_VLINE, color) - scr.addstr(" [F5] Toggle %s view "%('list' if CONFIGURATION['tree'] else 'tree'), color) - scr.addch(curses.ACS_VLINE, color) - - # Fold control - if CONFIGURATION['tree']: - scr.addstr(" [+/-] %s "%('unfold' if selected['cgroup'] in CONFIGURATION['fold'] else 'fold'), color) - scr.addch(curses.ACS_VLINE, color) - - # Do we have any actions available for *selected* line ? - selected_type = selected['type'] - if selected_type == 'docker' and HAS_DOCKER or \ - selected_type in ['lxc', 'lxc-user'] and HAS_LXC or \ - selected_type == 'openvz' and HAS_OPENVZ: - if selected_type == 'openvz': - scr.addstr(" [A]ttach, [E]nter, [S]top, [C]hkpnt, [K]ill ", color) - else: - scr.addstr(" [A]ttach, [E]nter, [S]top, [K]ill ", color) - scr.addch(curses.ACS_VLINE, color) - - scr.addstr(" [Q]uit", color) - except _curses.error: - # Handle narrow screens - pass - - scr.refresh() - -def set_sort_col(sort_by): - if CONFIGURATION['sort_by'] == sort_by: - CONFIGURATION['sort_asc'] = not CONFIGURATION['sort_asc'] - else: - CONFIGURATION['sort_by'] = sort_by - -def on_keyboard(c): - '''Handle keyborad shortcuts''' - if c == ord('q'): - raise KeyboardInterrupt() - elif c == ord('p'): - CONFIGURATION['pause_refresh'] = not CONFIGURATION['pause_refresh'] - elif c == ord('f'): - CONFIGURATION['follow'] = not CONFIGURATION['follow'] - return 2 - elif c == ord('+') or c == ord('-'): - cgroup = CONFIGURATION['selected_line']['cgroup'] - if cgroup in CONFIGURATION['fold']: - CONFIGURATION['fold'].remove(cgroup) - else: - CONFIGURATION['fold'].append(cgroup) - return 2 - elif c == ord('a'): - selected = CONFIGURATION['selected_line'] - selected_name = os.path.basename(selected['cgroup']) - - if selected['type'] == 'docker' and HAS_DOCKER: - if selected_name.startswith('docker-'): - selected_name = selected_name[7:-6] - run(-2, ['docker', 'attach', selected_name], interactive=True) - elif selected['type'] in ['lxc', 'lxc-user'] and HAS_LXC: - run(selected['owner'], ['lxc-console', '--name', selected_name, '--', '/bin/bash'], interactive=True) - elif selected['type'] == 'openvz' and HAS_OPENVZ: - run(selected['owner'], ['vzctl', 'console', selected_name], interactive=True) - - return 2 - elif c == ord('e'): - selected = CONFIGURATION['selected_line'] - selected_name = os.path.basename(selected['cgroup']) - - if selected['type'] == 'docker' and HAS_DOCKER: - if selected_name.startswith('docker-'): - selected_name = selected_name[7:-6] - run(-2, ['docker', 'exec', '-it', selected_name, '/bin/bash'], interactive=True) - elif selected['type'] in ['lxc', 'lxc-user'] and HAS_LXC: - run(selected['owner'], ['lxc-attach', '--name', selected_name, '--', '/bin/bash'], interactive=True) - elif selected['type'] == 'openvz' and HAS_OPENVZ: - run(selected['owner'], ['vzctl', 'enter', selected_name], interactive=True) - - return 2 - elif c == ord('s'): - selected = CONFIGURATION['selected_line'] - selected_name = os.path.basename(selected['cgroup']) - - if selected['type'] == 'docker' and HAS_DOCKER: - if selected_name.startswith('docker-'): - selected_name = selected_name[7:-6] - run(-2, ['docker', 'stop', selected_name]) - elif selected['type'] in ['lxc', 'lxc-user'] and HAS_LXC: - run(selected['owner'], ['lxc-stop', '--name', selected_name, '--nokill', '--nowait']) - elif selected['type'] == 'openvz' and HAS_OPENVZ: - run(selected['owner'], ['vzctl', 'stop', selected_name]) - - return 1 - elif c == ord('c'): - selected = CONFIGURATION['selected_line'] - selected_name = os.path.basename(selected['cgroup']) - - if selected['type'] == 'openvz' and HAS_OPENVZ: - run(selected['owner'], ['vzctl', 'chkpnt', selected_name]) - - return 1 - elif c == ord('k'): - selected = CONFIGURATION['selected_line'] - selected_name = os.path.basename(selected['cgroup']) - - if selected['type'] == 'docker' and HAS_DOCKER: - if selected_name.startswith('docker-'): - selected_name = selected_name[7:-6] - run(-2, ['docker', 'stop', '-t', '0', selected_name]) - elif selected['type'] in ['lxc', 'lxc-user'] and HAS_LXC: - run(selected['owner'], ['lxc-stop', '-k', '--name', selected_name, '--nowait']) - elif selected['type'] == 'openvz' and HAS_OPENVZ: - run(selected['owner'], ['vzctl', 'stop', selected_name, '--fast']) - - return 2 - elif c == 269: # F5 - CONFIGURATION['tree'] = not CONFIGURATION['tree'] - return 2 - elif c == curses.KEY_DOWN: - if CONFIGURATION['follow']: - i = CONFIGURATION['cgroups'].index(CONFIGURATION['selected_line_name']) - else: - i = CONFIGURATION['selected_line_num'] - i = min(i+1, len(CONFIGURATION['cgroups'])-1) - CONFIGURATION['selected_line_num'] = i - CONFIGURATION['selected_line_name'] = CONFIGURATION['cgroups'][i] - return 2 - elif c == curses.KEY_UP: - if CONFIGURATION['follow']: - i = CONFIGURATION['cgroups'].index(CONFIGURATION['selected_line_name']) - else: - i = CONFIGURATION['selected_line_num'] - i = max(i-1, 0) - CONFIGURATION['selected_line_num'] = i - CONFIGURATION['selected_line_name'] = CONFIGURATION['cgroups'][i] - return 2 - return 1 - -def on_mouse(): - '''Update selected line / sort''' - _, x, y, z, bstate = curses.getmouse() - - # Left button click ? - if bstate & curses.BUTTON1_CLICKED: - # Is it title line ? - if y == 0: - # Determine sort column based on offset / col width - x_max = 0 - for col in COLUMNS: - if not col.width: - set_sort_col(col.col_sort) - elif x < x_max+col.width: - set_sort_col(col.col_sort) - else: - x_max += col.width + 1 - continue - return 2 - # Is it a cgroup line ? - elif y <= len(CONFIGURATION['cgroups']): - if CONFIGURATION['follow']: - CONFIGURATION['selected_line_name'] = CONFIGURATION['cgroups'][y-1] - else: - CONFIGURATION['selected_line_num'] = y-1 - return 2 - return 1 - -def on_resize(): - '''Redraw screen, do not refresh''' - return 2 - -def event_listener(scr, timeout): - ''' - Wait for curses events on screen ``scr`` at mot ``timeout`` ms - - return - - 1 OK - - 2 redraw - - 0 error - ''' - try: - scr.timeout(timeout) - c = scr.getch() - if c == -1: - return 1 - elif c == curses.KEY_MOUSE: - return on_mouse() - elif c == curses.KEY_RESIZE: - return on_resize() - else: - return on_keyboard(c) - except _curses.error: - return 0 - -def rebuild_columns(): - del COLUMNS[:] - for col in CONFIGURATION['columns']+COLUMNS_MANDATORY: - COLUMNS.append(COLUMNS_AVAILABLE[col]) - -def diagnose(): - devnull = open(os.devnull, 'w') - if os.path.isfile('/.dockerenv'): - print(""" -Hint: It seems you are running inside a Docker container. - Please make sure to expose host's cgroups with - '--volume=/sys/fs/cgroup:/sys/fs/cgroup:ro'""", file=sys.stderr) - - if cmd_exists('boot2docker'): - print(""" -Hint: It seems you have 'boot2docker' installed. - To monitor Docker containers in 'boot2docker' - run CTOP inside the VM itself with: - $ docker run --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro -it --rm yadutaf/ctop""", file=sys.stderr) - devnull.close() - -def init_screen(): - curses.start_color() # load colors - curses.use_default_colors() - curses.noecho() # do not echo text - curses.cbreak() # do not wait for "enter" - - # Hide cursor, if terminal AND curse supports it - if hasattr(curses, 'curs_set'): - try: - curses.curs_set(0) - except: - pass - -def main(): - # Parse arguments - parser = OptionParser() - parser.add_option("--tree", action="store_true", default=False, help="show tree view by default") - parser.add_option("--refresh", action="store", type="int", default=1, help="Refresh display every ") - parser.add_option("--follow", action="store", type="string", default="", help="Follow cgroup path") - parser.add_option("--fold", action="append", help="Fold cgroup sub tree") - parser.add_option("--type", action="append", help="Only show containers of this type") - parser.add_option("--columns", action="store", type="string", default="owner,type,processes,memory,cpu-sys,cpu-user,blkio,cpu-time", help="List of optional columns to display. Always includes 'name'") - parser.add_option("--sort-col", action="store", type="string", default="cpu-user", help="Select column to sort by initially. Can be changed dynamically.") - - options, args = parser.parse_args() - - CONFIGURATION['tree'] = options.tree - CONFIGURATION['refresh_interval'] = float(options.refresh) - CONFIGURATION['columns'] = [] - CONFIGURATION['fold'] = options.fold or list() - CONFIGURATION['type'] = options.type or list() - - if options.follow: - CONFIGURATION['selected_line_name'] = options.follow - CONFIGURATION['follow'] = True - - for col in options.columns.split(','): - col = col.strip() - if col in COLUMNS_MANDATORY: - continue - if not col in COLUMNS_AVAILABLE: - print("Invalid column name", col, file=sys.stderr) - print(__doc__) - sys.exit(1) - CONFIGURATION['columns'].append(col) - rebuild_columns() - - if options.sort_col not in COLUMNS_AVAILABLE: - print("Invalid sort column name", options.sort_col, file=sys.stderr) - print(__doc__) - sys.exit(1) - CONFIGURATION['sort_by'] = COLUMNS_AVAILABLE[options.sort_col].col_sort - - # Initialization, global system data - measures = { - 'data': defaultdict(dict), - 'global': { - 'total_cpu': multiprocessing.cpu_count(), - 'total_memory': get_total_memory(), - 'scheduler_frequency': os.sysconf('SC_CLK_TCK'), - } - } - - init() - - if not CGROUP_MOUNTPOINTS: - print("[ERROR] Failed to locate cgroup mountpoints.", file=sys.stderr) - diagnose() - sys.exit(1) - - results = None - - try: - # Curse initialization - stdscr = curses.initscr() - init_screen() - stdscr.keypad(1) # parse keypad control sequences - - # Curses colors - curses.init_pair(1, curses.COLOR_BLACK, curses.COLOR_GREEN) # header - curses.init_pair(2, curses.COLOR_BLACK, curses.COLOR_CYAN) # focused header / line - curses.init_pair(3, curses.COLOR_WHITE, -1) # regular - curses.init_pair(4, curses.COLOR_CYAN, -1) # tree - - # Main loop - while True: - collect(measures) - results = built_statistics(measures, CONFIGURATION) - display(stdscr, results, CONFIGURATION) - sleep_start = time.time() - while CONFIGURATION['pause_refresh'] or time.time() < sleep_start + CONFIGURATION['refresh_interval']: - if CONFIGURATION['pause_refresh']: - to_sleep = -1 - else: - to_sleep = int((sleep_start + CONFIGURATION['refresh_interval'] - time.time())*1000) - ret = event_listener(stdscr, to_sleep) - if ret == 2: - display(stdscr, results, CONFIGURATION) - except KeyboardInterrupt: - pass - finally: - curses.nocbreak() - stdscr.keypad(0) - curses.echo() - curses.endwin() - - # If we found only root cgroup, me may be expecting to run in a boot2docker instance - if results is not None and len(results) < 2: - print("[WARN] Failed to find any relevant cgroup/container.", file=sys.stderr) - diagnose() - -if __name__ == "__main__": - main() - From 5533b2f389f408b2f98919cfeb96e918fb530320 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 3 Apr 2023 12:18:12 +0000 Subject: [PATCH 094/157] ctop: initial package Replaces yadutaf/ctop as it is not longer maintained - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1009800 - https://github.com/yadutaf/ctop/ References - https://ctop.sh - https://github.com/bcicen/ctop --- .../addon-depends/docker/ctop/package.mk | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/addons/addon-depends/docker/ctop/package.mk diff --git a/packages/addons/addon-depends/docker/ctop/package.mk b/packages/addons/addon-depends/docker/ctop/package.mk new file mode 100644 index 0000000000..1db2070ede --- /dev/null +++ b/packages/addons/addon-depends/docker/ctop/package.mk @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="ctop" +PKG_VERSION="0.7.7" +PKG_SHA256="0db439f2030af73ad5345884b08a33a762c3b41b30604223dd0ebddde72d2741" +PKG_LICENSE="MIT" +PKG_SITE="https://ctop.sh" +PKG_URL="https://github.com/bcicen/ctop/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain go:host" +PKG_LONGDESC="Top-like interface for container metrics" +PKG_TOOLCHAIN="manual" + +# Git commit of the matching release https://github.com/bcicen/ctop/releases +PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4" + +pre_make_target() { + go_configure + + export CTOP_VERSION=${PKG_VERSION} + export CTOP_REVISION=${PKG_GIT_COMMIT} + export CTOP_PKG=github.com/bcicen/ctop + export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}" + + mkdir -p ${GOPATH}/src/github.com/bcicen + ln -fs ${PKG_BUILD} ${GOPATH}/src/${CTOP_PKG} +} + +make_target() { + mkdir -p bin + ${GOLANG} build -v -o bin/ctop -a -tags "static_build release" -ldflags "${LDFLAGS}" +} From b4907acc8e78ddeb2c71fae3cf7535fbc184a8b0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 3 Apr 2023 12:58:14 +0000 Subject: [PATCH 095/157] docker: include replacement ctop from https://ctop.sh --- packages/addons/service/docker/package.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index ecb0a0dea2..8f5d54eb32 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -7,7 +7,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" -PKG_DEPENDS_TARGET="cli containerd moby runc tini" +PKG_DEPENDS_TARGET="cli containerd ctop moby runc tini" PKG_SECTION="service/system" PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere." PKG_LONGDESC="Docker containers can encapsulate any payload, and will run consistently on and between virtually any server. The same container that a developer builds and tests on a laptop will run at scale, in production*, on VMs, bare-metal servers, OpenStack clusters, public instances, or combinations of the above." @@ -32,6 +32,9 @@ addon() { cp -P $(get_build_dir containerd)/bin/containerd-shim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim cp -P $(get_build_dir containerd)/bin/containerd-shim-runc-v2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/containerd-shim-runc-v2 + # ctop + cp -P $(get_build_dir ctop)/bin/ctop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ctop + # runc cp -P $(get_build_dir runc)/bin/runc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/runc From 17de9d54ac865f17158ad7116cae98cab9b2906e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 29 Mar 2023 08:51:40 +0000 Subject: [PATCH 096/157] docker: update to 23.0.4 and addon (3) --- packages/addons/service/docker/changelog.txt | 11 ++++++++++- packages/addons/service/docker/package.mk | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt index 742392169d..24a2ef3b08 100644 --- a/packages/addons/service/docker/changelog.txt +++ b/packages/addons/service/docker/changelog.txt @@ -1,3 +1,12 @@ 1 -- runc: build with seccomp +- not released for LE11 + +2 +- not released for LE11 + +3 +- fix ctop +- update moby and cli to 23.0.4 - containerd: update to 1.7.0 +- runc: build with seccomp +- runc: update to 1.1.5 diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 8f5d54eb32..85e601603a 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="1" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" From af4ea9d43900f332b61dda401afab063858e796f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 4 Jan 2023 07:24:11 +0000 Subject: [PATCH 097/157] syncthing: update to 1.23.4 and addon (2) release notes: - https://github.com/syncthing/syncthing/releases/tag/v1.23.0 - https://github.com/syncthing/syncthing/releases/tag/v1.23.1 - https://github.com/syncthing/syncthing/releases/tag/v1.23.2 - https://github.com/syncthing/syncthing/releases/tag/v1.23.3 - https://github.com/syncthing/syncthing/releases/tag/v1.23.4 log: - https://github.com/syncthing/syncthing/compare/v1.22.2...v1.23.4 --- packages/addons/service/syncthing/changelog.txt | 6 +++++- packages/addons/service/syncthing/package.mk | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/addons/service/syncthing/changelog.txt b/packages/addons/service/syncthing/changelog.txt index 927b2407d4..c1551501ba 100644 --- a/packages/addons/service/syncthing/changelog.txt +++ b/packages/addons/service/syncthing/changelog.txt @@ -1 +1,5 @@ -initial release +1 +- not released for LE11 + +2 +- syncthing: update to 1.23.4 diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index b87c5de0e2..868ecf7d8d 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="syncthing" -PKG_VERSION="1.22.2" -PKG_SHA256="211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f" -PKG_REV="0" +PKG_VERSION="1.23.4" +PKG_SHA256="06a2882f8ac49e15faf96025b01d0edcd4cc190a419d5de98fbe8271695329fa" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="MPLv2" PKG_SITE="https://syncthing.net/" From 69dad39f282b636a21342d56a352934ca1db7ac9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 23 Apr 2023 10:18:40 +0000 Subject: [PATCH 098/157] docker: fix addon-depends variable quoting --- packages/addons/addon-depends/docker/containerd/package.mk | 6 +++--- packages/addons/addon-depends/docker/ctop/package.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index 977aa49714..086cf24d05 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -19,9 +19,9 @@ pre_make_target() { go_configure - export CONTAINERD_VERSION=${PKG_VERSION} - export CONTAINERD_REVISION=${PKG_GIT_COMMIT} - export CONTAINERD_PKG=github.com/containerd/containerd + export CONTAINERD_VERSION="${PKG_VERSION}" + export CONTAINERD_REVISION="${PKG_GIT_COMMIT}" + export CONTAINERD_PKG="github.com/containerd/containerd" export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}" export GO111MODULE=off diff --git a/packages/addons/addon-depends/docker/ctop/package.mk b/packages/addons/addon-depends/docker/ctop/package.mk index 1db2070ede..b05d184c57 100644 --- a/packages/addons/addon-depends/docker/ctop/package.mk +++ b/packages/addons/addon-depends/docker/ctop/package.mk @@ -17,9 +17,9 @@ PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4" pre_make_target() { go_configure - export CTOP_VERSION=${PKG_VERSION} - export CTOP_REVISION=${PKG_GIT_COMMIT} - export CTOP_PKG=github.com/bcicen/ctop + export CTOP_VERSION="${PKG_VERSION}" + export CTOP_REVISION="${PKG_GIT_COMMIT}" + export CTOP_PKG="github.com/bcicen/ctop" export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}" mkdir -p ${GOPATH}/src/github.com/bcicen From 115b829af2d9186469a24d7275c88b644430d539 Mon Sep 17 00:00:00 2001 From: mglae Date: Sun, 23 Apr 2023 19:31:00 +0200 Subject: [PATCH 099/157] busybox: createlog: don't include journal files of persistent logging --- packages/sysutils/busybox/scripts/createlog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/scripts/createlog b/packages/sysutils/busybox/scripts/createlog index bff5982a56..e417348b42 100755 --- a/packages/sysutils/busybox/scripts/createlog +++ b/packages/sysutils/busybox/scripts/createlog @@ -136,7 +136,7 @@ mkdir -p $BASEDIR/$LOGDIR # varlog.log LOGFILE="06_varlog.log" - for i in `find /var/log -type f`; do + for i in `find /var/log -name journal -prune -o -type f -print`; do getlog_cmd cat $i done From c4aa4ed8ccc80f7be22a779fae3fa65c1dd82cea Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 24 Apr 2023 02:09:06 +0000 Subject: [PATCH 100/157] jellyfin: update to 10.8.10 and addon (1) --- packages/addons/service/jellyfin/changelog.txt | 3 ++- packages/addons/service/jellyfin/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/addons/service/jellyfin/changelog.txt b/packages/addons/service/jellyfin/changelog.txt index 927b2407d4..e6535422da 100644 --- a/packages/addons/service/jellyfin/changelog.txt +++ b/packages/addons/service/jellyfin/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- jellyfin: update to 10.8.10 diff --git a/packages/addons/service/jellyfin/package.mk b/packages/addons/service/jellyfin/package.mk index a97914aaf9..7262abe504 100644 --- a/packages/addons/service/jellyfin/package.mk +++ b/packages/addons/service/jellyfin/package.mk @@ -3,8 +3,8 @@ PKG_NAME="jellyfin" PKG_VERSION="1.0" -PKG_VERSION_NUMBER="10.8.9" -PKG_REV="0" +PKG_VERSION_NUMBER="10.8.10" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://jellyfin.org/" From d2b3612ef2fc512fb2bdebf6bcb5e02dc59364df Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 26 Apr 2023 17:43:44 +0000 Subject: [PATCH 101/157] pvr.iptvsimple: update 20.9.1-Nexus to 20.10.0-Nexus --- .../mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index f0d9809aff..bb586fb362 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.iptvsimple" -PKG_VERSION="20.9.1-Nexus" -PKG_SHA256="9871e305db254b064d836242962d5b57560245984efa5bd76067baa893594bef" +PKG_VERSION="20.10.0-Nexus" +PKG_SHA256="6cce0e7253f4b165050ca412de9cfe5bfccd5f56298ca185dede50d7f7365540" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 3a119595dc7eb3442c5ff3e2a277bd7ea51c0a62 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 2 May 2023 11:15:24 +0000 Subject: [PATCH 102/157] kodi-binary-addons: update to latest versions - pvr.iptvsimple: update 20.10.0-Nexus to 20.10.1-Nexus - pvr.waipu: update 20.7.0-Nexus to 20.8.1-Nexus --- .../kodi-binary-addons/pvr.iptvsimple/package.mk | 4 ++-- .../mediacenter/kodi-binary-addons/pvr.waipu/package.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index bb586fb362..420c184913 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.iptvsimple" -PKG_VERSION="20.10.0-Nexus" -PKG_SHA256="6cce0e7253f4b165050ca412de9cfe5bfccd5f56298ca185dede50d7f7365540" +PKG_VERSION="20.10.1-Nexus" +PKG_SHA256="91ed962a4f77a2aa5df820ce57cf744c2a8ea02a356dafc2da270cf813c2d669" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk index 2b6c23ea26..9ce34145ad 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.waipu" -PKG_VERSION="20.7.0-Nexus" -PKG_SHA256="311f42b32100324b14008ea1dd91ab6da0803562ebc48e81183473f4c0b72f1c" -PKG_REV="2" +PKG_VERSION="20.8.1-Nexus" +PKG_SHA256="5dfe9f891edefd5334c7a45593651634b43e1fdbea5a1b396131a45f5928f4aa" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/flubshi/pvr.waipu" From 84cc997dc0aa92eae9766b2d5bfa686ce84df18b Mon Sep 17 00:00:00 2001 From: Henri Funck Date: Mon, 27 Mar 2023 05:32:11 +0200 Subject: [PATCH 103/157] librespot: update to 03b547d --- .../addons/service/librespot/changelog.txt | 3 +- packages/addons/service/librespot/package.mk | 15 +- .../patches/librespot-01_notify_kodi.patch | 108 ------------ .../service/librespot/source/bin/onevent.py | 66 +++++++ .../service/librespot/source/default.py | 23 ++- .../service.librespot-alsa.service | 30 ---- .../resources/language/English/strings.po | 32 ++-- .../source/resources/lib/external_player.py | 8 + .../source/resources/lib/internal_player.py | 34 ++++ .../source/resources/lib/librespot.py | 93 ++++++++++ .../source/resources/lib/librespot_alsa.py | 11 ++ .../resources/lib/librespot_pulseaudio_rtp.py | 73 ++++++++ .../source/resources/lib/ls_addon.py | 49 ------ .../source/resources/lib/ls_librespot.py | 164 ------------------ .../source/resources/lib/ls_monitor.py | 35 ---- .../source/resources/lib/ls_pulseaudio.py | 46 ----- .../source/resources/lib/ls_spotify.py | 80 --------- .../librespot/source/resources/lib/player.py | 71 ++++++++ .../librespot/source/resources/lib/service.py | 88 ++++++++++ .../librespot/source/resources/settings.xml | 12 +- 20 files changed, 493 insertions(+), 548 deletions(-) delete mode 100644 packages/addons/service/librespot/patches/librespot-01_notify_kodi.patch create mode 100644 packages/addons/service/librespot/source/bin/onevent.py delete mode 100644 packages/addons/service/librespot/source/miscellaneous/service.librespot-alsa.service create mode 100644 packages/addons/service/librespot/source/resources/lib/external_player.py create mode 100644 packages/addons/service/librespot/source/resources/lib/internal_player.py create mode 100644 packages/addons/service/librespot/source/resources/lib/librespot.py create mode 100644 packages/addons/service/librespot/source/resources/lib/librespot_alsa.py create mode 100644 packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py delete mode 100644 packages/addons/service/librespot/source/resources/lib/ls_addon.py delete mode 100644 packages/addons/service/librespot/source/resources/lib/ls_librespot.py delete mode 100644 packages/addons/service/librespot/source/resources/lib/ls_monitor.py delete mode 100644 packages/addons/service/librespot/source/resources/lib/ls_pulseaudio.py delete mode 100644 packages/addons/service/librespot/source/resources/lib/ls_spotify.py create mode 100644 packages/addons/service/librespot/source/resources/lib/player.py create mode 100644 packages/addons/service/librespot/source/resources/lib/service.py diff --git a/packages/addons/service/librespot/changelog.txt b/packages/addons/service/librespot/changelog.txt index 927b2407d4..9a854f4905 100644 --- a/packages/addons/service/librespot/changelog.txt +++ b/packages/addons/service/librespot/changelog.txt @@ -1 +1,2 @@ -initial release +1 +- update librespot to githash 03b547d (2023-04-16) diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 79d193a074..197c2785e7 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -3,13 +3,14 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librespot" -PKG_VERSION="0.3.1" -PKG_SHA256="d360eaf61ad4216ee2c4a4d583d61c8ec7367b5efbe512011d049f73e4f24952" -PKG_REV="0" +PKG_VERSION="03b547d3b3b434811225ebc153c651e5f1917b95" +PKG_VERSION_DATE="2023-04-16" +PKG_SHA256="fd6ffed75f5d9a0941c4ca2a86192c17217b60d1d301e47ff0d8aeec3b3e0e97" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" -PKG_URL="https://github.com/librespot-org/librespot/archive/v${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/librespot-org/librespot/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi pulseaudio cargo:host" PKG_SECTION="service" PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote" @@ -19,10 +20,14 @@ PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Librespot" PKG_ADDON_TYPE="xbmc.service" -PKG_ADDON_REQUIRES="script.module.requests:0.0.0" PKG_MAINTAINER="Anton Voyl (awiouy)" make_target() { + unset CFLAGS + unset CXXFLAGS + unset CPPFLAGS + unset LDFLAGS + export RUSTC_LINKER=${CC} cargo build \ --target ${TARGET_NAME} \ --release \ diff --git a/packages/addons/service/librespot/patches/librespot-01_notify_kodi.patch b/packages/addons/service/librespot/patches/librespot-01_notify_kodi.patch deleted file mode 100644 index 3ab7f7f135..0000000000 --- a/packages/addons/service/librespot/patches/librespot-01_notify_kodi.patch +++ /dev/null @@ -1,108 +0,0 @@ -commit 10489ef0b9de4241eb8e007596f3d62616120545 -Author: awiouy -Date: Fri May 29 07:40:19 2020 +0200 - - Notify Kodi - -diff --git a/core/src/spotify_id.rs b/core/src/spotify_id.rs -index 1a5fcd2..c670977 100644 ---- a/core/src/spotify_id.rs -+++ b/core/src/spotify_id.rs -@@ -9,6 +9,12 @@ - Podcast, - NonPlayable, - } -+ -+impl fmt::Display for SpotifyAudioType { -+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { -+ write!(f, "{:?}", self) -+ } -+} - - impl From<&str> for SpotifyAudioType { - fn from(v: &str) -> Self { -diff --git a/playback/src/config.rs b/playback/src/config.rs -index 9d65042..6d098db 100644 ---- a/playback/src/config.rs -+++ b/playback/src/config.rs -@@ -142,6 +142,7 @@ - // pass function pointers so they can be lazily instantiated *after* spawning a thread - // (thereby circumventing Send bounds that they might not satisfy) - pub ditherer: Option, -+ pub notify_kodi: bool, - } - - impl Default for PlayerConfig { -@@ -159,6 +160,7 @@ - normalisation_knee: 1.0, - passthrough: false, - ditherer: Some(mk_ditherer::), -+ notify_kodi: false, - } - } - } -diff --git a/playback/src/player.rs b/playback/src/player.rs -index 2dd8f3b..67b3b28 100644 ---- a/playback/src/player.rs -+++ b/playback/src/player.rs -@@ -1868,6 +1868,10 @@ impl PlayerInternal { - } - } - -+ fn notify_kodi(&mut self, event: String) { -+ eprintln!("@{}", event); -+ } -+ - fn send_event(&mut self, event: PlayerEvent) { - let mut index = 0; - while index < self.event_senders.len() { -@@ -1878,6 +1882,16 @@ impl PlayerInternal { - } - } - } -+ if self.config.notify_kodi { -+ use PlayerEvent::*; -+ match event { -+ Playing {track_id, .. } => self.notify_kodi(["Playing", -+ &track_id.audio_type.to_string(), -+ &track_id.to_base62()].join(" ")), -+ Stopped { .. } => self.notify_kodi("Stopped".to_string()), -+ _ => () -+ } -+ } - } - - fn load_track( -diff --git a/src/main.rs b/src/main.rs -index 2efd62b..ecee2ff 100644 ---- a/src/main.rs -+++ b/src/main.rs -@@ -424,6 +424,11 @@ - "", - PASSTHROUGH, - "Pass a raw stream to the output. Only works with the pipe and subprocess backends.", -+ ) -+ .optflag( -+ "", -+ "notify-kodi", -+ "Notify Kodi", - ); - - let matches = match opts.parse(&args[1..]) { -@@ -644,6 +649,8 @@ fn setup(args: &[String]) -> Setup { - ) - }; - -+ let notify_kodi = matches.opt_present("notify-kodi"); -+ - let session_config = { - let device_id = device_id(&name); - -@@ -763,6 +763,7 @@ - normalisation_release, - normalisation_knee, - ditherer, -+ notify_kodi: notify_kodi, - } - }; - diff --git a/packages/addons/service/librespot/source/bin/onevent.py b/packages/addons/service/librespot/source/bin/onevent.py new file mode 100644 index 0000000000..ec0151506e --- /dev/null +++ b/packages/addons/service/librespot/source/bin/onevent.py @@ -0,0 +1,66 @@ +#!/usr/bin/python +import json +import os +import socket + +ADDRESS = ('127.0.0.1', 36963) +BUFFER_SIZE = 1024 + + +def send_event(event): + data = json.dumps(event).encode() + with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: + sock.sendto(data, ADDRESS) + + +def receive_event(): + with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as sock: + sock.settimeout(None) + sock.bind(ADDRESS) + while True: + data, addr = sock.recvfrom(BUFFER_SIZE) + event = json.loads(data.decode()) + if not event: + break + yield event + + +ARG_ALBUM = 'album' +ARG_ARTIST = 'artist' +ARG_ART = 'art' +ARG_TITLE = 'title' + +KEY_ALBUM = 'ALBUM' +KEY_ARTISTS = 'ARTISTS' +KEY_COVERS = 'COVERS' +KEY_ITEM_TYPE = 'ITEM_TYPE' +KEY_NAME = 'NAME' +KEY_PLAYER_EVENT = 'PLAYER_EVENT' +KEY_SHOW_NAME = 'SHOW_NAME' + +PLAYER_EVENT_STOPPED = 'stopped' +PLAYER_EVENT_TRACK_CHANGED = 'track_changed' + +ITEM_TYPE_EPISODE = 'Episode' +ITEM_TYPE_TRACK = 'Track' + + +def get_env_value(key): + return os.environ.get(key, '').partition('\n')[0] + + +if __name__ == '__main__': + player_event = get_env_value(KEY_PLAYER_EVENT) + event = {KEY_PLAYER_EVENT: player_event} + if player_event == PLAYER_EVENT_STOPPED: + send_event(event) + elif player_event == PLAYER_EVENT_TRACK_CHANGED: + event[ARG_ART] = get_env_value(KEY_COVERS) + event[ARG_TITLE] = get_env_value(KEY_NAME) + item_type = get_env_value(KEY_ITEM_TYPE) + if item_type == ITEM_TYPE_EPISODE: + event[ARG_ALBUM] = get_env_value(KEY_SHOW_NAME) + elif item_type == ITEM_TYPE_TRACK: + event[ARG_ALBUM] = get_env_value(KEY_ALBUM) + event[ARG_ARTIST] = get_env_value(KEY_ARTISTS) + send_event(event) diff --git a/packages/addons/service/librespot/source/default.py b/packages/addons/service/librespot/source/default.py index acf8371f3f..01c1dcde58 100644 --- a/packages/addons/service/librespot/source/default.py +++ b/packages/addons/service/librespot/source/default.py @@ -1,8 +1,25 @@ import os import sys +import xbmcaddon +import xbmcvfs -sys.path.append(os.path.join(os.path.dirname(__file__), 'resources', 'lib')) -from ls_monitor import Monitor as Monitor +def _set_home(): + home = xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('profile')) + os.makedirs(home, exist_ok=True) + os.chdir(home) -Monitor().run() + +def _set_paths(): + path = xbmcaddon.Addon().getAddonInfo('path') + os.environ['PATH'] += os.pathsep + os.path.join(path, 'bin') + os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.path.join(path, 'lib') + sys.path.append(os.path.join(path, 'bin')) + sys.path.append(os.path.join(path, 'resources', 'lib')) + + +if __name__ == '__main__': + _set_home() + _set_paths() + import service + service.Monitor().run() diff --git a/packages/addons/service/librespot/source/miscellaneous/service.librespot-alsa.service b/packages/addons/service/librespot/source/miscellaneous/service.librespot-alsa.service deleted file mode 100644 index 35fc6a0d2a..0000000000 --- a/packages/addons/service/librespot/source/miscellaneous/service.librespot-alsa.service +++ /dev/null @@ -1,30 +0,0 @@ -# Librespot for ALSA -# Copy this file to '/storage/.config/system.d/service.librespot-alsa.service' and adapt it to your needs -# Enable the service with 'systemctl enable /storage/.config/system.d/service.librespot-alsa.service' -# Start the service with 'systemctl start service.librespot-alsa.service' -# If you update the file, reload units with 'systemctl daemon-reload' and restart the service - -[Unit] -Description=librespot alsa backend -After=network-online.target -Wants=network-online.target - -[Service] -Environment=LD_LIBRARY_PATH=/storage/.kodi/addons/service.librespot/lib -#Enable Raspberry Pi onboard audio -#ExecStartPre=-dtparam audio=on -#Set Raspberry Pi playback route -#ExecStartPre=-amixer -c 0 cset name="PCM Playback Route" 1 -ExecStart=/storage/.kodi/addons/service.librespot/bin/librespot \ - --backend alsa \ - --bitrate 320 \ - --cache "/storage/.config/lsa_cache" \ -# Use 'aplay -L' to list available devices -# --device "default:CARD=ALSA" \ - --device-type computer \ - --disable-audio-cache \ - --name "Librespot ALSA" \ -Restart=always - -[Install] -WantedBy=network-online.target diff --git a/packages/addons/service/librespot/source/resources/language/English/strings.po b/packages/addons/service/librespot/source/resources/language/English/strings.po index 785318d9c0..8a12a179c3 100644 --- a/packages/addons/service/librespot/source/resources/language/English/strings.po +++ b/packages/addons/service/librespot/source/resources/language/English/strings.po @@ -8,29 +8,21 @@ msgid "Configuration" msgstr "" msgctxt "#30101" -msgid "Autoplay" -msgstr "" - -msgctxt "#30102" -msgid "Discovery" -msgstr "" - -msgctxt "#30103" -msgid "Username" -msgstr "" - -msgctxt "#30104" -msgid "Password" -msgstr "" - -msgctxt "#30105" msgid "Name" msgstr "" -msgctxt "#30106" -msgid "RTP Port" +msgctxt "#30102" +msgid "Do not disturb Kodi" msgstr "" -msgctxt "#30107" -msgid "Connect Port" +msgctxt "#30103" +msgid "User options" +msgstr "" + +msgctxt "#30104" +msgid "Backend" +msgstr "" + +msgctxt "#30105" +msgid "ALSA device" msgstr "" diff --git a/packages/addons/service/librespot/source/resources/lib/external_player.py b/packages/addons/service/librespot/source/resources/lib/external_player.py new file mode 100644 index 0000000000..3fd6714295 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/external_player.py @@ -0,0 +1,8 @@ +import player +import service + + +class Player(player.Player): + + def onLibrespotTrackChanged(self, art, artist, title, **kwargs): + service.notification(heading=title, message=artist, icon=art) diff --git a/packages/addons/service/librespot/source/resources/lib/internal_player.py b/packages/addons/service/librespot/source/resources/lib/internal_player.py new file mode 100644 index 0000000000..0636e92fd8 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/internal_player.py @@ -0,0 +1,34 @@ +import xbmc +import xbmcgui + +import player +import service + + +class Player(player.Player): + + def __init__(self, codec='pcm_sb16be', max_fanarts='10', **kwargs): + super().__init__(**kwargs) + self._max_fanarts = int(max_fanarts) + self._list_item = xbmcgui.ListItem(path=self.librespot.file) + self._list_item.getVideoInfoTag().addAudioStream(xbmc.AudioStreamDetail(2, codec)) + self._music_info_tag = self._list_item.getMusicInfoTag() + + def onLibrespotTrackChanged(self, album='', art='', artist='', title=''): + fanart = service.get_fanart(art, self._max_fanarts) if art else art + self._list_item.setArt({'fanart': fanart, 'thumb': art}) + self._music_info_tag.setAlbum(album) + self._music_info_tag.setArtist(artist) + self._music_info_tag.setTitle(title) + if self.isPlaying() and self.getPlayingFile() == self.librespot.file: + self.updateInfoTag(self._list_item) + else: + self.stop() # fixes unepxected behaviour of Player.play() + self.librespot.start_sink() + self.play(self.librespot.file, listitem=self._list_item) + + def onLibrespotStopped(self): + self.librespot.stop_sink() + if self.isPlaying() and self.getPlayingFile() == self.librespot.file: + self.last_file = None + self.stop() diff --git a/packages/addons/service/librespot/source/resources/lib/librespot.py b/packages/addons/service/librespot/source/resources/lib/librespot.py new file mode 100644 index 0000000000..983b83a7c3 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/librespot.py @@ -0,0 +1,93 @@ +import shlex +import socket +import subprocess +import threading + +import external_player +import internal_player +import service + + +class Librespot: + + def __init__(self, + bitrate='320', + device_type='tv', + max_retries='5', + name='Librespot@{}', + options='', + **kwargs): + name = name.format(socket.gethostname()) + self.command = [ + 'librespot', + '--bitrate', f'{bitrate}', + '--device-type', f'{device_type}', + '--disable-audio-cache', + '--disable-credential-cache', + '--name', f'{name}', + '--onevent', 'onevent.py', + '--quiet', + ] + shlex.split(options) + service.log(self.command) + self.file = '' + self._is_started = threading.Event() + self._is_stopped = threading.Event() + self._librespot = None + self._max_retries = int(max_retries) + self._retries = 0 + self._thread = threading.Thread() + + def get_player(self, **kwargs): + return (internal_player if self.file else external_player).Player(**kwargs) + + def restart(self): + if self._thread.is_alive(): + self._librespot.terminate() + else: + self.start() + + def start(self): + if not self._thread.is_alive() and self._retries < self._max_retries: + self._thread = threading.Thread(daemon=True, target=self._run) + self._thread.start() + self._is_started.wait(1) + + def stop(self): + if self._thread.is_alive(): + self._is_stopped.set() + self._librespot.terminate() + self._thread.join() + + def start_sink(self): + pass + + def stop_sink(self): + pass + + def _run(self): + service.log('librespot thread started') + self._is_started.clear() + self._is_stopped.clear() + while not self._is_stopped.is_set(): + with subprocess.Popen(self.command, stderr=subprocess.PIPE, text=True) as self._librespot: + self._is_started.set() + for line in self._librespot.stderr: + service.log(line.rstrip()) + self.stop_sink() + if self._librespot.returncode <= 0: + self._retries = 0 + else: + self._retries += 1 + if self._retries < self._max_retries: + service.notification( + f'librespot failed {self._retries}/{self._max_retries}') + else: + service.notification('librespot failed too many times') + break + service.log('librespot thread stopped') + + def __enter__(self): + return self + + def __exit__(self, *args): + self.stop() diff --git a/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py b/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py new file mode 100644 index 0000000000..6b1446bdbe --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/librespot_alsa.py @@ -0,0 +1,11 @@ +import librespot + + +class Librespot(librespot.Librespot): + + def __init__(self, alsa_device='hw:2,0', **kwargs): + super().__init__(**kwargs) + self.command += [ + '--backend', 'alsa', + '--device', f'{alsa_device}', + ] diff --git a/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py b/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py new file mode 100644 index 0000000000..6b1a79a46a --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/librespot_pulseaudio_rtp.py @@ -0,0 +1,73 @@ +import socket +import subprocess + +import librespot +import service + + +class Librespot(librespot.Librespot): + + def __init__(self, + codec='pcm_sb16be', + pa_rtp_address='127.0.0.1', + pa_rtp_device='librespot', + pa_rtp_port='24642', + **kwargs): + service.log('pulseaudio backend started') + sap_cmd = f'nc -l -u -s {pa_rtp_address} -p 9875'.split() + self._sap_server = subprocess.Popen(sap_cmd, + stdout=subprocess.DEVNULL, + stderr=subprocess.STDOUT) + service.log(f'sap server started') + if not pa_rtp_port: + with socket.socket() as s: + s.bind((pa_rtp_address, 0)) + pa_rtp_port = s.getsockname()[1] + modules = [ + [ + f'module-null-sink', + f'sink_name={pa_rtp_device}', + ], + [ + f'module-rtp-send', + f'destination_ip={pa_rtp_address}', + f'inhibit_auto_suspend=always', + f'port={pa_rtp_port}', + f'source={pa_rtp_device}.monitor', + ], + ] + self._modules = [self._pactl('load-module', *m) for m in modules] + self._sink_name = f'{pa_rtp_device}' + self.stop_sink() + service.log(f'pulseaudio modules loaded: {self._modules}') + super().__init__(**kwargs) + self.command += [ + '--backend', 'pulseaudio', + '--device', f'{pa_rtp_device}', + ] + self.file = f'rtp://{pa_rtp_address}:{pa_rtp_port}' + + def start_sink(self): + self._pactl('suspend-sink', self._sink_name, '0') + + def stop_sink(self): + self._pactl('suspend-sink', self._sink_name, '1') + + def _pactl(self, command, *args): + out = subprocess.run(['pactl', command, *args], + stdout=subprocess.PIPE, + text=True + ).stdout.rstrip() + service.log(f'pactl {command} {args}: {out}') + return out + + def __exit__(self, *args): + super().__exit__(*args) + for module in reversed(self._modules): + if module: + self._pactl('unload-module', module) + service.log('pulseaudio backend stopped') + if self._sap_server.poll() is None: + self._sap_server.terminate() + self._sap_server.wait() + service.log('sap server stopped') diff --git a/packages/addons/service/librespot/source/resources/lib/ls_addon.py b/packages/addons/service/librespot/source/resources/lib/ls_addon.py deleted file mode 100644 index 3501a71aca..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/ls_addon.py +++ /dev/null @@ -1,49 +0,0 @@ -import os -import socket -import xbmc -import xbmcvfs -import xbmcaddon -import xbmcgui - - -DEFAULTS = dict( - autoplay='true', - bitrate='320', - device='librespot', - discovery='true', - name='Librespot@{}', - password='', - rtp_dest='127.0.0.1', - rtp_port='24642', - connect_port='0', - username='', -) - -ADDON = xbmcaddon.Addon() -ADDON_HOME = xbmcvfs.translatePath(ADDON.getAddonInfo('profile')) -ADDON_ICON = ADDON.getAddonInfo('icon') -ADDON_NAME = ADDON.getAddonInfo('name') -ADDON_PATH = ADDON.getAddonInfo('path') -ADDON_ENVT = dict( - LD_LIBRARY_PATH=os.path.join(ADDON_PATH, 'lib'), - PATH=os.path.join(ADDON_PATH, 'bin')) -DIALOG = xbmcgui.Dialog() - - -def get_settings(): - if not os.path.exists(ADDON_HOME): - os.makedirs(ADDON_HOME) - settings = dict() - for id in DEFAULTS.keys(): - value = ADDON.getSetting(id) - settings[id] = DEFAULTS[id] if value == '' else value - settings['name'] = settings['name'].format(socket.gethostname()) - return settings - - -def log(message): - xbmc.log('{}: {}'.format(ADDON_NAME, message), xbmc.LOGINFO) - - -def notification(message): - DIALOG.notification(ADDON_NAME, message, ADDON_ICON) diff --git a/packages/addons/service/librespot/source/resources/lib/ls_librespot.py b/packages/addons/service/librespot/source/resources/lib/ls_librespot.py deleted file mode 100644 index f774c2e753..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/ls_librespot.py +++ /dev/null @@ -1,164 +0,0 @@ -import shlex -import subprocess -import threading -import xbmc -import xbmcgui - -from ls_addon import ADDON_ENVT as ADDON_ENVT -from ls_addon import ADDON_HOME as ADDON_HOME -from ls_addon import get_settings as get_settings -from ls_addon import log as log -from ls_pulseaudio import Pulseaudio as Pulseaudio -from ls_spotify import SPOTIFY as SPOTIFY - - -LIBRESPOT = 'librespot' \ - ' --backend pulseaudio' \ - ' --bitrate {bitrate}' \ - ' --cache cache' \ - ' --device {device}' \ - ' --device-type TV' \ - ' --disable-audio-cache' \ - ' --name {name}' \ - ' --notify-kodi' -LIBRESPOT_AUTOPLAY = ' --autoplay' -LIBRESPOT_AUTHENTICATE = ' --disable-discovery' \ - ' --password {password}' \ - ' --username {username}' - -CODEC = 'pcm_s16be' -MAX_PANICS = 3 - - -class Librespot(xbmc.Player): - - def __init__(self): - super().__init__() - settings = get_settings() - quoted = {k: shlex.quote(v) for (k, v) in settings.items()} - command = LIBRESPOT - if settings['connect_port'] != "0": - command += ' --zeroconf-port %s ' % settings['connect_port'] - if settings['autoplay'] == 'true': - command += LIBRESPOT_AUTOPLAY - if (settings['discovery'] == 'false' and - settings['password'] != '' and - settings['username'] != ''): - command += LIBRESPOT_AUTHENTICATE - self.command = shlex.split(command.format(**quoted)) - log(shlex.split(command.format(**dict(quoted, password='*obfuscated*')))) - self.is_aborted = False - self.is_dead = False - self.pulseaudio = Pulseaudio(settings) - self.listitem = xbmcgui.ListItem() - self.listitem.addStreamInfo('audio', {'codec': CODEC}) - self.listitem.setPath(path=self.pulseaudio.url) - - def __enter__(self): - self.pulseaudio.load_modules() - self.panics = 0 - self.librespot = None - self.is_playing_librespot = False - if not self.isPlaying(): - self.start_librespot() - - def __exit__(self, *args): - self.stop_librespot() - self.pulseaudio.unload_modules() - - def on_event_panic(self): - self.pulseaudio.suspend_sink(1) - self.panics += 1 - log('event panic {}/{}'.format(self.panics, MAX_PANICS)) - self.is_dead = self.panics >= MAX_PANICS - self.stop_librespot(True) - - def on_event_playing(self, type, id): - log('event playing') - SPOTIFY.update_listitem(self.listitem, type, id, self.country) - if not self.isPlaying(): - log('starting librespot playback') - self.pulseaudio.suspend_sink(0) - self.play(self.pulseaudio.url, self.listitem) - elif self.is_playing_librespot: - log('updating librespot playback') - self.updateInfoTag(self.listitem) - - def on_event_stopped(self): - self.pulseaudio.suspend_sink(1) - log('event stopped') - self.panics = 0 - self.stop() - - def onPlayBackEnded(self): - self.onPlayBackStopped() - - def onPlayBackError(self): - self.onPlayBackStopped() - - def onPlayBackStarted(self): - log('Kodi playback started') - self.is_playing_librespot = self.getPlayingFile() == self.pulseaudio.url - if not self.is_playing_librespot: - self.stop_librespot() - - def onPlayBackStopped(self): - if self.is_playing_librespot: - log('librespot playback stopped') - self.is_playing_librespot = False - self.stop_librespot(True) - else: - log('Kodi playback stopped') - self.start_librespot() - - def run_librespot(self): - log('librespot thread started') - self.restart = True - while self.restart and not self.is_dead: - self.librespot = subprocess.Popen( - self.command, - cwd=ADDON_HOME, - env=ADDON_ENVT, - stderr=subprocess.STDOUT, - stdout=subprocess.PIPE, - text=True, - encoding='utf-8') - log('librespot started') - with self.librespot.stdout: - for line in self.librespot.stdout: - words = line.split() - if words[0] == '@Playing': - self.on_event_playing(words[1], words[2]) - elif words[0] == '@Stopped': - self.on_event_stopped() - elif words[0] == 'stack': - self.on_event_panic() - else: - log(line.rstrip()) - if 'Country:' in line: - self.country = words[-1].strip('"') - log('country={}'.format(self.country)) - self.pulseaudio.suspend_sink(1) - self.stop() - self.librespot.wait() - log('librespot stopped') - self.librespot = None - log('librespot thread stopped') - - def start_librespot(self): - if self.librespot is None: - self.thread = threading.Thread(target=self.run_librespot) - self.thread.start() - - def stop(self): - if self.is_playing_librespot and not self.is_aborted: - log('stopping librespot playback') - self.is_playing_librespot = False - super().stop() - - def stop_librespot(self, restart=False): - self.restart = restart - if self.librespot is not None: - self.librespot.terminate() - if not restart: - self.thread.join() diff --git a/packages/addons/service/librespot/source/resources/lib/ls_monitor.py b/packages/addons/service/librespot/source/resources/lib/ls_monitor.py deleted file mode 100644 index fb56eb7cfe..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/ls_monitor.py +++ /dev/null @@ -1,35 +0,0 @@ -import xbmc - -from ls_addon import log as log -from ls_addon import notification as notification -from ls_librespot import Librespot as Librespot - - -class Monitor(xbmc.Monitor): - - def onSettingsChanged(self): - self.is_changed = True - - def run(self): - log('monitor started') - is_aborted = False - is_dead = False - while not (is_aborted or is_dead): - self.is_changed = False - librespot = Librespot() - with librespot: - while True: - is_aborted = self.waitForAbort(1) - if is_aborted: - log('monitor aborted') - librespot.is_aborted = True - break - is_dead = librespot.is_dead - if is_dead: - log('librespot died') - notification('Too many errors') - break - if self.is_changed: - log('settings changed') - break - log('monitor stopped') diff --git a/packages/addons/service/librespot/source/resources/lib/ls_pulseaudio.py b/packages/addons/service/librespot/source/resources/lib/ls_pulseaudio.py deleted file mode 100644 index 4fcbfdb570..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/ls_pulseaudio.py +++ /dev/null @@ -1,46 +0,0 @@ -import subprocess - -from ls_addon import log as log - - -def run(command): - return subprocess.check_output(command.split(), text=True) - - -class Pulseaudio: - - def __init__(self, settings): - self.null_sink = dict( - module='module-null-sink', - args='sink_name={device}'.format(**settings) - ) - self.rtp_send = dict( - module='module-rtp-send', - args='destination_ip={rtp_dest} port={rtp_port}' - ' source={device}.monitor'.format(**settings) - ) - self.suspend = 'pactl suspend-sink {device} {{}}'.format(**settings) - self.url = 'rtp://{rtp_dest}:{rtp_port}'.format(**settings) - - def list_modules(self): - return [module.split('\t') - for module in run('pactl list modules short').splitlines()[::-1]] - - def load_modules(self): - args = [module[2] for module in self.list_modules()] - for module in [self.null_sink, self.rtp_send]: - if module['args'] not in args: - run('pactl load-module {} {}'.format( - module['module'], module['args'])) - log('loaded {} {}'.format(module['module'], module['args'])) - self.suspend_sink(1) - - def suspend_sink(self, bit): - run(self.suspend.format(bit)) - log('suspended sink {}'.format(bit)) - - def unload_modules(self): - for module in self.list_modules(): - if module[2] in [self.null_sink['args'], self.rtp_send['args']]: - run('pactl unload-module {}'.format(module[0])) - log('unloaded {} {}'.format(module[1], module[2])) diff --git a/packages/addons/service/librespot/source/resources/lib/ls_spotify.py b/packages/addons/service/librespot/source/resources/lib/ls_spotify.py deleted file mode 100644 index d3f1f06ebc..0000000000 --- a/packages/addons/service/librespot/source/resources/lib/ls_spotify.py +++ /dev/null @@ -1,80 +0,0 @@ -import requests -import time - - -from ls_addon import ADDON_ICON as ADDON_ICON -from ls_addon import log as log - - -SPOTIFY_ENDPOINT_EPISODES = 'https://api.spotify.com/v1/episodes/' -SPOTIFY_ENDPOINT_TRACKS = 'https://api.spotify.com/v1/tracks/' -SPOTIFY_HEADERS = { - 'Accept': 'application/json', - 'Content-Type': 'application/json', -} -SPOTIFY_REQUEST_TOKEN = { - 'url': 'https://accounts.spotify.com/api/token', - 'data': {'grant_type': 'client_credentials'}, - 'headers': {'Authorization': 'Basic MTY5ZGY1NTMyZGVlNDdhNTk5MTNmODUyOGU4M2FlNzE6MWYzZDhiNTA3YmJlNGY2OGJlYjNhNDQ3MmU4YWQ0MTE='} -} - - -def get(info, indices, default): - try: - for index in indices: - info = info[index] - return info.encode('utf-8') - except LookupError: - return default - - -class Spotify: - - def __init__(self): - self.headers = SPOTIFY_HEADERS - self.expiration = time.time() - - def get_headers(self): - if time.time() > self.expiration: - log('token expired') - token = requests.post(**SPOTIFY_REQUEST_TOKEN).json() - log(token) - self.expiration = time.time() + float(token['expires_in']) - 5 - self.headers['Authorization'] = 'Bearer {}'.format( - token['access_token']) - - def get_endpoint(self, endpoint, id, market): - try: - self.get_headers() - return requests.get(url=endpoint + id, - headers=self.headers, - params=dict(market=market)).json() - except Exception as e: - log('failed to get {} from Spotify {}'.format(endpoint, e)) - return {} - - def update_listitem(self, listitem, type, id, market='SE'): - if type == 'Podcast': - info = self.get_endpoint(SPOTIFY_ENDPOINT_EPISODES, id, market) - album = get(info, ['show', 'name'], 'unknown show',) - artist = get(info, ['show', 'publisher'], 'unknown publisher') - thumb = get(info, ['images', 0, 'url'], ADDON_ICON) - title = get(info, ['name'], 'unknown episode') - elif type == 'Track': - info = self.get_endpoint(SPOTIFY_ENDPOINT_TRACKS, id, market) - album = get(info, ['album', 'name'], 'unknown album') - artist = get(info, ['artists', 0, 'name'], 'unknown artist') - thumb = get(info, ['album', 'images', 0, 'url'], ADDON_ICON) - title = get(info, ['name'], 'unknown title') - else: - album = '' - artist = 'Unknown Media Type' - thumb = ADDON_ICON - title = '' - listitem.setArt(dict(fanart=thumb, thumb=thumb)) - listitem.setInfo('music', dict( - album=album, artist=artist, title=title)) - log('{}#{}#{}#{}'.format(title, artist, album, thumb)) - - -SPOTIFY = Spotify() diff --git a/packages/addons/service/librespot/source/resources/lib/player.py b/packages/addons/service/librespot/source/resources/lib/player.py new file mode 100644 index 0000000000..6ed93dab1e --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/player.py @@ -0,0 +1,71 @@ +import threading +import xbmc + +import onevent +import service + + +class Player(xbmc.Player): + + def __init__(self, dnd_kodi='false', librespot=None, **kwargs): + super().__init__() + self._dnd_kodi = (dnd_kodi == 'true') + self._thread = threading.Thread(daemon=True, target=self._run) + self._thread.start() + self.last_file = None + self.librespot = librespot + if not (self._dnd_kodi and self.isPlaying()): + self.librespot.start() + + def onAVStarted(self): + file = self.getPlayingFile() + if file != self.librespot.file: + if self._dnd_kodi: + self.librespot.stop() + elif self.last_file == self.librespot.file: + self.librespot.restart() + self.last_file = file + + def onLibrespotStopped(self): + pass + + def onLibrespotTrackChanged(self, album='', art='', artist='', title=''): + pass + + def onPlayBackEnded(self): + if self.last_file == self.librespot.file: + self.librespot.restart() + else: + self.librespot.start() + self.last_file = None + + def onPlayBackError(self): + self.onPlayBackEnded() + + def onPlayBackStopped(self): + self.onPlayBackEnded() + + # fixes unexpected behaviour of Player.stop() + def stop(self): + xbmc.executebuiltin('PlayerControl(Stop)') + + def _run(self): + service.log('onevent dispatcher started') + for event in onevent.receive_event(): + try: + player_event = event.pop(onevent.KEY_PLAYER_EVENT) + if player_event == onevent.PLAYER_EVENT_STOPPED: + self.onLibrespotStopped() + elif player_event == onevent.PLAYER_EVENT_TRACK_CHANGED: + self.onLibrespotTrackChanged(**event) + except Exception as e: + service.log(e, True) + service.log('onevent dispatcher stopped') + + def __enter__(self): + return self + + def __exit__(self, *args): + onevent.send_event({}) + self._thread.join() + self.onLibrespotStopped() diff --git a/packages/addons/service/librespot/source/resources/lib/service.py b/packages/addons/service/librespot/source/resources/lib/service.py new file mode 100644 index 0000000000..74b21c83e2 --- /dev/null +++ b/packages/addons/service/librespot/source/resources/lib/service.py @@ -0,0 +1,88 @@ +import PIL.Image +import urllib.request +import tempfile +import os +import xbmc +import xbmcaddon +import xbmcgui + +_ADDON = xbmcaddon.Addon() +_ICON = _ADDON.getAddonInfo('icon') +_NAME = _ADDON.getAddonInfo('name') +_DIALOG = xbmcgui.Dialog() + + +def log(message, show=False): + xbmc.log(f'{_NAME}: {message}', xbmc.LOGINFO if show else xbmc.LOGDEBUG) + + +def notification(message='', sound=False, heading=_NAME, icon=_ICON, time=5000): + _DIALOG.notification(heading, message, icon, time, sound) + + +_FANART_DIR = os.path.join(tempfile.gettempdir(), 'librespot.fanart') + + +def get_fanart(url, max_fanarts): + name = os.path.basename(url) + target = os.path.join(_FANART_DIR, f'{name}_16x9') + if not os.path.exists(target): + if not os.path.exists(_FANART_DIR): + os.makedirs(_FANART_DIR) + files = os.listdir(_FANART_DIR) + files = [os.path.join(_FANART_DIR, file) for file in files if os.path.isfile( + os.path.join(_FANART_DIR, file))] + files.sort(key=os.path.getmtime) + for file in files[:-max_fanarts]: + os.remove(file) + source = os.path.join(_FANART_DIR, f'{name}_9x9') + urllib.request.urlretrieve(url, source) + image = PIL.Image.open(source) + width, height = image.size + new_width = int(height * 16 / 9) + delta_w = new_width - width + new_image = PIL.Image.new('RGB', (new_width, height), (0, 0, 0)) + new_image.paste(image, (delta_w // 2, 0)) + new_image.save(target, 'JPEG', optimize=True) + os.remove(source) + return target + + +_SETTINGS = { + 'alsa_device': 'hw:2,0', + 'backend': 'pulseaudio_rtp', + 'dnd_kodi': 'false', + 'name': f'{_NAME}@{{}}', + 'options': '', +} + + +def _get_setting(setting, default): + value = _ADDON.getSetting(setting) + return value if value else default + + +def _get_librespot(): + while True: + settings = {k: _get_setting(k, v) for k, v in _SETTINGS.items()} + backend = settings.pop('backend') + librespot_class = __import__(f'librespot_{backend}').Librespot + with librespot_class(**settings) as librespot: + with librespot.get_player(librespot=librespot, **settings) as player: + yield + + +class Monitor(xbmc.Monitor): + + def __init__(self): + self._get_librespot = _get_librespot() + self.onSettingsChanged() + + def onSettingsChanged(self): + log('settings changed') + next(self._get_librespot) + + def run(self): + self.waitForAbort() + log('abort requested') + self._get_librespot.close() diff --git a/packages/addons/service/librespot/source/resources/settings.xml b/packages/addons/service/librespot/source/resources/settings.xml index 4ad74191b5..c446d47724 100644 --- a/packages/addons/service/librespot/source/resources/settings.xml +++ b/packages/addons/service/librespot/source/resources/settings.xml @@ -1,12 +1,10 @@ - - - - - - - + + + + + From 758800a2526c0cc835cb2df402ab56eaf7833bf0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 18 Apr 2023 19:36:49 +0200 Subject: [PATCH 104/157] linux (RPi): update to 6.1.24-3e39d7a Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7a471a2747..a594626b72 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="cb8d82ae0059dd19f0f24a3c1e1081c87d73b0ea" # 6.1.23 - PKG_SHA256="bb447497dddae03d6cf9235e8e8a9613a637c0143ea4ca6cb842d0f5c805c577" + PKG_VERSION="3e39d7abde526d9058527bb3f25358c991ac47e2" # 6.1.24 + PKG_SHA256="194bb80457cf8247b3f149c429d5e0cfae0ca5f6f5cbd9421fe05b6e2bf9b381" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From f8d9b98b7d61fad48d19ed05cc0574bc7b03c785 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Apr 2023 22:15:29 +0200 Subject: [PATCH 105/157] linux (RPi): update to 6.1.25-fc30a91 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a594626b72..9fb58cad98 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="3e39d7abde526d9058527bb3f25358c991ac47e2" # 6.1.24 - PKG_SHA256="194bb80457cf8247b3f149c429d5e0cfae0ca5f6f5cbd9421fe05b6e2bf9b381" + PKG_VERSION="fc30a915ea61efd8608b49ea853082eb170dd90c" # 6.1.25 + PKG_SHA256="d9f6fbdbd4d118a753039a7a6a59402d7763047c438a2602616f11a7c5f0dc26" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From d1095debcba4f7458f07160fbad022f5407ce004 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Apr 2023 22:15:29 +0200 Subject: [PATCH 106/157] linux (RPi): config options for 6.1.25-fc30a91 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi2/linux/linux.arm.conf | 3 ++- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 510f3aa77f..0df5672050 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.19 Kernel Configuration +# Linux/arm 6.1.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3695,6 +3695,7 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +# CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 9f83e2c9b4..fb0f1ecd95 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.19 Kernel Configuration +# Linux/arm 6.1.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -3928,6 +3928,7 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +# CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index 7ac7dc8283..cb5e1a7ce8 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.19 Kernel Configuration +# Linux/arm64 6.1.25 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -4524,6 +4524,7 @@ CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +# CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN is not set # CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set # end of Display Panels From 1a54f9ad504809b7eb56e99533435be57611f84a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 25 Apr 2023 22:19:59 +0200 Subject: [PATCH 107/157] RPi: update to firmware 543692d Signed-off-by: Matthias Reichl --- packages/graphics/bcm2835-driver/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 70351624f4..9e5a8e3e4c 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-driver" -PKG_VERSION="c4122b8708d2d1e8a123e45b188d0bc2d0105bca" -PKG_SHA256="b4c9701d6e5803a5e42cc55f117feee27f35549c5156d165fe120282f9b98544" +PKG_VERSION="543692d23dff7075915bc9c7e34abb3fe28e1c46" +PKG_SHA256="838aa79b842fc10030c6a8b8d7f8dc6b6b08ed7ac762a5488d3d64f1bc51a4ec" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 223e5e1fca..a49cd2c752 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bcm2835-bootloader" -PKG_VERSION="c4122b8708d2d1e8a123e45b188d0bc2d0105bca" -PKG_SHA256="99e562ca8b94c8eb0fbf8222f35c805b6dfdb96e8efe62be6c8cce6fab19bf8b" +PKG_VERSION="543692d23dff7075915bc9c7e34abb3fe28e1c46" +PKG_SHA256="718389513a36ce7073ee26666dfbdfeb259a7e88beaac603c3b7d1f5bde067a2" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" From a9bd0de19c6743d6fadbad0c59edb1278a0cb693 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 2 May 2023 11:41:23 +0200 Subject: [PATCH 108/157] linux (RPi): update to 6.1.25-461e0b7 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 9fb58cad98..fb13633032 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="fc30a915ea61efd8608b49ea853082eb170dd90c" # 6.1.25 - PKG_SHA256="d9f6fbdbd4d118a753039a7a6a59402d7763047c438a2602616f11a7c5f0dc26" + PKG_VERSION="461e0b72af5fc1bc5ddd85ae42d85b7e75b85861" # 6.1.25 + PKG_SHA256="27b57926b3ceadf6fd803aff8502b5d257ebb7229a6f97370c33d8631dfa237e" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 93a98ea0e86422c34537de588626c920d4b11fb1 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 4 May 2023 22:10:24 +0200 Subject: [PATCH 109/157] linux (RPi): update to 6.1.27-83cf6b4 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index fb13633032..7c4a7b55e1 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="461e0b72af5fc1bc5ddd85ae42d85b7e75b85861" # 6.1.25 - PKG_SHA256="27b57926b3ceadf6fd803aff8502b5d257ebb7229a6f97370c33d8631dfa237e" + PKG_VERSION="83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9" # 6.1.27 + PKG_SHA256="be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 8cf52171a8b96834deee388d3a454d7a04afa3d2 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 4 May 2023 22:10:24 +0200 Subject: [PATCH 110/157] linux (RPi): config options for 6.1.27-83cf6b4 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 4 ++-- projects/RPi/devices/RPi2/linux/linux.arm.conf | 4 ++-- projects/RPi/devices/RPi4/linux/linux.aarch64.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 0df5672050..f453f345ff 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.25 Kernel Configuration +# Linux/arm 6.1.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -138,7 +138,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index fb0f1ecd95..50cf215635 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.25 Kernel Configuration +# Linux/arm 6.1.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -150,7 +150,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y # CONFIG_CGROUP_FAVOR_DYNMODS is not set diff --git a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf index cb5e1a7ce8..e91921de2a 100644 --- a/projects/RPi/devices/RPi4/linux/linux.aarch64.conf +++ b/projects/RPi/devices/RPi4/linux/linux.aarch64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.25 Kernel Configuration +# Linux/arm64 6.1.27 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 13.0.0 20220604 (experimental) [master revision aec868578d8515763d75693c1fdfbc30ff0a1e68]" CONFIG_CC_IS_GCC=y @@ -148,7 +148,7 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y CONFIG_CC_HAS_INT128=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC11_NO_ARRAY_BOUNDS=y -CONFIG_GCC12_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_ARCH_SUPPORTS_INT128=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y From 690a4fbf4693a69441ad4ba70553d5e8eb3545cd Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 6 May 2023 12:13:49 +0200 Subject: [PATCH 111/157] brcmfmac_sdio-firmware-rpi: drop rpi-btuart script and service Bluetooth is finally initialized by the kernel Signed-off-by: Matthias Reichl --- .../brcmfmac_sdio-firmware-rpi/package.mk | 11 -------- .../scripts/rpi-btuart | 26 ------------------- .../scripts/rpi-udev | 12 --------- .../system.d/brcmfmac_sdio-firmware.service | 13 ---------- .../udev.d/90-rpi-add-serial.rules | 2 -- 5 files changed, 64 deletions(-) delete mode 100755 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart delete mode 100755 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service delete mode 100644 packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk index 10eb23f6d3..0f52d0b8ce 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk @@ -15,14 +15,3 @@ PKG_TOOLCHAIN="manual" makeinstall_target() { DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install } - -post_makeinstall_target() { - # Install rpi btuart script to bring up Bluetooth - mkdir -p ${INSTALL}/usr/bin - cp -P ${PKG_DIR}/scripts/rpi-btuart ${INSTALL}/usr/bin - cp -P ${PKG_DIR}/scripts/rpi-udev ${INSTALL}/usr/bin -} - -post_install() { - enable_service brcmfmac_sdio-firmware.service -} diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart deleted file mode 100755 index b9c6cee09d..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-btuart +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -HCIATTACH=/usr/bin/hciattach -if grep -q "Pi 4" /proc/device-tree/model; then - BDADDR= -else - SERIAL=$(cat /proc/device-tree/serial-number | cut -c9-) - B1=${SERIAL:2:2} - B2=${SERIAL:4:2} - B3=${SERIAL:6:2} - BDADDR=$(printf b8:27:eb:%02x:%02x:%02x $((0x$B1 ^ 0xaa)) $((0x$B2 ^ 0xaa)) $((0x$B3 ^ 0xaa))) -fi - -uart0="$(cat /proc/device-tree/aliases/uart0)" -serial1="$(cat /proc/device-tree/aliases/serial1)" - -if [ "$uart0" = "$serial1" ] ; then - uart0_pins="$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" - if [ "$uart0_pins" = "16" ] ; then - $HCIATTACH /dev/serial1 bcm43xx 3000000 flow - $BDADDR - else - $HCIATTACH /dev/serial1 bcm43xx 921600 noflow - $BDADDR - fi -else - $HCIATTACH /dev/serial1 bcm43xx 460800 noflow - $BDADDR -fi diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev deleted file mode 100755 index 43a8a0a4af..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/scripts/rpi-udev +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -ALIASES="/proc/device-tree/aliases" -UARTX="uart${1}" - -if [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial0) ]; then - echo 0 -elif [ $(cat ${ALIASES}/${UARTX}) = $(cat ${ALIASES}/serial1) ]; then - echo 1 -else - exit 1 -fi diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service deleted file mode 100644 index 97809c744e..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/system.d/brcmfmac_sdio-firmware.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Broadcom sdio firmware update for BCM43430A1 -ConditionFileNotEmpty=/proc/device-tree/soc/gpio@7e200000/bt_pins/brcm,pins -Requires=dev-serial1.device -After=dev-serial1.device network.target - -[Service] -Type=simple -RemainAfterExit=yes -ExecStart=/usr/bin/rpi-btuart - -[Install] -WantedBy=network.target diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules deleted file mode 100644 index a189a00267..0000000000 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/udev.d/90-rpi-add-serial.rules +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="ttyAMA[01]", PROGRAM="/usr/bin/rpi-udev 0", SYMLINK+="serial%c" -KERNEL=="ttyS0", PROGRAM="/usr/bin/rpi-udev 1", SYMLINK+="serial%c" From c7e9dbf3da168399f34fd2382b1047254a517cef Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 7 May 2023 10:38:47 +0000 Subject: [PATCH 112/157] inputstream.adaptive: update 20.3.6-Nexus to 20.3.7-Nexus --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index be54e27fd1..222309439a 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="inputstream.adaptive" -PKG_VERSION="20.3.6-Nexus" -PKG_SHA256="907915228335eeb9217e6f069cbb210fffce01095a6326908015cd89165a0328" +PKG_VERSION="20.3.7-Nexus" +PKG_SHA256="6454f40c6e89e7ce2a9492197954bbef856ee83e242ef610c905d42aed7484d7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From b6a8709fae8f6feaf0830c9acaac7ffca5b9e9bd Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 13 Apr 2023 12:41:59 +0000 Subject: [PATCH 113/157] bento4: update to 1.6.0-639-7-Omega --- packages/multimedia/bento4/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/bento4/package.mk b/packages/multimedia/bento4/package.mk index 60a48dc2c0..1abcffbca3 100644 --- a/packages/multimedia/bento4/package.mk +++ b/packages/multimedia/bento4/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bento4" -PKG_VERSION="1.6.0-639-6-Nexus" -PKG_SHA256="8afa4ae07a7629a65e0d5014750960ced33a8771d363652f3913261fb5d0c84f" +PKG_VERSION="1.6.0-639-7-Omega" +PKG_SHA256="4464cd47b597e6dedbfc231bb6eb097c45cfe5ee0051082460d9ac53e9d74dc3" PKG_LICENSE="GPL" PKG_SITE="https://www.bento4.com" PKG_URL="https://github.com/xbmc/Bento4/archive/refs/tags/${PKG_VERSION}.tar.gz" From 78e2ec014a0e469a98385d54be54f31c65145990 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 11 May 2023 09:20:58 +0000 Subject: [PATCH 114/157] samba: update to 4.17.8 ann: - https://lists.samba.org/archive/samba-announce/2023/000635.html --- packages/network/samba/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 4f5ebadf54..7930b6ecb5 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.17.7" -PKG_SHA256="95c9c16b654a88cfaefd958052dd573e2f85ecdf114e4ecec3187537a094d919" +PKG_VERSION="4.17.8" +PKG_SHA256="712e537e1b09b739b6a607e0942503af92a3b2e244484b61264eb091efdfaad7" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz" From e290b1c4293b92c58bd4f8281a8a528de0cb54f6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 12 May 2023 15:08:11 +0000 Subject: [PATCH 115/157] inputstream.adaptive: update 20.3.7-Nexus to 20.3.8-Nexus --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index 222309439a..b27e083271 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="inputstream.adaptive" -PKG_VERSION="20.3.7-Nexus" -PKG_SHA256="6454f40c6e89e7ce2a9492197954bbef856ee83e242ef610c905d42aed7484d7" +PKG_VERSION="20.3.8-Nexus" +PKG_SHA256="db972656dc42ce1e443b8aed8d410feb5093603b9c2beb3875eb6fafa3c9f3a9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From fbfa284bd459444292b1642d3a420aec0e35da26 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 12 May 2023 22:09:18 +0000 Subject: [PATCH 116/157] intel-ucode: update to 20230512 release notes: - https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20230512 --- packages/linux-firmware/intel-ucode/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index 369ace0a29..c5f50c8b74 100644 --- a/packages/linux-firmware/intel-ucode/package.mk +++ b/packages/linux-firmware/intel-ucode/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="intel-ucode" -PKG_VERSION="20230214" -PKG_SHA256="3a3cfe2c7642339af9f4c2ad69f5f367dfa4cd1f7f9fd4124dedefb7803591d4" +PKG_VERSION="20230512" +PKG_SHA256="58f3321dcf900175d87d5b39455138c2a24e69df4ba997fb44e3e0d19e531ad1" PKG_ARCH="x86_64" PKG_LICENSE="other" PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode" From f6aa45e14f863e2a441a0998007d0317b353a2f8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 15 May 2023 15:37:35 +0000 Subject: [PATCH 117/157] wireless-regdb: update to 2023.05.03 --- packages/network/wireless-regdb/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk index 5042829c2a..fa3a7a9d62 100644 --- a/packages/network/wireless-regdb/package.mk +++ b/packages/network/wireless-regdb/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wireless-regdb" -PKG_VERSION="2023.02.13" -PKG_SHA256="fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" +PKG_VERSION="2023.05.03" +PKG_SHA256="f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12" PKG_LICENSE="GPL" PKG_SITE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" PKG_URL="https://www.kernel.org/pub/software/network/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" From eeb08c93e50bc86b2f29f5f27bf76fa7babbbc92 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 16 May 2023 11:31:34 +0000 Subject: [PATCH 118/157] cacert.pem: update to 2023-05-05 This commit updates cacert.pem certificate bundle with [mk-ca-bundle.pl][1] script using the content of [certdata][2] associated with mozilla/gecko-dev@94259a53344396ffb326ca7749b64d1e1c3ab697, It was auto-generated by the [update-cacert-pem-certificate-bundle][3] GitHub action workflow. [1]: https://github.com/curl/curl/blob/master/scripts/mk-ca-bundle.pl [2]: https://github.com/mozilla/gecko-dev/blob/94259a53344396ffb326ca7749b64d1e1c3ab697/security/nss/lib/ckfw/builtins/certdata.txt?raw=true [3]: https://github.com/heitbaum/LibreELEC.tv/blob/098e3881f0a2f8f78166e5d72d0a48c6cc9a0dd0/.github/workflows/update-cacert-pem-certificate-bundle.yml --- packages/security/openssl/cert/cacert.pem | 103 ++++++++++------------ 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/packages/security/openssl/cert/cacert.pem b/packages/security/openssl/cert/cacert.pem index 9aa8ac0b54..edfa98cd95 100644 --- a/packages/security/openssl/cert/cacert.pem +++ b/packages/security/openssl/cert/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Tue Dec 20 11:31:56 2022 GMT +## Certificate data from Mozilla as of: Tue May 16 11:31:33 2023 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.29. -## SHA256: 90c470e705b4b5f36f09684dc50e2b79c8b86989a848b62cd1a7bd6460ee65f6 +## SHA256: c47475103fb05bb562bbadff0d1e72346b03236154e1448a6ca191b740f83507 ## @@ -603,26 +603,6 @@ NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= -----END CERTIFICATE----- -Hongkong Post Root CA 1 -======================= ------BEGIN CERTIFICATE----- -MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT -DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx -NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n -IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1 -ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr -auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh -qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY -V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV -HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i -h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio -l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei -IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps -T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT -c4afU9hDDl3WY4JxHYB0yvbiAmvZWg== ------END CERTIFICATE----- - SecureSign RootCA11 =================== -----BEGIN CERTIFICATE----- @@ -1261,40 +1241,6 @@ Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY= -----END CERTIFICATE----- -E-Tugra Certification Authority -=============================== ------BEGIN CERTIFICATE----- -MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w -DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls -ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN -ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw -NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx -QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl -cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD -DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd -hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K -CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g -ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ -BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0 -E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz -rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq -jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn -rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5 -dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB -/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG -MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK -kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO -XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807 -VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo -a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc -dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV -KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT -Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0 -8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G -C7TbO6Orb1wdtn7os4I07QZcJA== ------END CERTIFICATE----- - T-TeleSec GlobalRoot Class 2 ============================ -----BEGIN CERTIFICATE----- @@ -3370,3 +3316,48 @@ BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e N9k= -----END CERTIFICATE----- + +BJCA Global Root CA1 +==================== +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQG +EwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJK +Q0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAzMTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkG +A1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQD +DBRCSkNBIEdsb2JhbCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFm +CL3ZxRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZspDyRhyS +sTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O558dnJCNPYwpj9mZ9S1Wn +P3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgRat7GGPZHOiJBhyL8xIkoVNiMpTAK+BcW +yqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRj +eulumijWML3mG90Vr4TqnMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNn +MoH1V6XKV0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/pj+b +OT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZOz2nxbkRs1CTqjSSh +GL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXnjSXWgXSHRtQpdaJCbPdzied9v3pK +H9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMB +AAGjQjBAMB0GA1UdDgQWBBTF7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4G +A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4 +YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3KliawLwQ8hOnThJ +dMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u+2D2/VnGKhs/I0qUJDAnyIm8 +60Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuh +TaRjAv04l5U/BXCga99igUOLtFkNSoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW +4AB+dAb/OMRyHdOoP2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmp +GQrI+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRzznfSxqxx +4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9eVzYH6Eze9mCUAyTF6ps +3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4S +SPfSKcOYKMryMguTjClPPGAyzQWWYezyr/6zcCwupvI= +-----END CERTIFICATE----- + +BJCA Global Root CA2 +==================== +-----BEGIN CERTIFICATE----- +MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQswCQYDVQQGEwJD +TjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJKQ0Eg +R2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgyMVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UE +BhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRC +SkNBIEdsb2JhbCBSb290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jl +SR9BIgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK++kpRuDCK +/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJKsVF/BvDRgh9Obl+rg/xI +1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8 +W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8g +UXOQwKhbYdDFUDn9hf7B43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w== +-----END CERTIFICATE----- From eb9923c34c5fb9610fd426880a7f25d1cbe7c02d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 16 May 2023 20:35:05 +0200 Subject: [PATCH 119/157] kodi: update drmprime-filter patches Fix missing flush after EOF Signed-off-by: Matthias Reichl --- ...odecDRMPRIME-add-support-for-filters.patch | 6 ++-- ...0002-WIP-DRMPRIME-deinterlace-filter.patch | 6 ++-- ...PRIME-Avoid-exception-with-AV_PIX_FM.patch | 6 ++-- ...PRIME-Leave-deinterlace-filter-activ.patch | 6 ++-- ...ed-Set-and-unset-deinterlace-method-.patch | 6 ++-- ...PRIME-Close-deinterlace-filter-on-er.patch | 6 ++-- ...DRMPRIME-Fix-missing-flush-after-eof.patch | 32 +++++++++++++++++++ 7 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 packages/mediacenter/kodi/patches/drmprime-filter/0007-DVDVideoCodecDRMPRIME-Fix-missing-flush-after-eof.patch diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch index d33231871e..ab16847409 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0001-WIP-DVDVideoCodecDRMPRIME-add-support-for-filters.patch @@ -1,7 +1,7 @@ -From 3f4e5cd94c1ad7e9361f68f04dba23aec06e0e49 Mon Sep 17 00:00:00 2001 +From 24d09f0f92e3afc975f211591c147032f663ed01 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 20 Oct 2019 17:10:07 +0000 -Subject: [PATCH 1/6] WIP: DVDVideoCodecDRMPRIME: add support for filters +Subject: [PATCH 1/7] WIP: DVDVideoCodecDRMPRIME: add support for filters --- .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 62 +++++++++++++++++-- @@ -135,5 +135,5 @@ index db49d165e7..b5cacf1a3c 100644 std::shared_ptr m_videoBufferPool; }; -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch index 9c86d94be0..25c5bcdd43 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0002-WIP-DRMPRIME-deinterlace-filter.patch @@ -1,7 +1,7 @@ -From a2f57bbd2c63fc0cf89304805e93f3b57ce55b58 Mon Sep 17 00:00:00 2001 +From da88bb2f1dfbb6745406fab1bbece5b71df39b91 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 26 Dec 2019 11:01:51 +0100 -Subject: [PATCH 2/6] WIP: DRMPRIME deinterlace filter +Subject: [PATCH 2/7] WIP: DRMPRIME deinterlace filter --- .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 379 +++++++++++++++--- @@ -517,5 +517,5 @@ index b5cacf1a3c..fab3431d40 100644 AVFilterContext* m_pFilterIn = nullptr; AVFilterContext* m_pFilterOut = nullptr; -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch index 42a281b44d..49efc01588 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0003-DVDVideoCodecDRMPRIME-Avoid-exception-with-AV_PIX_FM.patch @@ -1,7 +1,7 @@ -From c2b50468de1a8a72a4e00e53492e4e26f2573490 Mon Sep 17 00:00:00 2001 +From cb187a5456d0e992b4875ad965a6b628726c557f Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Aug 2021 20:29:50 +0100 -Subject: [PATCH 3/6] DVDVideoCodecDRMPRIME: Avoid exception with +Subject: [PATCH 3/7] DVDVideoCodecDRMPRIME: Avoid exception with AV_PIX_FMT_NONE --- @@ -22,5 +22,5 @@ index 1843e72e55..709311e75f 100644 return false; } -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch index 42bd40f63b..96c27ca164 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0004-DVDVideoCodecDRMPRIME-Leave-deinterlace-filter-activ.patch @@ -1,7 +1,7 @@ -From 66833bc8221a9d5a5fbc625c3f0293a261bbd412 Mon Sep 17 00:00:00 2001 +From 7b98c8968c7dd3b5a56f76695515cb59654f8691 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 17 Sep 2021 15:23:16 +0100 -Subject: [PATCH 4/6] DVDVideoCodecDRMPRIME: Leave deinterlace filter active on +Subject: [PATCH 4/7] DVDVideoCodecDRMPRIME: Leave deinterlace filter active on a progressive frame Interlaced content often has strange mixtures of interlace and progressive frames (e.g. IIPPPPIIPPPP) @@ -29,5 +29,5 @@ index 709311e75f..6ba0804904 100644 filterChain += m_deintFilterName; -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch index d6bb95de33..e2f5a4163e 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0005-SetVideoInterlaced-Set-and-unset-deinterlace-method-.patch @@ -1,7 +1,7 @@ -From 6d40c431345c8bac66fb1a3bb06e29a0f944ac3d Mon Sep 17 00:00:00 2001 +From c17af60a355973986d9ea5b6baefb96577299b9f Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Tue, 30 Nov 2021 16:05:06 +0000 -Subject: [PATCH 5/6] SetVideoInterlaced: Set and unset deinterlace method name +Subject: [PATCH 5/7] SetVideoInterlaced: Set and unset deinterlace method name reported --- @@ -37,5 +37,5 @@ index 6ba0804904..9139233bc4 100644 { CLog::Log(LOGDEBUG, LOGVIDEO, "CDVDVideoCodecDRMPRIME::FilterClose - Freeing filter graph"); -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch index 849dbf2ad3..3eecb8a1d6 100644 --- a/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0006-DVDVideoCodecDRMPRIME-Close-deinterlace-filter-on-er.patch @@ -1,7 +1,7 @@ -From e014499333c6ca6ef4dca3a15b8c81ec07d80c12 Mon Sep 17 00:00:00 2001 +From 37ee879ee3bdcf8320fe135acc6cae0a8cbdb991 Mon Sep 17 00:00:00 2001 From: Dom Cobley Date: Wed, 24 Nov 2021 20:21:28 +0000 -Subject: [PATCH 6/6] DVDVideoCodecDRMPRIME: Close deinterlace filter on error +Subject: [PATCH 6/7] DVDVideoCodecDRMPRIME: Close deinterlace filter on error Otherwise we crash later with an invalid m_pFilterGraph pointer --- @@ -69,5 +69,5 @@ index 9139233bc4..0b44d90f13 100644 } -- -2.34.1 +2.39.2 diff --git a/packages/mediacenter/kodi/patches/drmprime-filter/0007-DVDVideoCodecDRMPRIME-Fix-missing-flush-after-eof.patch b/packages/mediacenter/kodi/patches/drmprime-filter/0007-DVDVideoCodecDRMPRIME-Fix-missing-flush-after-eof.patch new file mode 100644 index 0000000000..66d149fdd7 --- /dev/null +++ b/packages/mediacenter/kodi/patches/drmprime-filter/0007-DVDVideoCodecDRMPRIME-Fix-missing-flush-after-eof.patch @@ -0,0 +1,32 @@ +From 9996a0027ee8b0149b639fdc1bb7b524a8176bc0 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Mon, 15 May 2023 12:50:16 +0100 +Subject: [PATCH 7/7] DVDVideoCodecDRMPRIME: Fix missing flush after eof + +--- + .../VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +index 0b44d90f13..a472a06792 100644 +--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp ++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +@@ -891,7 +891,15 @@ CDVDVideoCodec::VCReturn CDVDVideoCodecDRMPRIME::GetPicture(VideoPicture* pVideo + if (ret == AVERROR(EAGAIN)) + return VC_BUFFER; + else if (ret == AVERROR_EOF) ++ { ++ if (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN) ++ { ++ CLog::Log(LOGDEBUG, "CDVDVideoCodecDRMPRIME::{} - flush buffers", __FUNCTION__); ++ avcodec_flush_buffers(m_pCodecContext); ++ SetCodecControl(m_codecControlFlags & ~DVD_CODEC_CTRL_DRAIN); ++ } + return VC_EOF; ++ } + else if (ret) + { + char err[AV_ERROR_MAX_STRING_SIZE] = {}; +-- +2.39.2 + From 3b81e1f89588cde5628750ad6023855504beb6ca Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 11 May 2023 09:48:04 +0000 Subject: [PATCH 120/157] containerd: update to 1.7.1 --- packages/addons/addon-depends/docker/containerd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index 086cf24d05..022a8824f0 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.7.0" -PKG_SHA256="c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552" +PKG_VERSION="1.7.1" +PKG_SHA256="fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" From c33ef604f394cab62224679ab9f25164963fab46 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 17 May 2023 13:09:46 +0000 Subject: [PATCH 121/157] cli: update to 23.0.6 --- packages/addons/addon-depends/docker/cli/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index 45ed59fea0..c47646dc13 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cli" PKG_VERSION="$(get_pkg_version moby)" -PKG_SHA256="477c37f128db7bb6926dc410f337cb525af4f26ea9719d38dc2978460dbe2de8" +PKG_SHA256="b31eb0343e8bb587e921a7630baa659896602072a77ad97720e5f2a8e48005e9" PKG_LICENSE="ASL" PKG_SITE="https://github.com/docker/cli" PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI" PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/docker/cli/releases -export PKG_GIT_COMMIT="f480fb1e374b16c8a1419e84f465f2562456145e" +export PKG_GIT_COMMIT="ef23cbc4315ae76c744e02d687c09548ede461bd" configure_target() { go_configure From 70e5377081961aaae7a442e36d304b08f9a7cd7f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 17 May 2023 13:04:26 +0000 Subject: [PATCH 122/157] moby: update to 23.0.6 release notes: - https://github.com/moby/moby/releases/tag/v23.0.6 --- packages/addons/addon-depends/docker/moby/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index fc0edf6c49..b8ddd7f7c6 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="moby" -PKG_VERSION="23.0.4" -PKG_SHA256="6c6e965974335595eaccb17ccec927aebbc10d44b1a95262871b16c0be4c0179" +PKG_VERSION="23.0.6" +PKG_SHA256="3bbd32f401f652cc15084d3c09bd7acd381571802beac9333fd63d803dc66c3e" PKG_LICENSE="ASL" PKG_SITE="https://mobyproject.org/" PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/moby/moby -export PKG_GIT_COMMIT="cbce3319305c39df3405c969a12e0a5d2bad3f4f" +export PKG_GIT_COMMIT="9dbdbd4b6d7681bd18c897a6ba0376073c2a72ff" PKG_MOBY_BUILDTAGS="daemon \ autogen \ From 2a5ddc2d25922ce98ac1dbba999b556a050784f4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 12 Apr 2023 14:45:58 +0000 Subject: [PATCH 123/157] runc: update to 1.1.7 --- packages/addons/addon-depends/runc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index 9e5fd7a0cd..8c2b6b874a 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="runc" -PKG_VERSION="1.1.5" -PKG_SHA256="76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2" +PKG_VERSION="1.1.7" +PKG_SHA256="f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" From f999195ee467e1c4c718934d1c19325329e175e1 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 17 May 2023 13:11:23 +0000 Subject: [PATCH 124/157] docker: update to 23.0.6 and addon (4) - update moby and cli to 23.0.6 - containerd: update to 1.7.1 - runc: update to 1.1.7 --- packages/addons/service/docker/changelog.txt | 5 +++++ packages/addons/service/docker/package.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/docker/changelog.txt b/packages/addons/service/docker/changelog.txt index 24a2ef3b08..71b36aff37 100644 --- a/packages/addons/service/docker/changelog.txt +++ b/packages/addons/service/docker/changelog.txt @@ -10,3 +10,8 @@ - containerd: update to 1.7.0 - runc: build with seccomp - runc: update to 1.1.5 + +4 +- update moby and cli to 23.0.6 +- containerd: update to 1.7.1 +- runc: update to 1.1.7 diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 85e601603a..106401b844 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" From 34e01ffd1902feba862da0268cdd1a8c94f606f4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 18 May 2023 10:27:36 +0000 Subject: [PATCH 125/157] pvr.waipu: update 20.8.1-Nexus to 20.9.0-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk index 9ce34145ad..5a9aeb7b8f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.waipu" -PKG_VERSION="20.8.1-Nexus" -PKG_SHA256="5dfe9f891edefd5334c7a45593651634b43e1fdbea5a1b396131a45f5928f4aa" +PKG_VERSION="20.9.0-Nexus" +PKG_SHA256="3a0a1dffe1bb8711dd6747b02a51aee6a0bce40ca6822cc2ab7f04b4b5acb82f" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 7c1f88db24dcdd307cf1755f8eb7754ba338a916 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 17 May 2023 12:34:38 +0000 Subject: [PATCH 126/157] intel-ucode: update to 20230516 --- packages/linux-firmware/intel-ucode/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index c5f50c8b74..c17e34d3a2 100644 --- a/packages/linux-firmware/intel-ucode/package.mk +++ b/packages/linux-firmware/intel-ucode/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="intel-ucode" -PKG_VERSION="20230512" -PKG_SHA256="58f3321dcf900175d87d5b39455138c2a24e69df4ba997fb44e3e0d19e531ad1" +PKG_VERSION="20230516" +PKG_SHA256="ad8cbc5a273f4640003f6a3f1b129ac6a046f3498ce037921ebac1adf267e55d" PKG_ARCH="x86_64" PKG_LICENSE="other" PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode" From 8d99a4bf24b76e435cb2a339fe21966d1d54fe67 Mon Sep 17 00:00:00 2001 From: Martin Vallevand Date: Thu, 25 May 2023 16:39:38 -0400 Subject: [PATCH 127/157] [le11] nextpvr: update to 6.1.3 --- packages/addons/service/nextpvr/changelog.txt | 2 ++ packages/addons/service/nextpvr/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/nextpvr/changelog.txt b/packages/addons/service/nextpvr/changelog.txt index c0c0718529..d8a2682a4b 100644 --- a/packages/addons/service/nextpvr/changelog.txt +++ b/packages/addons/service/nextpvr/changelog.txt @@ -1,3 +1,5 @@ +3 +Update to 6.1.3 2 Fix nextpvr-downloader script diff --git a/packages/addons/service/nextpvr/package.mk b/packages/addons/service/nextpvr/package.mk index 68ea1cda28..46ee9b90fa 100644 --- a/packages/addons/service/nextpvr/package.mk +++ b/packages/addons/service/nextpvr/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nextpvr" -PKG_VERSION="6.1.1~Nexus" -PKG_ADDON_VERSION="6.1.1~2" +PKG_VERSION="6.1.3~Nexus" +PKG_ADDON_VERSION="6.1.3~3" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="NextPVR" From cffcac215725095c3019990566a98975c79bf4a7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 25 May 2023 22:31:46 +0000 Subject: [PATCH 128/157] nqptp: update to 1.2.1 --- .../addons/addon-depends/snapcast-depends/nqptp/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk b/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk index 275c397d47..1696dc3bfc 100644 --- a/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/nqptp/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nqptp" -PKG_VERSION="c71b49a3556ba8547ee28482cb31a97fe99298aa" -PKG_SHA256="02ed710ed37269adbede06fcd4e12892cc0f9d14d5c68b7f45d67b8694bff1e4" +PKG_VERSION="1.2.1" +PKG_SHA256="fab700572961ca81addb405e8bd4bd57c47259f91e7e8e0f5f82240c38c63ce5" PKG_LICENSE="GPL-2.0" PKG_SITE="https://github.com/mikebrady/nqptp" PKG_URL="https://github.com/mikebrady/nqptp/archive/${PKG_VERSION}.tar.gz" From 38753fd02c8ccd817de3a008c5539b7429345bf5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 25 May 2023 22:30:55 +0000 Subject: [PATCH 129/157] shairport-sync: update to 4.2 --- .../addon-depends/snapcast-depends/shairport-sync/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index 1a429883f3..bf506c9fe0 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="shairport-sync" -PKG_VERSION="4.1.1" -PKG_SHA256="e55caad73dcd36341baf8947cf5e0923997370366d6caf3dd917b345089c4a20" +PKG_VERSION="4.2" +PKG_SHA256="649d95eede8b9284b2e8b9c97d18c1c64cffae0a6c75bc4f03e3ae494a3e25b6" PKG_LICENSE="OSS" PKG_SITE="https://github.com/mikebrady/shairport-sync" PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz" From b0be544ba2c227b06da33fbe7de43582f3373969 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 15 May 2023 15:32:18 +0000 Subject: [PATCH 130/157] asio: update to 1.28.0 --- .../addons/addon-depends/snapcast-depends/asio/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index 1c810b6045..c2bf72e265 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="asio" -PKG_VERSION="1.27.0" -PKG_SHA256="9bee8e50236ce7752325efde38cae223cbc85759ed49509d9cbc5d55458332d9" +PKG_VERSION="1.28.0" +PKG_SHA256="5c2af07ef73b42a2d48e34c0ecbf41cd40dc823bc681bf5833c129384999c963" PKG_LICENSE="BSL" PKG_SITE="http://think-async.com/Asio" PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip" From 97bfce34c080097db9d50f8c3e0023cdd7983573 Mon Sep 17 00:00:00 2001 From: Henri Funck Date: Sat, 6 May 2023 09:29:07 +0200 Subject: [PATCH 131/157] librespot: update to githash c964102 (2023-05-14) --- packages/addons/service/librespot/changelog.txt | 2 ++ packages/addons/service/librespot/package.mk | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/addons/service/librespot/changelog.txt b/packages/addons/service/librespot/changelog.txt index 9a854f4905..df2757fa99 100644 --- a/packages/addons/service/librespot/changelog.txt +++ b/packages/addons/service/librespot/changelog.txt @@ -1,2 +1,4 @@ 1 - update librespot to githash 03b547d (2023-04-16) +2 +- update librespot to githash c964102 (2023-05-14) diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 197c2785e7..bcaf03d544 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -3,10 +3,10 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="librespot" -PKG_VERSION="03b547d3b3b434811225ebc153c651e5f1917b95" -PKG_VERSION_DATE="2023-04-16" -PKG_SHA256="fd6ffed75f5d9a0941c4ca2a86192c17217b60d1d301e47ff0d8aeec3b3e0e97" -PKG_REV="1" +PKG_VERSION="c964102a349589d644baef5f43a566d6d1e151f1" +PKG_VERSION_DATE="2023-05-14" +PKG_SHA256="3bc6782d8796253040d995043fba4e6f6c71ff902da110b50398071e082b1930" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" @@ -23,10 +23,6 @@ PKG_ADDON_TYPE="xbmc.service" PKG_MAINTAINER="Anton Voyl (awiouy)" make_target() { - unset CFLAGS - unset CXXFLAGS - unset CPPFLAGS - unset LDFLAGS export RUSTC_LINKER=${CC} cargo build \ --target ${TARGET_NAME} \ From 892d2943cc940bc395aa7912d3ad4ba2cd61a341 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 30 May 2023 15:43:01 +0000 Subject: [PATCH 132/157] inputstream.adaptive: update 20.3.8-Nexus to 20.3.9-Nexus --- .../kodi-binary-addons/inputstream.adaptive/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index b27e083271..bf8400441a 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="inputstream.adaptive" -PKG_VERSION="20.3.8-Nexus" -PKG_SHA256="db972656dc42ce1e443b8aed8d410feb5093603b9c2beb3875eb6fafa3c9f3a9" +PKG_VERSION="20.3.9-Nexus" +PKG_SHA256="02bc1048115c4affd0bf3f6cbb6ea15b06b1830831ba1892668334b99f7097a7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 06b81cccdc517e0f0389dbaf67c6b59ef9d541ca Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Jun 2023 14:42:20 +0000 Subject: [PATCH 133/157] openssl: update to 3.0.9 release annoucement: - https://www.openssl.org/news/secadv/20230530.txt --- packages/security/openssl/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index 49c22e2fa1..843e60a129 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openssl" -PKG_VERSION="3.0.8" -PKG_SHA256="6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e" +PKG_VERSION="3.0.9" +PKG_SHA256="eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90" PKG_LICENSE="Apache-2.0" PKG_SITE="https://www.openssl.org" PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" From a1d19b43e0aeaa7d57e96518009b45e85b0a8e64 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 3 Jun 2023 12:19:06 +0200 Subject: [PATCH 134/157] linux: update patches to fix audio passthrough issues The ELD constraint patch is updated to a more correct version which now properly sets the constraints based on rate families. The added hdmi-codec patch fixes audio infoframe values for passthrough (channel info needs to be set to "refer to stream header") as some TVs (eg Sony) tripped over that and refused to play TrueHD otherwise. Signed-off-by: Matthias Reichl --- ...-constraints-for-E-AC3-DTS-HD-and-ML.patch | 138 ++++++++++++++++++ ...d-constraints-for-compressed-formats.patch | 91 ------------ ...don-t-set-channel-and-speaker-info-f.patch | 89 +++++++++++ ...-constraints-for-E-AC3-DTS-HD-and-ML.patch | 138 ++++++++++++++++++ ...d-constraints-for-compressed-formats.patch | 91 ------------ ...don-t-set-channel-and-speaker-info-f.patch | 89 +++++++++++ 6 files changed, 454 insertions(+), 182 deletions(-) create mode 100644 packages/linux/patches/default/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch delete mode 100644 packages/linux/patches/default/linux-020-eld-constraints-for-compressed-formats.patch create mode 100644 packages/linux/patches/default/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch create mode 100644 packages/linux/patches/raspberrypi/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch delete mode 100644 packages/linux/patches/raspberrypi/linux-020-eld-constraints-for-compressed-formats.patch create mode 100644 packages/linux/patches/raspberrypi/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch diff --git a/packages/linux/patches/default/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch b/packages/linux/patches/default/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch new file mode 100644 index 0000000000..3478eb7e09 --- /dev/null +++ b/packages/linux/patches/default/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch @@ -0,0 +1,138 @@ +From 94d0a9815c99385e57a17fb20448e47a1f229bcf Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 3 Jun 2023 12:00:28 +0200 +Subject: [PATCH 1/2] ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and + MLP formats + +The SADs of compressed formats contain the channel and sample rate +info of the audio data inside the compressed stream, but when +building constraints we must use the rates and channels used to +transport the compressed streams. + +eg 48kHz 6ch EAC3 needs to be transmitted as a 2ch 192kHz stream. + +This patch fixes the constraints for the common AC3 and DTS formats, +the constraints for the less common MPEG, DSD etc formats are copied +directly from the info in the SADs as before as I don't have the specs +and equipment to test those. + +Signed-off-by: Matthias Reichl +--- + sound/core/pcm_drm_eld.c | 73 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 70 insertions(+), 3 deletions(-) + +diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c +index 4b5faae5d16e5..07075071972dd 100644 +--- a/sound/core/pcm_drm_eld.c ++++ b/sound/core/pcm_drm_eld.c +@@ -2,11 +2,25 @@ + /* + * PCM DRM helpers + */ ++#include + #include ++#include + #include + #include + #include + ++#define SAD0_CHANNELS_MASK GENMASK(2, 0) /* max number of channels - 1 */ ++#define SAD0_FORMAT_MASK GENMASK(6, 3) /* audio format */ ++ ++#define SAD1_RATE_MASK GENMASK(6, 0) /* bitfield of supported rates */ ++#define SAD1_RATE_32000_MASK BIT(0) ++#define SAD1_RATE_44100_MASK BIT(1) ++#define SAD1_RATE_48000_MASK BIT(2) ++#define SAD1_RATE_88200_MASK BIT(3) ++#define SAD1_RATE_96000_MASK BIT(4) ++#define SAD1_RATE_176400_MASK BIT(5) ++#define SAD1_RATE_192000_MASK BIT(6) ++ + static const unsigned int eld_rates[] = { + 32000, + 44100, +@@ -17,9 +31,62 @@ static const unsigned int eld_rates[] = { + 192000, + }; + ++static unsigned int map_rate_families(const u8 *sad, ++ unsigned int mask_32000, ++ unsigned int mask_44100, ++ unsigned int mask_48000) ++{ ++ unsigned int rate_mask = 0; ++ ++ if (sad[1] & SAD1_RATE_32000_MASK) ++ rate_mask |= mask_32000; ++ if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK)) ++ rate_mask |= mask_44100; ++ if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK)) ++ rate_mask |= mask_48000; ++ return rate_mask; ++} ++ ++static unsigned int sad_rate_mask(const u8 *sad) ++{ ++ switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { ++ case HDMI_AUDIO_CODING_TYPE_PCM: ++ return sad[1] & SAD1_RATE_MASK; ++ case HDMI_AUDIO_CODING_TYPE_AC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS: ++ return map_rate_families(sad, ++ SAD1_RATE_32000_MASK, ++ SAD1_RATE_44100_MASK, ++ SAD1_RATE_48000_MASK); ++ case HDMI_AUDIO_CODING_TYPE_EAC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS_HD: ++ case HDMI_AUDIO_CODING_TYPE_MLP: ++ return map_rate_families(sad, ++ 0, ++ SAD1_RATE_176400_MASK, ++ SAD1_RATE_192000_MASK); ++ default: ++ /* TODO adjust for other compressed formats as well */ ++ return sad[1] & SAD1_RATE_MASK; ++ } ++} ++ + static unsigned int sad_max_channels(const u8 *sad) + { +- return 1 + (sad[0] & 7); ++ switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { ++ case HDMI_AUDIO_CODING_TYPE_PCM: ++ return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); ++ case HDMI_AUDIO_CODING_TYPE_AC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS: ++ case HDMI_AUDIO_CODING_TYPE_EAC3: ++ return 2; ++ case HDMI_AUDIO_CODING_TYPE_DTS_HD: ++ case HDMI_AUDIO_CODING_TYPE_MLP: ++ return 8; ++ default: ++ /* TODO adjust for other compressed formats as well */ ++ return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); ++ } + } + + static int eld_limit_rates(struct snd_pcm_hw_params *params, +@@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, + * requested number of channels. + */ + if (c->min <= max_channels) +- rate_mask |= sad[1]; ++ rate_mask |= sad_rate_mask(sad); + } + } + +@@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, + rate_mask |= BIT(i); + + for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) +- if (rate_mask & sad[1]) ++ if (rate_mask & sad_rate_mask(sad)) + t.max = max(t.max, sad_max_channels(sad)); + } + +-- +2.39.2 + diff --git a/packages/linux/patches/default/linux-020-eld-constraints-for-compressed-formats.patch b/packages/linux/patches/default/linux-020-eld-constraints-for-compressed-formats.patch deleted file mode 100644 index bb74ff7bd7..0000000000 --- a/packages/linux/patches/default/linux-020-eld-constraints-for-compressed-formats.patch +++ /dev/null @@ -1,91 +0,0 @@ -From a2769637a9b98c6809d4d25a3a20447a3ff7b23a Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Fri, 19 Mar 2021 12:14:17 +0100 -Subject: [PATCH] ALSA: pcm: fix ELD constraints for some compressed audio - formats - -The SADs of compressed formats like AC3 and DTS contain the channel -and sample rate info of the audio data inside the compressed stream, -but when building constraints we must use the rates and formats used -to pass through the stream. eg 2ch 48kHz for AC3. - -Signed-off-by: Matthias Reichl ---- - sound/core/pcm_drm_eld.c | 38 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 35 insertions(+), 3 deletions(-) - -diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c -index 4b5faae5d16e5..e7ec7a8b9d420 100644 ---- a/sound/core/pcm_drm_eld.c -+++ b/sound/core/pcm_drm_eld.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - static const unsigned int eld_rates[] = { - 32000, -@@ -17,9 +18,40 @@ static const unsigned int eld_rates[] = { - 192000, - }; - -+static unsigned int sad_format(const u8 *sad) -+{ -+ return (sad[0] & 0x78) >> 3; -+} -+ - static unsigned int sad_max_channels(const u8 *sad) - { -- return 1 + (sad[0] & 7); -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 2; -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 8; -+ default: -+ return 1 + (sad[0] & 7); -+ } -+} -+ -+static unsigned int sad_rate_mask(const u8 *sad) -+{ -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ return 0x07; // 32-48kHz -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 0x7f; // 32-192kHz -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 0x60; // 176.4, 192kHz -+ default: -+ return sad[1] & 0x7f; -+ } - } - - static int eld_limit_rates(struct snd_pcm_hw_params *params, -@@ -42,7 +74,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, - * requested number of channels. - */ - if (c->min <= max_channels) -- rate_mask |= sad[1]; -+ rate_mask |= sad_rate_mask(sad); - } - } - -@@ -70,7 +102,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, - rate_mask |= BIT(i); - - for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) -- if (rate_mask & sad[1]) -+ if (rate_mask & sad_rate_mask(sad)) - t.max = max(t.max, sad_max_channels(sad)); - } - --- -2.20.1 - diff --git a/packages/linux/patches/default/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch b/packages/linux/patches/default/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch new file mode 100644 index 0000000000..d63c347e5a --- /dev/null +++ b/packages/linux/patches/default/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch @@ -0,0 +1,89 @@ +From 99586e3f502fcc4fdd21b621f3c87ae7a8f7c170 Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 3 Jun 2023 12:12:28 +0200 +Subject: [PATCH 2/2] ASoC: hdmi-codec: don't set channel and speaker info for + compressed formats + +CTA 861 only mandates that the speaker allocation in the audio info frame +is set for multichannel PCM formats. Likewise the number of channels in the +audio infoframe is only relevant for PCM. + +Some TVs won't decode compressed formats if the number of channels isn't +set to 0 (refer to stream header) and the speaker allocation is set to the +default 0 (FL and FR). + +So fill in this info only for PCM audio and set it to 0 for compressed +audio formats. + +This also prevents hdmi_codec_prepare failing with an error when trying to +play back DTS-HD or MLP (which is passed through as 8ch) if the sink only +supports 2ch PCM and announces only FL/FR speaker support in the EDID. + +Signed-off-by: Matthias Reichl +--- + sound/soc/codecs/hdmi-codec.c | 36 +++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c +index 0b1cdb2d60498..a192d985c5f18 100644 +--- a/sound/soc/codecs/hdmi-codec.c ++++ b/sound/soc/codecs/hdmi-codec.c +@@ -484,31 +484,43 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, + struct hdmi_codec_params *hp) + { + struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); +- int idx; +- +- /* Select a channel allocation that matches with ELD and pcm channels */ +- idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); +- if (idx < 0) { +- dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", +- idx); +- hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; +- return idx; ++ int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; ++ u8 ca_id = 0; ++ bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO); ++ ++ if (pcm_audio) { ++ /* Select a channel allocation that matches with ELD and pcm channels */ ++ idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); ++ ++ if (idx < 0) { ++ dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", ++ idx); ++ hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; ++ return idx; ++ } ++ ++ ca_id = hdmi_codec_channel_alloc[idx].ca_id; + } + + memset(hp, 0, sizeof(*hp)); + + hdmi_audio_infoframe_init(&hp->cea); +- hp->cea.channels = channels; ++ ++ if (pcm_audio) ++ hp->cea.channels = channels; ++ else ++ hp->cea.channels = 0; ++ + hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; + hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; + hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; +- hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id; ++ hp->cea.channel_allocation = ca_id; + + hp->sample_width = sample_width; + hp->sample_rate = sample_rate; + hp->channels = channels; + +- hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id; ++ hcp->chmap_idx = idx; + + return 0; + } +-- +2.39.2 + diff --git a/packages/linux/patches/raspberrypi/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch b/packages/linux/patches/raspberrypi/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch new file mode 100644 index 0000000000..3478eb7e09 --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-020-ALSA-pcm-fix-ELD-constraints-for-E-AC3-DTS-HD-and-ML.patch @@ -0,0 +1,138 @@ +From 94d0a9815c99385e57a17fb20448e47a1f229bcf Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 3 Jun 2023 12:00:28 +0200 +Subject: [PATCH 1/2] ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and + MLP formats + +The SADs of compressed formats contain the channel and sample rate +info of the audio data inside the compressed stream, but when +building constraints we must use the rates and channels used to +transport the compressed streams. + +eg 48kHz 6ch EAC3 needs to be transmitted as a 2ch 192kHz stream. + +This patch fixes the constraints for the common AC3 and DTS formats, +the constraints for the less common MPEG, DSD etc formats are copied +directly from the info in the SADs as before as I don't have the specs +and equipment to test those. + +Signed-off-by: Matthias Reichl +--- + sound/core/pcm_drm_eld.c | 73 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 70 insertions(+), 3 deletions(-) + +diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c +index 4b5faae5d16e5..07075071972dd 100644 +--- a/sound/core/pcm_drm_eld.c ++++ b/sound/core/pcm_drm_eld.c +@@ -2,11 +2,25 @@ + /* + * PCM DRM helpers + */ ++#include + #include ++#include + #include + #include + #include + ++#define SAD0_CHANNELS_MASK GENMASK(2, 0) /* max number of channels - 1 */ ++#define SAD0_FORMAT_MASK GENMASK(6, 3) /* audio format */ ++ ++#define SAD1_RATE_MASK GENMASK(6, 0) /* bitfield of supported rates */ ++#define SAD1_RATE_32000_MASK BIT(0) ++#define SAD1_RATE_44100_MASK BIT(1) ++#define SAD1_RATE_48000_MASK BIT(2) ++#define SAD1_RATE_88200_MASK BIT(3) ++#define SAD1_RATE_96000_MASK BIT(4) ++#define SAD1_RATE_176400_MASK BIT(5) ++#define SAD1_RATE_192000_MASK BIT(6) ++ + static const unsigned int eld_rates[] = { + 32000, + 44100, +@@ -17,9 +31,62 @@ static const unsigned int eld_rates[] = { + 192000, + }; + ++static unsigned int map_rate_families(const u8 *sad, ++ unsigned int mask_32000, ++ unsigned int mask_44100, ++ unsigned int mask_48000) ++{ ++ unsigned int rate_mask = 0; ++ ++ if (sad[1] & SAD1_RATE_32000_MASK) ++ rate_mask |= mask_32000; ++ if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK)) ++ rate_mask |= mask_44100; ++ if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK)) ++ rate_mask |= mask_48000; ++ return rate_mask; ++} ++ ++static unsigned int sad_rate_mask(const u8 *sad) ++{ ++ switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { ++ case HDMI_AUDIO_CODING_TYPE_PCM: ++ return sad[1] & SAD1_RATE_MASK; ++ case HDMI_AUDIO_CODING_TYPE_AC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS: ++ return map_rate_families(sad, ++ SAD1_RATE_32000_MASK, ++ SAD1_RATE_44100_MASK, ++ SAD1_RATE_48000_MASK); ++ case HDMI_AUDIO_CODING_TYPE_EAC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS_HD: ++ case HDMI_AUDIO_CODING_TYPE_MLP: ++ return map_rate_families(sad, ++ 0, ++ SAD1_RATE_176400_MASK, ++ SAD1_RATE_192000_MASK); ++ default: ++ /* TODO adjust for other compressed formats as well */ ++ return sad[1] & SAD1_RATE_MASK; ++ } ++} ++ + static unsigned int sad_max_channels(const u8 *sad) + { +- return 1 + (sad[0] & 7); ++ switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { ++ case HDMI_AUDIO_CODING_TYPE_PCM: ++ return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); ++ case HDMI_AUDIO_CODING_TYPE_AC3: ++ case HDMI_AUDIO_CODING_TYPE_DTS: ++ case HDMI_AUDIO_CODING_TYPE_EAC3: ++ return 2; ++ case HDMI_AUDIO_CODING_TYPE_DTS_HD: ++ case HDMI_AUDIO_CODING_TYPE_MLP: ++ return 8; ++ default: ++ /* TODO adjust for other compressed formats as well */ ++ return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); ++ } + } + + static int eld_limit_rates(struct snd_pcm_hw_params *params, +@@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, + * requested number of channels. + */ + if (c->min <= max_channels) +- rate_mask |= sad[1]; ++ rate_mask |= sad_rate_mask(sad); + } + } + +@@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, + rate_mask |= BIT(i); + + for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) +- if (rate_mask & sad[1]) ++ if (rate_mask & sad_rate_mask(sad)) + t.max = max(t.max, sad_max_channels(sad)); + } + +-- +2.39.2 + diff --git a/packages/linux/patches/raspberrypi/linux-020-eld-constraints-for-compressed-formats.patch b/packages/linux/patches/raspberrypi/linux-020-eld-constraints-for-compressed-formats.patch deleted file mode 100644 index bb74ff7bd7..0000000000 --- a/packages/linux/patches/raspberrypi/linux-020-eld-constraints-for-compressed-formats.patch +++ /dev/null @@ -1,91 +0,0 @@ -From a2769637a9b98c6809d4d25a3a20447a3ff7b23a Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Fri, 19 Mar 2021 12:14:17 +0100 -Subject: [PATCH] ALSA: pcm: fix ELD constraints for some compressed audio - formats - -The SADs of compressed formats like AC3 and DTS contain the channel -and sample rate info of the audio data inside the compressed stream, -but when building constraints we must use the rates and formats used -to pass through the stream. eg 2ch 48kHz for AC3. - -Signed-off-by: Matthias Reichl ---- - sound/core/pcm_drm_eld.c | 38 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 35 insertions(+), 3 deletions(-) - -diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c -index 4b5faae5d16e5..e7ec7a8b9d420 100644 ---- a/sound/core/pcm_drm_eld.c -+++ b/sound/core/pcm_drm_eld.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - static const unsigned int eld_rates[] = { - 32000, -@@ -17,9 +18,40 @@ static const unsigned int eld_rates[] = { - 192000, - }; - -+static unsigned int sad_format(const u8 *sad) -+{ -+ return (sad[0] & 0x78) >> 3; -+} -+ - static unsigned int sad_max_channels(const u8 *sad) - { -- return 1 + (sad[0] & 7); -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 2; -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 8; -+ default: -+ return 1 + (sad[0] & 7); -+ } -+} -+ -+static unsigned int sad_rate_mask(const u8 *sad) -+{ -+ switch (sad_format(sad)) { -+ case HDMI_AUDIO_CODING_TYPE_AC3: -+ case HDMI_AUDIO_CODING_TYPE_DTS: -+ return 0x07; // 32-48kHz -+ case HDMI_AUDIO_CODING_TYPE_EAC3: -+ return 0x7f; // 32-192kHz -+ case HDMI_AUDIO_CODING_TYPE_DTS_HD: -+ case HDMI_AUDIO_CODING_TYPE_MLP: -+ return 0x60; // 176.4, 192kHz -+ default: -+ return sad[1] & 0x7f; -+ } - } - - static int eld_limit_rates(struct snd_pcm_hw_params *params, -@@ -42,7 +74,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, - * requested number of channels. - */ - if (c->min <= max_channels) -- rate_mask |= sad[1]; -+ rate_mask |= sad_rate_mask(sad); - } - } - -@@ -70,7 +102,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, - rate_mask |= BIT(i); - - for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) -- if (rate_mask & sad[1]) -+ if (rate_mask & sad_rate_mask(sad)) - t.max = max(t.max, sad_max_channels(sad)); - } - --- -2.20.1 - diff --git a/packages/linux/patches/raspberrypi/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch b/packages/linux/patches/raspberrypi/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch new file mode 100644 index 0000000000..d63c347e5a --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-021-ASoC-hdmi-codec-don-t-set-channel-and-speaker-info-f.patch @@ -0,0 +1,89 @@ +From 99586e3f502fcc4fdd21b621f3c87ae7a8f7c170 Mon Sep 17 00:00:00 2001 +From: Matthias Reichl +Date: Sat, 3 Jun 2023 12:12:28 +0200 +Subject: [PATCH 2/2] ASoC: hdmi-codec: don't set channel and speaker info for + compressed formats + +CTA 861 only mandates that the speaker allocation in the audio info frame +is set for multichannel PCM formats. Likewise the number of channels in the +audio infoframe is only relevant for PCM. + +Some TVs won't decode compressed formats if the number of channels isn't +set to 0 (refer to stream header) and the speaker allocation is set to the +default 0 (FL and FR). + +So fill in this info only for PCM audio and set it to 0 for compressed +audio formats. + +This also prevents hdmi_codec_prepare failing with an error when trying to +play back DTS-HD or MLP (which is passed through as 8ch) if the sink only +supports 2ch PCM and announces only FL/FR speaker support in the EDID. + +Signed-off-by: Matthias Reichl +--- + sound/soc/codecs/hdmi-codec.c | 36 +++++++++++++++++++++++------------ + 1 file changed, 24 insertions(+), 12 deletions(-) + +diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c +index 0b1cdb2d60498..a192d985c5f18 100644 +--- a/sound/soc/codecs/hdmi-codec.c ++++ b/sound/soc/codecs/hdmi-codec.c +@@ -484,31 +484,43 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai, + struct hdmi_codec_params *hp) + { + struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai); +- int idx; +- +- /* Select a channel allocation that matches with ELD and pcm channels */ +- idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); +- if (idx < 0) { +- dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", +- idx); +- hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; +- return idx; ++ int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; ++ u8 ca_id = 0; ++ bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO); ++ ++ if (pcm_audio) { ++ /* Select a channel allocation that matches with ELD and pcm channels */ ++ idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels); ++ ++ if (idx < 0) { ++ dev_err(dai->dev, "Not able to map channels to speakers (%d)\n", ++ idx); ++ hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN; ++ return idx; ++ } ++ ++ ca_id = hdmi_codec_channel_alloc[idx].ca_id; + } + + memset(hp, 0, sizeof(*hp)); + + hdmi_audio_infoframe_init(&hp->cea); +- hp->cea.channels = channels; ++ ++ if (pcm_audio) ++ hp->cea.channels = channels; ++ else ++ hp->cea.channels = 0; ++ + hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; + hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; + hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; +- hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id; ++ hp->cea.channel_allocation = ca_id; + + hp->sample_width = sample_width; + hp->sample_rate = sample_rate; + hp->channels = channels; + +- hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id; ++ hcp->chmap_idx = idx; + + return 0; + } +-- +2.39.2 + From 4ce3c962394c566dbe187ce79fe0e3d3cf20cf06 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 3 Jun 2023 10:44:06 +0000 Subject: [PATCH 135/157] pvr.zattoo: update 20.3.7-Nexus to 20.3.8-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk index f5fe7f7765..212a275b6b 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.zattoo" -PKG_VERSION="20.3.7-Nexus" -PKG_SHA256="c75ba4710d7e85cf516005ee3eca6d677e2fc018abaf490c881bc6552eb32929" +PKG_VERSION="20.3.8-Nexus" +PKG_SHA256="451d4e4dbdca71c9bd31d3d11528db4759b93c323476e5e881f617fa3eadc600" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 806e0f5ef83910399ddaf8888043e1de3472a270 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 12 May 2023 12:51:09 +0200 Subject: [PATCH 136/157] linux (RPi): update to 6.1.28-dbcb823 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7c4a7b55e1..2494d8dfe2 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="83cf6b410113c98ebfd0b7fef70b1a7c9539b0b9" # 6.1.27 - PKG_SHA256="be28f607f945ee7083af61608f29ced824db87fc7b49bff4e4c7d64ca8581935" + PKG_VERSION="dbcb82357ef21be47841ba39d117b626d715af31" # 6.1.28 + PKG_SHA256="2177e857d824d0b5e9a6210d035cddcfea98157600db4ca50c92ab9f8d8accd9" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From b6039226b7eac074bbfd18856b5a3bb0ec57b192 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 15 May 2023 20:01:55 +0200 Subject: [PATCH 137/157] linux (RPi): update to 6.1.28-1229967 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 2494d8dfe2..14bf6d837c 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="dbcb82357ef21be47841ba39d117b626d715af31" # 6.1.28 - PKG_SHA256="2177e857d824d0b5e9a6210d035cddcfea98157600db4ca50c92ab9f8d8accd9" + PKG_VERSION="1229967a3ab861660b6d31ccdc8526bd44712b13" # 6.1.28 + PKG_SHA256="67daf12920b0f36d0aa7b4443a4c976c02441ad8b6ecc3c839f9d88327e962d3" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 73f7933525b3a41d74e9cd43bc491f3abb0d0cc5 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 16 May 2023 21:13:52 +0200 Subject: [PATCH 138/157] linux (RPi): update to 6.1.28-4d48800 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 14bf6d837c..38554aca93 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="1229967a3ab861660b6d31ccdc8526bd44712b13" # 6.1.28 - PKG_SHA256="67daf12920b0f36d0aa7b4443a4c976c02441ad8b6ecc3c839f9d88327e962d3" + PKG_VERSION="4d4880099b91ca4f180cc9d1c47b7005b4b7f3f0" # 6.1.28 + PKG_SHA256="8b1aec299586c8b6b75f30b1f50bd668cd5d6e0165f6e508033a910dfe01fc1d" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From bfdea4bf299a86c6e128265e6c27d8031e7a0af9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 24 May 2023 16:58:07 +0200 Subject: [PATCH 139/157] linux (RPi): update to 6.1.29-2e77428 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 38554aca93..eed366d739 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="4d4880099b91ca4f180cc9d1c47b7005b4b7f3f0" # 6.1.28 - PKG_SHA256="8b1aec299586c8b6b75f30b1f50bd668cd5d6e0165f6e508033a910dfe01fc1d" + PKG_VERSION="2e774281403e225fdf2ff73d0d6642a752b8ddf9" # 6.1.29 + PKG_SHA256="c759f5b0f0a4883106e8e3b8c8fd75c1890524defe1c16182b58d66fa6ff64f6" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From b8c25675d35209c04918079efb2001d871401f9d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 30 May 2023 20:27:34 +0200 Subject: [PATCH 140/157] linux (RPi): update to 6.1.31-3a4603d Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index eed366d739..c3e2207f30 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="2e774281403e225fdf2ff73d0d6642a752b8ddf9" # 6.1.29 - PKG_SHA256="c759f5b0f0a4883106e8e3b8c8fd75c1890524defe1c16182b58d66fa6ff64f6" + PKG_VERSION="3a4603db1c0e33167153244deb198c2b13370f98" # 6.1.31 + PKG_SHA256="6e3b2323687c66bdd1cbb2547b0a11c5d9ad69d7dab1400a4055183c8e20f3c2" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 83bd9b7dc3cc547b6b0c720829a39adb1239bda0 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 30 May 2023 20:31:01 +0200 Subject: [PATCH 141/157] rpi-eeprom: update to 75d3a76 Signed-off-by: Matthias Reichl --- packages/tools/rpi-eeprom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index fdccbab1e6..3be9bc3156 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-eeprom" -PKG_VERSION="bf7419c961e8b65854fd73ec29fbc515087539e8" -PKG_SHA256="49c2e92accc58d10ddcf0a7a7eb2385c674ac57610c0f5b1e4dfea0e9983f353" +PKG_VERSION="75d3a760469130cb537e5d8d504f892336abd62b" +PKG_SHA256="a71573a80149b1c2c4b6d5ec1527ef011611c6883a0cf06c02961fe518384307" PKG_LICENSE="BSD-3/custom" PKG_SITE="https://github.com/raspberrypi/rpi-eeprom" PKG_URL="https://github.com/raspberrypi/rpi-eeprom/archive/${PKG_VERSION}.tar.gz" From b596550b0eff2f8011ba6766f26ef776a371aa20 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 4 Jun 2023 00:02:16 +0000 Subject: [PATCH 142/157] minisatip: fix sha256 --- packages/addons/service/minisatip/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk index 120f68faa8..adba99995c 100644 --- a/packages/addons/service/minisatip/package.mk +++ b/packages/addons/service/minisatip/package.mk @@ -3,7 +3,7 @@ PKG_NAME="minisatip" PKG_VERSION="1.2.84" -PKG_SHA256="b8e58eae2e0502d940b59cf60bf73ffb6af1a4c7d4cd23ddd939f29cd4004d8c" +PKG_SHA256="d5a06b0c371e1f5ccba6fcb3d76abf348e93e14ab4d7317bb701ae023c085e4b" PKG_REV="0" PKG_ARCH="any" PKG_LICENSE="GPL" From 7507ef5f32d021fa5a68397713b6386e8a97fe3a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 8 Jun 2023 14:21:43 +0000 Subject: [PATCH 143/157] kodi-binary-addons: update to latest versions - pvr.nextpvr: update 20.4.1-Nexus to 20.4.2-Nexus - pvr.sledovanitv.cz: update 20.4.1-Nexus to 20.5.0-Nexus --- .../mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk | 4 ++-- .../kodi-binary-addons/pvr.sledovanitv.cz/package.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index c71af8b033..299412a646 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.nextpvr" -PKG_VERSION="20.4.1-Nexus" -PKG_SHA256="bad9e7dd4f67348015f8fc477e0c4c8447e00dbd38b9f6548d1ce04f0845b1fd" +PKG_VERSION="20.4.2-Nexus" +PKG_SHA256="1ce85447426ddf6d443a5e3444145a2d3af65ce73d9fb583e42cd8afc9d599a5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk index 2e97d96b05..b3a75bf07d 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.sledovanitv.cz" -PKG_VERSION="20.4.1-Nexus" -PKG_SHA256="d73038046c5d9ee5a3c743b33adad1a6079914b4850e70dab214645cf2905f2e" -PKG_REV="3" +PKG_VERSION="20.5.0-Nexus" +PKG_SHA256="e9da3dbc7724eb35b8458fbb927233164b38f5a07f16839490c8eab526ac0eca" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/palinek/pvr.sledovanitv.cz" From 251b6ee13d596867423d7e69dd3836972999e4a4 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 11 Jun 2023 22:50:30 +0200 Subject: [PATCH 144/157] ffmpeg: update rpi patch Patch created using revisions 7e0d640..e3d9763 from branch test/4.4.1/main of https://github.com/jc-kynesim/rpi-ffmpeg --- .../ffmpeg/patches/rpi/ffmpeg-001-rpi.patch | 1507 ++++++++++++++++- 1 file changed, 1444 insertions(+), 63 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch index 998d86ff6c..c835a0de3a 100644 --- a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch +++ b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch @@ -52696,7 +52696,7 @@ index 22a9532444..108fc05a6f 100644 + #endif // AVCODEC_V4L2_CONTEXT_H diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c -index cdfd579810..a919bdc030 100644 +index cdfd579810..025cf24769 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -35,6 +35,15 @@ @@ -52725,7 +52725,7 @@ index cdfd579810..a919bdc030 100644 atomic_init(&s->refcount, 0); sem_init(&s->refsync, 0, 0); -@@ -85,12 +96,14 @@ static int v4l2_prepare_contexts(V4L2m2mContext *s, int probe) +@@ -85,18 +96,58 @@ static int v4l2_prepare_contexts(V4L2m2mContext *s, int probe) if (v4l2_mplane_video(&cap)) { s->capture.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; s->output.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; @@ -52740,7 +52740,63 @@ index cdfd579810..a919bdc030 100644 return 0; } -@@ -215,13 +228,7 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *s) + return AVERROR(EINVAL); + } + ++static int check_size(AVCodecContext * const avctx, V4L2m2mContext * const s) ++{ ++ struct v4l2_format fmt = {.type = s->output.type}; ++ int rv; ++ uint32_t pixfmt = ff_v4l2_format_avfmt_to_v4l2(avctx->pix_fmt); ++ unsigned int w; ++ unsigned int h; ++ ++ if (V4L2_TYPE_IS_MULTIPLANAR(fmt.type)) { ++ fmt.fmt.pix_mp.pixelformat = pixfmt; ++ fmt.fmt.pix_mp.width = avctx->width; ++ fmt.fmt.pix_mp.height = avctx->height; ++ } ++ else { ++ fmt.fmt.pix.pixelformat = pixfmt; ++ fmt.fmt.pix.width = avctx->width; ++ fmt.fmt.pix.height = avctx->height; ++ } ++ ++ rv = ioctl(s->fd, VIDIOC_TRY_FMT, &fmt); ++ ++ if (rv != 0) { ++ rv = AVERROR(errno); ++ av_log(avctx, AV_LOG_ERROR, "%s: Tryfmt failed: %s\n", __func__, av_err2str(rv)); ++ return rv; ++ } ++ ++ w = ff_v4l2_get_format_width(&fmt); ++ h = ff_v4l2_get_format_height(&fmt); ++ ++ if (w < avctx->width || h < avctx->height) { ++ av_log(avctx, AV_LOG_WARNING, "%s: Size check failed: asked for %dx%d, got: %dx%d\n", __func__, avctx->width, avctx->height, w, h); ++ return AVERROR(EINVAL); ++ } ++ ++ return 0; ++} ++ + static int v4l2_probe_driver(V4L2m2mContext *s) + { + void *log_ctx = s->avctx; +@@ -116,6 +167,11 @@ static int v4l2_probe_driver(V4L2m2mContext *s) + goto done; + } + ++ // If being given frames (encode) check that V4L2 can cope with the size ++ if (s->output.av_codec_id == AV_CODEC_ID_RAWVIDEO && ++ (ret = check_size(s->avctx, s)) != 0) ++ goto done; ++ + ret = ff_v4l2_context_get_format(&s->capture, 1); + if (ret) { + av_log(log_ctx, AV_LOG_DEBUG, "v4l2 capture format not supported\n"); +@@ -215,13 +271,7 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *s) av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); /* 2. unmap the capture buffers (v4l2 and ffmpeg): @@ -52754,7 +52810,7 @@ index cdfd579810..a919bdc030 100644 ff_v4l2_context_release(&s->capture); /* 3. get the new capture format */ -@@ -240,7 +247,6 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *s) +@@ -240,7 +290,6 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *s) /* 5. complete reinit */ s->draining = 0; @@ -52762,7 +52818,7 @@ index cdfd579810..a919bdc030 100644 return 0; } -@@ -274,7 +280,6 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) +@@ -274,7 +323,6 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) /* start again now that we know the stream dimensions */ s->draining = 0; @@ -52770,7 +52826,7 @@ index cdfd579810..a919bdc030 100644 ret = ff_v4l2_context_get_format(&s->output, 0); if (ret) { -@@ -328,10 +333,14 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) +@@ -328,10 +376,14 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) ff_v4l2_context_release(&s->capture); sem_destroy(&s->refsync); @@ -52786,7 +52842,7 @@ index cdfd579810..a919bdc030 100644 av_free(s); } -@@ -344,6 +353,11 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv) +@@ -344,6 +396,11 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv) if (!s) return 0; @@ -52798,7 +52854,7 @@ index cdfd579810..a919bdc030 100644 if (s->fd >= 0) { ret = ff_v4l2_context_set_status(&s->output, VIDIOC_STREAMOFF); if (ret) -@@ -356,7 +370,15 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv) +@@ -356,7 +413,15 @@ int ff_v4l2_m2m_codec_end(V4L2m2mPriv *priv) ff_v4l2_context_release(&s->output); @@ -52814,7 +52870,7 @@ index cdfd579810..a919bdc030 100644 av_buffer_unref(&priv->context_ref); return 0; -@@ -400,35 +422,38 @@ int ff_v4l2_m2m_codec_init(V4L2m2mPriv *priv) +@@ -400,35 +465,38 @@ int ff_v4l2_m2m_codec_init(V4L2m2mPriv *priv) return v4l2_configure_contexts(s); } @@ -52866,7 +52922,7 @@ index cdfd579810..a919bdc030 100644 return 0; } diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h -index b67b216331..ded1478a49 100644 +index b67b216331..a506e69d67 100644 --- a/libavcodec/v4l2_m2m.h +++ b/libavcodec/v4l2_m2m.h @@ -30,6 +30,7 @@ @@ -52930,7 +52986,7 @@ index b67b216331..ded1478a49 100644 AVPacket buf_pkt; /* Reference to a frame. Only used during encoding */ -@@ -66,6 +99,35 @@ typedef struct V4L2m2mContext { +@@ -66,6 +99,36 @@ typedef struct V4L2m2mContext { /* reference back to V4L2m2mPriv */ void *priv; @@ -52950,6 +53006,7 @@ index b67b216331..ded1478a49 100644 + + /* req pkt */ + int req_pkt; ++ int reorder_size; + + /* Ext data sent */ + int extdata_sent; @@ -52966,7 +53023,7 @@ index b67b216331..ded1478a49 100644 } V4L2m2mContext; typedef struct V4L2m2mPriv { -@@ -76,6 +138,8 @@ typedef struct V4L2m2mPriv { +@@ -76,6 +139,8 @@ typedef struct V4L2m2mPriv { int num_output_buffers; int num_capture_buffers; @@ -52975,7 +53032,7 @@ index b67b216331..ded1478a49 100644 } V4L2m2mPriv; /** -@@ -129,4 +193,26 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *ctx); +@@ -129,4 +194,26 @@ int ff_v4l2_m2m_codec_reinit(V4L2m2mContext *ctx); */ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *ctx); @@ -53003,7 +53060,7 @@ index b67b216331..ded1478a49 100644 + #endif /* AVCODEC_V4L2_M2M_H */ diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index ab07c0a24a..4c5ad55547 100644 +index ab07c0a24a..80d131eae4 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -21,8 +21,14 @@ @@ -53021,7 +53078,7 @@ index ab07c0a24a..4c5ad55547 100644 #include "libavutil/pixfmt.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" -@@ -30,75 +36,274 @@ +@@ -30,75 +36,279 @@ #include "libavcodec/decode.h" #include "libavcodec/internal.h" @@ -53131,13 +53188,18 @@ index ab07c0a24a..4c5ad55547 100644 - if (ret) { - av_log(avctx, AV_LOG_WARNING, "VIDIOC_G_FMT ioctl\n"); - return ret; -+static int64_t pts_stats_guess(const pts_stats_t * const stats) ++static unsigned int pts_stats_interval(const pts_stats_t * const stats) ++{ ++ return stats->last_interval; ++} ++ ++static int64_t pts_stats_guess(const pts_stats_t * const stats, const int fail_bad_guess) +{ + if (stats->last_count <= 1) + return stats->last_pts; + if (stats->last_pts == AV_NOPTS_VALUE || -+ stats->last_interval == 0 || -+ stats->last_count >= STATS_LAST_COUNT_MAX) ++ fail_bad_guess && (stats->last_interval == 0 || ++ stats->last_count >= STATS_LAST_COUNT_MAX)) + return AV_NOPTS_VALUE; + return stats->last_pts + (int64_t)(stats->last_count - 1) * (int64_t)stats->last_interval; +} @@ -53344,7 +53406,7 @@ index ab07c0a24a..4c5ad55547 100644 return 0; } -@@ -133,58 +338,742 @@ static int v4l2_prepare_decoder(V4L2m2mContext *s) +@@ -133,58 +343,768 @@ static int v4l2_prepare_decoder(V4L2m2mContext *s) return 0; } @@ -53361,7 +53423,7 @@ index ab07c0a24a..4c5ad55547 100644 + frame->pkt_pts = frame->pts; +FF_ENABLE_DEPRECATION_WARNINGS +#endif -+ frame->best_effort_timestamp = pts_stats_guess(ps); ++ frame->best_effort_timestamp = pts_stats_guess(ps, 1); + // If we can't guess from just PTS - try DTS + if (frame->best_effort_timestamp == AV_NOPTS_VALUE) + frame->best_effort_timestamp = frame->pkt_dts; @@ -53396,15 +53458,25 @@ index ab07c0a24a..4c5ad55547 100644 +} + +static int -+xlat_pending(const xlat_track_t * const x) ++xlat_pending(const V4L2m2mContext * const s) +{ ++ const xlat_track_t *const x = &s->xlat; + unsigned int n = x->track_no % FF_V4L2_M2M_TRACK_SIZE; + int i; -+ const int64_t now = x->last_pts; ++ const int64_t now = pts_stats_guess(&s->pts_stat, 0); ++ int64_t first_dts = AV_NOPTS_VALUE; ++ int no_dts_count = 0; ++ unsigned int interval = pts_stats_interval(&s->pts_stat); + + for (i = 0; i < FF_V4L2_M2M_TRACK_SIZE; ++i, n = (n - 1) & (FF_V4L2_M2M_TRACK_SIZE - 1)) { + const V4L2m2mTrackEl * const t = x->track_els + n; + ++ if (first_dts == AV_NOPTS_VALUE) ++ if (t->dts == AV_NOPTS_VALUE) ++ ++no_dts_count; ++ else ++ first_dts = t->dts; ++ + // Discard only set on never-set or flushed entries + // So if we get here we've never successfully decoded a frame so allow + // more frames into the buffer before stalling @@ -53424,6 +53496,18 @@ index ab07c0a24a..4c5ad55547 100644 + break; + } + ++ if (first_dts != AV_NOPTS_VALUE && now != AV_NOPTS_VALUE && interval != 0 && s->reorder_size != 0) { ++ const int iframes = (first_dts - now) / (int)interval; ++ const int t = iframes - s->reorder_size + no_dts_count; ++ ++// av_log(s->avctx, AV_LOG_DEBUG, "Last:%"PRId64", Now:%"PRId64", First:%"PRId64", delta=%"PRId64", frames=%d, nodts=%d\n", ++// x->last_dts, now, first_dts, first_dts - now, iframes, no_dts_count); ++ ++ if (iframes > 0 && iframes < 64 && t < i) { ++ return t; ++ } ++ } ++ + return i; +} + @@ -53627,12 +53711,12 @@ index ab07c0a24a..4c5ad55547 100644 +static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + V4L2m2mContext *const s = ((V4L2m2mPriv*)avctx->priv_data)->context; -+ int src_rv = NQ_OK; ++ int src_rv = -1; + int dst_rv = 1; // Non-zero (done), non-negative (error) number + unsigned int i = 0; + + do { -+ const int pending = xlat_pending(&s->xlat); ++ const int pending = xlat_pending(s); + const int prefer_dq = (pending > 4); + const int last_src_rv = src_rv; + @@ -53834,7 +53918,7 @@ index ab07c0a24a..4c5ad55547 100644 + + // An unset profile is almost certainly zero or -99 - do not reject + if (avctx->profile <= 0) { -+ av_log(avctx, AV_LOG_VERBOSE, "Profile <= 0 - check skipped\n"); ++ av_log(avctx, AV_LOG_VERBOSE, "Profile %d <= 0 - check skipped\n", avctx->profile); + return 0; + } + @@ -54008,8 +54092,10 @@ index ab07c0a24a..4c5ad55547 100644 +} + +static void -+parse_extradata(AVCodecContext *avctx) ++parse_extradata(AVCodecContext * const avctx, V4L2m2mContext * const s) +{ ++ s->reorder_size = 0; ++ + if (!avctx->extradata || !avctx->extradata_size) + return; + @@ -54038,6 +54124,7 @@ index ab07c0a24a..4c5ad55547 100644 + avctx->profile = ff_h264_get_profile(sps); + avctx->level = sps->level_idc; + } ++ s->reorder_size = sps->num_reorder_frames; + } + ff_h264_ps_uninit(&ps); + break; @@ -54067,6 +54154,7 @@ index ab07c0a24a..4c5ad55547 100644 + if (sps) { + avctx->profile = sps->ptl.general_ptl.profile_idc; + avctx->level = sps->ptl.general_ptl.level_idc; ++ s->reorder_size = sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering; + } + } + ff_hevc_ps_uninit(&ps); @@ -54098,20 +54186,20 @@ index ab07c0a24a..4c5ad55547 100644 + } + avctx->ticks_per_frame = 2; + } -+ -+ parse_extradata(avctx); + ret = ff_v4l2_m2m_create_context(priv, &s); if (ret < 0) return ret; ++ parse_extradata(avctx, s); ++ + xlat_init(&s->xlat); + pts_stats_init(&s->pts_stat, avctx, "decoder"); + capture = &s->capture; output = &s->output; -@@ -192,14 +1081,65 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) +@@ -192,14 +1112,65 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) * by the v4l2 driver; this event will trigger a full pipeline reconfig and * the proper values will be retrieved from the kernel driver. */ @@ -54179,7 +54267,7 @@ index ab07c0a24a..4c5ad55547 100644 s->avctx = avctx; ret = ff_v4l2_m2m_codec_init(priv); -@@ -208,12 +1148,88 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) +@@ -208,12 +1179,88 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) return ret; } @@ -54270,7 +54358,7 @@ index ab07c0a24a..4c5ad55547 100644 } #define OFFSET(x) offsetof(V4L2m2mPriv, x) -@@ -222,10 +1238,17 @@ static av_cold int v4l2_decode_close(AVCodecContext *avctx) +@@ -222,10 +1269,17 @@ static av_cold int v4l2_decode_close(AVCodecContext *avctx) static const AVOption options[] = { V4L_M2M_DEFAULT_OPTS, { "num_capture_buffers", "Number of buffers in the capture context", @@ -54289,7 +54377,7 @@ index ab07c0a24a..4c5ad55547 100644 #define M2MDEC_CLASS(NAME) \ static const AVClass v4l2_m2m_ ## NAME ## _dec_class = { \ .class_name = #NAME "_v4l2m2m_decoder", \ -@@ -246,9 +1269,15 @@ static const AVOption options[] = { +@@ -246,9 +1300,15 @@ static const AVOption options[] = { .init = v4l2_decode_init, \ .receive_frame = v4l2_receive_frame, \ .close = v4l2_decode_close, \ @@ -62608,6 +62696,108 @@ index da1cf9941e..c588ed23cb 100644 frame->format, frame->pts); break; case AVMEDIA_TYPE_AUDIO: +diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c +index b6aed7a450..92e26d54bc 100644 +--- a/libavfilter/vf_bwdif.c ++++ b/libavfilter/vf_bwdif.c +@@ -75,10 +75,10 @@ typedef struct ThreadData { + int temporal_diff1 =(FFABS(prev[mrefs] - c) + FFABS(prev[prefs] - e)) >> 1; \ + int temporal_diff2 =(FFABS(next[mrefs] - c) + FFABS(next[prefs] - e)) >> 1; \ + int diff = FFMAX3(temporal_diff0 >> 1, temporal_diff1, temporal_diff2); \ +- \ ++ {/*\ + if (!diff) { \ + dst[0] = d; \ +- } else { ++ } else {*/ + + #define SPAT_CHECK() \ + int b = ((prev2[mrefs2] + next2[mrefs2]) >> 1) - c; \ +@@ -90,15 +90,16 @@ typedef struct ThreadData { + diff = FFMAX3(diff, min, -max); + + #define FILTER_LINE() \ ++ int i1, i2; \ + SPAT_CHECK() \ +- if (FFABS(c - e) > temporal_diff0) { \ +- interpol = (((coef_hf[0] * (prev2[0] + next2[0]) \ ++ /*if (FFABS(c - e) > temporal_diff0)*/ { \ ++ i1 = (((coef_hf[0] * (prev2[0] + next2[0]) \ + - coef_hf[1] * (prev2[mrefs2] + next2[mrefs2] + prev2[prefs2] + next2[prefs2]) \ + + coef_hf[2] * (prev2[mrefs4] + next2[mrefs4] + prev2[prefs4] + next2[prefs4])) >> 2) \ + + coef_lf[0] * (c + e) - coef_lf[1] * (cur[mrefs3] + cur[prefs3])) >> 13; \ +- } else { \ +- interpol = (coef_sp[0] * (c + e) - coef_sp[1] * (cur[mrefs3] + cur[prefs3])) >> 13; \ +- } ++ } /*else*/ { \ ++ i2 = (coef_sp[0] * (c + e) - coef_sp[1] * (cur[mrefs3] + cur[prefs3])) >> 13; \ ++ }interpol = FFABS(c - e) > temporal_diff0 ? i1:i2;\ + + #define FILTER_EDGE() \ + if (spat) { \ +@@ -112,7 +113,7 @@ typedef struct ThreadData { + else if (interpol < d - diff) \ + interpol = d - diff; \ + \ +- dst[0] = av_clip(interpol, 0, clip_max); \ ++ dst[0] = !diff ? d : av_clip(interpol, 0, clip_max); \ + } \ + \ + dst++; \ +@@ -123,7 +124,7 @@ typedef struct ThreadData { + next2++; \ + } + +-static void filter_intra(void *dst1, void *cur1, int w, int prefs, int mrefs, ++static void __attribute__((optimize("tree-vectorize"))) filter_intra(void *restrict dst1, void *restrict cur1, int w, int prefs, int mrefs, + int prefs3, int mrefs3, int parity, int clip_max) + { + uint8_t *dst = dst1; +@@ -133,7 +134,7 @@ static void filter_intra(void *dst1, void *cur1, int w, int prefs, int mrefs, + FILTER_INTRA() + } + +-static void filter_line_c(void *dst1, void *prev1, void *cur1, void *next1, ++static void __attribute__((optimize("tree-vectorize"))) filter_line_c(void *restrict dst1, void *restrict prev1, void *restrict cur1, void *restrict next1, + int w, int prefs, int mrefs, int prefs2, int mrefs2, + int prefs3, int mrefs3, int prefs4, int mrefs4, + int parity, int clip_max) +@@ -151,7 +152,7 @@ static void filter_line_c(void *dst1, void *prev1, void *cur1, void *next1, + FILTER2() + } + +-static void filter_edge(void *dst1, void *prev1, void *cur1, void *next1, ++static void __attribute__((optimize("tree-vectorize"))) filter_edge(void *restrict dst1, void *restrict prev1, void *restrict cur1, void *restrict next1, + int w, int prefs, int mrefs, int prefs2, int mrefs2, + int parity, int clip_max, int spat) + { +@@ -168,7 +169,7 @@ static void filter_edge(void *dst1, void *prev1, void *cur1, void *next1, + FILTER2() + } + +-static void filter_intra_16bit(void *dst1, void *cur1, int w, int prefs, int mrefs, ++static void __attribute__((optimize("tree-vectorize"))) filter_intra_16bit(void *restrict dst1, void *restrict cur1, int w, int prefs, int mrefs, + int prefs3, int mrefs3, int parity, int clip_max) + { + uint16_t *dst = dst1; +@@ -178,7 +179,7 @@ static void filter_intra_16bit(void *dst1, void *cur1, int w, int prefs, int mre + FILTER_INTRA() + } + +-static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1, ++static void __attribute__((optimize("tree-vectorize"))) filter_line_c_16bit(void *restrict dst1, void *restrict prev1, void *restrict cur1, void *restrict next1, + int w, int prefs, int mrefs, int prefs2, int mrefs2, + int prefs3, int mrefs3, int prefs4, int mrefs4, + int parity, int clip_max) +@@ -196,7 +197,7 @@ static void filter_line_c_16bit(void *dst1, void *prev1, void *cur1, void *next1 + FILTER2() + } + +-static void filter_edge_16bit(void *dst1, void *prev1, void *cur1, void *next1, ++static void __attribute__((optimize("tree-vectorize"))) filter_edge_16bit(void *restrict dst1, void *restrict prev1, void *restrict cur1, void *restrict next1, + int w, int prefs, int mrefs, int prefs2, int mrefs2, + int parity, int clip_max, int spat) + { diff --git a/libavfilter/vf_deinterlace_v4l2m2m.c b/libavfilter/vf_deinterlace_v4l2m2m.c new file mode 100644 index 0000000000..d4c11cfc51 @@ -65055,6 +65245,44 @@ index 2cd5773dc5..0cbbc094de 100644 trk->par->codec_id == AV_CODEC_ID_FLAC) { buffer_size_t side_size; uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); +diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c +index 38e4c65c4e..5e04c1df08 100644 +--- a/libavformat/rtpenc.c ++++ b/libavformat/rtpenc.c +@@ -19,6 +19,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include "avc.h" + #include "avformat.h" + #include "mpegts.h" + #include "internal.h" +@@ -582,8 +583,25 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) + ff_rtp_send_vc2hq(s1, pkt->data, size, st->codecpar->field_order != AV_FIELD_PROGRESSIVE ? 1 : 0); + break; + case AV_CODEC_ID_H264: ++ { ++ uint8_t *side_data; ++ int side_data_size = 0; ++ ++ side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, ++ &side_data_size); ++ ++ if (side_data_size != 0) { ++ int ps_size = side_data_size; ++ uint8_t * ps_buf = NULL; ++ ++ ff_avc_write_annexb_extradata(side_data, &ps_buf, &ps_size); ++ av_log(s1, AV_LOG_TRACE, "H264: write side data=%d\n", ps_size); ++ ff_rtp_send_h264_hevc(s1, ps_buf ? ps_buf : side_data, ps_size); ++ av_free(ps_buf); ++ } + ff_rtp_send_h264_hevc(s1, pkt->data, size); + break; ++ } + case AV_CODEC_ID_H261: + ff_rtp_send_h261(s1, pkt->data, size); + break; diff --git a/libavformat/utils.c b/libavformat/utils.c index 75e5350a27..e10b493dae 100644 --- a/libavformat/utils.c @@ -68300,12 +68528,1121 @@ index 0000000000..462ccb8abd + +#endif + +diff --git a/libswscale/aarch64/rgb2rgb.c b/libswscale/aarch64/rgb2rgb.c +index a9bf6ff9e0..6a0e2dcc09 100644 +--- a/libswscale/aarch64/rgb2rgb.c ++++ b/libswscale/aarch64/rgb2rgb.c +@@ -30,6 +30,12 @@ + void ff_interleave_bytes_neon(const uint8_t *src1, const uint8_t *src2, + uint8_t *dest, int width, int height, + int src1Stride, int src2Stride, int dstStride); ++void ff_bgr24toyv12_aarch64(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv); ++void ff_rgb24toyv12_aarch64(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv); + + av_cold void rgb2rgb_init_aarch64(void) + { +@@ -37,5 +43,7 @@ av_cold void rgb2rgb_init_aarch64(void) + + if (have_neon(cpu_flags)) { + interleaveBytes = ff_interleave_bytes_neon; ++ ff_rgb24toyv12 = ff_rgb24toyv12_aarch64; ++ ff_bgr24toyv12 = ff_bgr24toyv12_aarch64; + } + } +diff --git a/libswscale/aarch64/rgb2rgb_neon.S b/libswscale/aarch64/rgb2rgb_neon.S +index d81110ec57..476ca723a0 100644 +--- a/libswscale/aarch64/rgb2rgb_neon.S ++++ b/libswscale/aarch64/rgb2rgb_neon.S +@@ -77,3 +77,448 @@ function ff_interleave_bytes_neon, export=1 + 0: + ret + endfunc ++ ++// void ff_rgb24toyv12_aarch64( ++// const uint8_t *src, // x0 ++// uint8_t *ydst, // x1 ++// uint8_t *udst, // x2 ++// uint8_t *vdst, // x3 ++// int width, // w4 ++// int height, // w5 ++// int lumStride, // w6 ++// int chromStride, // w7 ++// int srcStr, // [sp, #0] ++// int32_t *rgb2yuv); // [sp, #8] ++ ++function ff_rgb24toyv12_aarch64, export=1 ++ ldr x15, [sp, #8] ++ ld1 {v3.s}[2], [x15], #4 ++ ld1 {v3.s}[1], [x15], #4 ++ ld1 {v3.s}[0], [x15], #4 ++ ld1 {v4.s}[2], [x15], #4 ++ ld1 {v4.s}[1], [x15], #4 ++ ld1 {v4.s}[0], [x15], #4 ++ ld1 {v5.s}[2], [x15], #4 ++ ld1 {v5.s}[1], [x15], #4 ++ ld1 {v5.s}[0], [x15] ++ b 99f ++endfunc ++ ++// void ff_bgr24toyv12_aarch64( ++// const uint8_t *src, // x0 ++// uint8_t *ydst, // x1 ++// uint8_t *udst, // x2 ++// uint8_t *vdst, // x3 ++// int width, // w4 ++// int height, // w5 ++// int lumStride, // w6 ++// int chromStride, // w7 ++// int srcStr, // [sp, #0] ++// int32_t *rgb2yuv); // [sp, #8] ++ ++// regs ++// v0-2 Src bytes - reused as chroma src ++// v3-5 Coeffs (packed very inefficiently - could be squashed) ++// v6 128b ++// v7 128h ++// v8-15 Reserved ++// v16-18 Lo Src expanded as H ++// v19 - ++// v20-22 Hi Src expanded as H ++// v23 - ++// v24 U out ++// v25 U tmp ++// v26 Y out ++// v27-29 Y tmp ++// v30 V out ++// v31 V tmp ++ ++// Assumes Little Endian in tail stores & conversion matrix ++ ++function ff_bgr24toyv12_aarch64, export=1 ++ ldr x15, [sp, #8] ++ ld3 {v3.s, v4.s, v5.s}[0], [x15], #12 ++ ld3 {v3.s, v4.s, v5.s}[1], [x15], #12 ++ ld3 {v3.s, v4.s, v5.s}[2], [x15] ++99: ++ ldr w14, [sp, #0] ++ movi v7.8b, #128 ++ uxtl v6.8h, v7.8b ++ // Ensure if nothing to do then we do nothing ++ cmp w4, #0 ++ b.le 90f ++ cmp w5, #0 ++ b.le 90f ++ // If w % 16 != 0 then -16 so we do main loop 1 fewer times with ++ // the remainder done in the tail ++ tst w4, #15 ++ b.eq 1f ++ sub w4, w4, #16 ++1: ++ ++// -------------------- Even line body - YUV ++11: ++ subs w9, w4, #0 ++ mov x10, x0 ++ mov x11, x1 ++ mov x12, x2 ++ mov x13, x3 ++ b.lt 12f ++ ++ ld3 {v0.16b, v1.16b, v2.16b}, [x10], #48 ++ subs w9, w9, #16 ++ b.le 13f ++ ++10: ++ uxtl v16.8h, v0.8b ++ uxtl v17.8h, v1.8b ++ uxtl v18.8h, v2.8b ++ ++ uxtl2 v20.8h, v0.16b ++ uxtl2 v21.8h, v1.16b ++ uxtl2 v22.8h, v2.16b ++ ++ bic v0.8h, #0xff, LSL #8 ++ bic v1.8h, #0xff, LSL #8 ++ bic v2.8h, #0xff, LSL #8 ++ ++ // Testing shows it is faster to stack the smull/smlal ops together ++ // rather than interleave them between channels and indeed even the ++ // shift/add sections seem happier not interleaved ++ ++ // Y0 ++ smull v26.4s, v16.4h, v3.h[0] ++ smlal v26.4s, v17.4h, v4.h[0] ++ smlal v26.4s, v18.4h, v5.h[0] ++ smull2 v27.4s, v16.8h, v3.h[0] ++ smlal2 v27.4s, v17.8h, v4.h[0] ++ smlal2 v27.4s, v18.8h, v5.h[0] ++ // Y1 ++ smull v28.4s, v20.4h, v3.h[0] ++ smlal v28.4s, v21.4h, v4.h[0] ++ smlal v28.4s, v22.4h, v5.h[0] ++ smull2 v29.4s, v20.8h, v3.h[0] ++ smlal2 v29.4s, v21.8h, v4.h[0] ++ smlal2 v29.4s, v22.8h, v5.h[0] ++ shrn v26.4h, v26.4s, #12 ++ shrn2 v26.8h, v27.4s, #12 ++ add v26.8h, v26.8h, v6.8h // +128 (>> 3 = 16) ++ sqrshrun v26.8b, v26.8h, #3 ++ shrn v28.4h, v28.4s, #12 ++ shrn2 v28.8h, v29.4s, #12 ++ add v28.8h, v28.8h, v6.8h ++ sqrshrun2 v26.16b, v28.8h, #3 ++ // Y0/Y1 ++ ++ // U ++ // Vector subscript *2 as we loaded into S but are only using H ++ smull v24.4s, v0.4h, v3.h[2] ++ smlal v24.4s, v1.4h, v4.h[2] ++ smlal v24.4s, v2.4h, v5.h[2] ++ smull2 v25.4s, v0.8h, v3.h[2] ++ smlal2 v25.4s, v1.8h, v4.h[2] ++ smlal2 v25.4s, v2.8h, v5.h[2] ++ ++ // V ++ smull v30.4s, v0.4h, v3.h[4] ++ smlal v30.4s, v1.4h, v4.h[4] ++ smlal v30.4s, v2.4h, v5.h[4] ++ smull2 v31.4s, v0.8h, v3.h[4] ++ smlal2 v31.4s, v1.8h, v4.h[4] ++ smlal2 v31.4s, v2.8h, v5.h[4] ++ ++ ld3 {v0.16b, v1.16b, v2.16b}, [x10], #48 ++ ++ shrn v24.4h, v24.4s, #14 ++ shrn2 v24.8h, v25.4s, #14 ++ sqrshrn v24.8b, v24.8h, #1 ++ add v24.8b, v24.8b, v7.8b // +128 ++ shrn v30.4h, v30.4s, #14 ++ shrn2 v30.8h, v31.4s, #14 ++ sqrshrn v30.8b, v30.8h, #1 ++ add v30.8b, v30.8b, v7.8b // +128 ++ ++ subs w9, w9, #16 ++ ++ st1 {v26.16b}, [x11], #16 ++ st1 {v24.8b}, [x12], #8 ++ st1 {v30.8b}, [x13], #8 ++ ++ b.gt 10b ++ ++// -------------------- Even line tail - YUV ++// If width % 16 == 0 then simply runs once with preloaded RGB ++// If other then deals with preload & then does remaining tail ++ ++13: ++ // Body is simple copy of main loop body minus preload ++ ++ uxtl v16.8h, v0.8b ++ uxtl v17.8h, v1.8b ++ uxtl v18.8h, v2.8b ++ ++ uxtl2 v20.8h, v0.16b ++ uxtl2 v21.8h, v1.16b ++ uxtl2 v22.8h, v2.16b ++ ++ bic v0.8h, #0xff, LSL #8 ++ bic v1.8h, #0xff, LSL #8 ++ bic v2.8h, #0xff, LSL #8 ++ ++ // Y0 ++ smull v26.4s, v16.4h, v3.h[0] ++ smlal v26.4s, v17.4h, v4.h[0] ++ smlal v26.4s, v18.4h, v5.h[0] ++ smull2 v27.4s, v16.8h, v3.h[0] ++ smlal2 v27.4s, v17.8h, v4.h[0] ++ smlal2 v27.4s, v18.8h, v5.h[0] ++ // Y1 ++ smull v28.4s, v20.4h, v3.h[0] ++ smlal v28.4s, v21.4h, v4.h[0] ++ smlal v28.4s, v22.4h, v5.h[0] ++ smull2 v29.4s, v20.8h, v3.h[0] ++ smlal2 v29.4s, v21.8h, v4.h[0] ++ smlal2 v29.4s, v22.8h, v5.h[0] ++ shrn v26.4h, v26.4s, #12 ++ shrn2 v26.8h, v27.4s, #12 ++ add v26.8h, v26.8h, v6.8h // +128 (>> 3 = 16) ++ sqrshrun v26.8b, v26.8h, #3 ++ shrn v28.4h, v28.4s, #12 ++ shrn2 v28.8h, v29.4s, #12 ++ add v28.8h, v28.8h, v6.8h ++ sqrshrun2 v26.16b, v28.8h, #3 ++ // Y0/Y1 ++ ++ // U ++ // Vector subscript *2 as we loaded into S but are only using H ++ smull v24.4s, v0.4h, v3.h[2] ++ smlal v24.4s, v1.4h, v4.h[2] ++ smlal v24.4s, v2.4h, v5.h[2] ++ smull2 v25.4s, v0.8h, v3.h[2] ++ smlal2 v25.4s, v1.8h, v4.h[2] ++ smlal2 v25.4s, v2.8h, v5.h[2] ++ ++ // V ++ smull v30.4s, v0.4h, v3.h[4] ++ smlal v30.4s, v1.4h, v4.h[4] ++ smlal v30.4s, v2.4h, v5.h[4] ++ smull2 v31.4s, v0.8h, v3.h[4] ++ smlal2 v31.4s, v1.8h, v4.h[4] ++ smlal2 v31.4s, v2.8h, v5.h[4] ++ ++ cmp w9, #-16 ++ ++ shrn v24.4h, v24.4s, #14 ++ shrn2 v24.8h, v25.4s, #14 ++ sqrshrn v24.8b, v24.8h, #1 ++ add v24.8b, v24.8b, v7.8b // +128 ++ shrn v30.4h, v30.4s, #14 ++ shrn2 v30.8h, v31.4s, #14 ++ sqrshrn v30.8b, v30.8h, #1 ++ add v30.8b, v30.8b, v7.8b // +128 ++ ++ // Here: ++ // w9 == 0 width % 16 == 0, tail done ++ // w9 > -16 1st tail done (16 pels), remainder still to go ++ // w9 == -16 shouldn't happen ++ // w9 > -32 2nd tail done ++ // w9 <= -32 shouldn't happen ++ ++ b.lt 2f ++ st1 {v26.16b}, [x11], #16 ++ st1 {v24.8b}, [x12], #8 ++ st1 {v30.8b}, [x13], #8 ++ cbz w9, 3f ++ ++12: ++ sub w9, w9, #16 ++ ++ tbz w9, #3, 1f ++ ld3 {v0.8b, v1.8b, v2.8b}, [x10], #24 ++1: tbz w9, #2, 1f ++ ld3 {v0.b, v1.b, v2.b}[8], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[9], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[10], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[11], [x10], #3 ++1: tbz w9, #1, 1f ++ ld3 {v0.b, v1.b, v2.b}[12], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[13], [x10], #3 ++1: tbz w9, #0, 13b ++ ld3 {v0.b, v1.b, v2.b}[14], [x10], #3 ++ b 13b ++ ++2: ++ tbz w9, #3, 1f ++ st1 {v26.8b}, [x11], #8 ++ st1 {v24.s}[0], [x12], #4 ++ st1 {v30.s}[0], [x13], #4 ++1: tbz w9, #2, 1f ++ st1 {v26.s}[2], [x11], #4 ++ st1 {v24.h}[2], [x12], #2 ++ st1 {v30.h}[2], [x13], #2 ++1: tbz w9, #1, 1f ++ st1 {v26.h}[6], [x11], #2 ++ st1 {v24.b}[6], [x12], #1 ++ st1 {v30.b}[6], [x13], #1 ++1: tbz w9, #0, 1f ++ st1 {v26.b}[14], [x11] ++ st1 {v24.b}[7], [x12] ++ st1 {v30.b}[7], [x13] ++1: ++3: ++ ++// -------------------- Odd line body - Y only ++ ++ subs w5, w5, #1 ++ b.eq 90f ++ ++ subs w9, w4, #0 ++ add x0, x0, w14, SXTX ++ add x1, x1, w6, SXTX ++ mov x10, x0 ++ mov x11, x1 ++ b.lt 12f ++ ++ ld3 {v0.16b, v1.16b, v2.16b}, [x10], #48 ++ subs w9, w9, #16 ++ b.le 13f ++ ++10: ++ uxtl v16.8h, v0.8b ++ uxtl v17.8h, v1.8b ++ uxtl v18.8h, v2.8b ++ ++ uxtl2 v20.8h, v0.16b ++ uxtl2 v21.8h, v1.16b ++ uxtl2 v22.8h, v2.16b ++ ++ // Testing shows it is faster to stack the smull/smlal ops together ++ // rather than interleave them between channels and indeed even the ++ // shift/add sections seem happier not interleaved ++ ++ // Y0 ++ smull v26.4s, v16.4h, v3.h[0] ++ smlal v26.4s, v17.4h, v4.h[0] ++ smlal v26.4s, v18.4h, v5.h[0] ++ smull2 v27.4s, v16.8h, v3.h[0] ++ smlal2 v27.4s, v17.8h, v4.h[0] ++ smlal2 v27.4s, v18.8h, v5.h[0] ++ // Y1 ++ smull v28.4s, v20.4h, v3.h[0] ++ smlal v28.4s, v21.4h, v4.h[0] ++ smlal v28.4s, v22.4h, v5.h[0] ++ smull2 v29.4s, v20.8h, v3.h[0] ++ smlal2 v29.4s, v21.8h, v4.h[0] ++ smlal2 v29.4s, v22.8h, v5.h[0] ++ ++ ld3 {v0.16b, v1.16b, v2.16b}, [x10], #48 ++ ++ shrn v26.4h, v26.4s, #12 ++ shrn2 v26.8h, v27.4s, #12 ++ add v26.8h, v26.8h, v6.8h // +128 (>> 3 = 16) ++ sqrshrun v26.8b, v26.8h, #3 ++ shrn v28.4h, v28.4s, #12 ++ shrn2 v28.8h, v29.4s, #12 ++ add v28.8h, v28.8h, v6.8h ++ sqrshrun2 v26.16b, v28.8h, #3 ++ // Y0/Y1 ++ ++ subs w9, w9, #16 ++ ++ st1 {v26.16b}, [x11], #16 ++ ++ b.gt 10b ++ ++// -------------------- Odd line tail - Y ++// If width % 16 == 0 then simply runs once with preloaded RGB ++// If other then deals with preload & then does remaining tail ++ ++13: ++ // Body is simple copy of main loop body minus preload ++ ++ uxtl v16.8h, v0.8b ++ uxtl v17.8h, v1.8b ++ uxtl v18.8h, v2.8b ++ ++ uxtl2 v20.8h, v0.16b ++ uxtl2 v21.8h, v1.16b ++ uxtl2 v22.8h, v2.16b ++ ++ // Y0 ++ smull v26.4s, v16.4h, v3.h[0] ++ smlal v26.4s, v17.4h, v4.h[0] ++ smlal v26.4s, v18.4h, v5.h[0] ++ smull2 v27.4s, v16.8h, v3.h[0] ++ smlal2 v27.4s, v17.8h, v4.h[0] ++ smlal2 v27.4s, v18.8h, v5.h[0] ++ // Y1 ++ smull v28.4s, v20.4h, v3.h[0] ++ smlal v28.4s, v21.4h, v4.h[0] ++ smlal v28.4s, v22.4h, v5.h[0] ++ smull2 v29.4s, v20.8h, v3.h[0] ++ smlal2 v29.4s, v21.8h, v4.h[0] ++ smlal2 v29.4s, v22.8h, v5.h[0] ++ ++ cmp w9, #-16 ++ ++ shrn v26.4h, v26.4s, #12 ++ shrn2 v26.8h, v27.4s, #12 ++ add v26.8h, v26.8h, v6.8h // +128 (>> 3 = 16) ++ sqrshrun v26.8b, v26.8h, #3 ++ shrn v28.4h, v28.4s, #12 ++ shrn2 v28.8h, v29.4s, #12 ++ add v28.8h, v28.8h, v6.8h ++ sqrshrun2 v26.16b, v28.8h, #3 ++ // Y0/Y1 ++ ++ // Here: ++ // w9 == 0 width % 16 == 0, tail done ++ // w9 > -16 1st tail done (16 pels), remainder still to go ++ // w9 == -16 shouldn't happen ++ // w9 > -32 2nd tail done ++ // w9 <= -32 shouldn't happen ++ ++ b.lt 2f ++ st1 {v26.16b}, [x11], #16 ++ cbz w9, 3f ++ ++12: ++ sub w9, w9, #16 ++ ++ tbz w9, #3, 1f ++ ld3 {v0.8b, v1.8b, v2.8b}, [x10], #24 ++1: tbz w9, #2, 1f ++ ld3 {v0.b, v1.b, v2.b}[8], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[9], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[10], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[11], [x10], #3 ++1: tbz w9, #1, 1f ++ ld3 {v0.b, v1.b, v2.b}[12], [x10], #3 ++ ld3 {v0.b, v1.b, v2.b}[13], [x10], #3 ++1: tbz w9, #0, 13b ++ ld3 {v0.b, v1.b, v2.b}[14], [x10], #3 ++ b 13b ++ ++2: ++ tbz w9, #3, 1f ++ st1 {v26.8b}, [x11], #8 ++1: tbz w9, #2, 1f ++ st1 {v26.s}[2], [x11], #4 ++1: tbz w9, #1, 1f ++ st1 {v26.h}[6], [x11], #2 ++1: tbz w9, #0, 1f ++ st1 {v26.b}[14], [x11] ++1: ++3: ++ ++// ------------------- Loop to start ++ ++ add x0, x0, w14, SXTX ++ add x1, x1, w6, SXTX ++ add x2, x2, w7, SXTX ++ add x3, x3, w7, SXTX ++ subs w5, w5, #1 ++ b.gt 11b ++90: ++ ret ++endfunc +diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c +index a7300f3ba4..ba1db155b0 100644 +--- a/libswscale/rgb2rgb.c ++++ b/libswscale/rgb2rgb.c +@@ -83,6 +83,31 @@ void (*ff_rgb24toyv12)(const uint8_t *src, uint8_t *ydst, + int width, int height, + int lumStride, int chromStride, int srcStride, + int32_t *rgb2yuv); ++void (*ff_bgr24toyv12)(const uint8_t *src, uint8_t *ydst, ++ uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++void (*ff_rgbxtoyv12)(const uint8_t *src, uint8_t *ydst, ++ uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++void (*ff_bgrxtoyv12)(const uint8_t *src, uint8_t *ydst, ++ uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++void (*ff_xrgbtoyv12)(const uint8_t *src, uint8_t *ydst, ++ uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++void (*ff_xbgrtoyv12)(const uint8_t *src, uint8_t *ydst, ++ uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); + void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, + int srcStride, int dstStride); + void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst, +diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h +index 48bba1586a..6329533f18 100644 +--- a/libswscale/rgb2rgb.h ++++ b/libswscale/rgb2rgb.h +@@ -82,6 +82,9 @@ void rgb12to15(const uint8_t *src, uint8_t *dst, int src_size); + void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + uint8_t *vdst, int width, int height, int lumStride, + int chromStride, int srcStride, int32_t *rgb2yuv); ++void ff_bgr24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv); + + /** + * Height should be a multiple of 2 and width should be a multiple of 16. +@@ -131,6 +134,26 @@ extern void (*ff_rgb24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + int width, int height, + int lumStride, int chromStride, int srcStride, + int32_t *rgb2yuv); ++extern void (*ff_bgr24toyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++extern void (*ff_rgbxtoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++extern void (*ff_bgrxtoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++extern void (*ff_xrgbtoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); ++extern void (*ff_xbgrtoyv12)(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ++ int width, int height, ++ int lumStride, int chromStride, int srcStride, ++ int32_t *rgb2yuv); + extern void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, + int srcStride, int dstStride); + +diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c +index 42c69801ba..e711589e1e 100644 +--- a/libswscale/rgb2rgb_template.c ++++ b/libswscale/rgb2rgb_template.c +@@ -646,13 +646,14 @@ static inline void uyvytoyv12_c(const uint8_t *src, uint8_t *ydst, + * others are ignored in the C version. + * FIXME: Write HQ version. + */ +-void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++static void rgb24toyv12_x(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + uint8_t *vdst, int width, int height, int lumStride, +- int chromStride, int srcStride, int32_t *rgb2yuv) ++ int chromStride, int srcStride, int32_t *rgb2yuv, ++ const uint8_t x[9]) + { +- int32_t ry = rgb2yuv[RY_IDX], gy = rgb2yuv[GY_IDX], by = rgb2yuv[BY_IDX]; +- int32_t ru = rgb2yuv[RU_IDX], gu = rgb2yuv[GU_IDX], bu = rgb2yuv[BU_IDX]; +- int32_t rv = rgb2yuv[RV_IDX], gv = rgb2yuv[GV_IDX], bv = rgb2yuv[BV_IDX]; ++ int32_t ry = rgb2yuv[x[0]], gy = rgb2yuv[x[1]], by = rgb2yuv[x[2]]; ++ int32_t ru = rgb2yuv[x[3]], gu = rgb2yuv[x[4]], bu = rgb2yuv[x[5]]; ++ int32_t rv = rgb2yuv[x[6]], gv = rgb2yuv[x[7]], bv = rgb2yuv[x[8]]; + int y; + const int chromWidth = width >> 1; + +@@ -678,6 +679,19 @@ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; + ydst[2 * i + 1] = Y; + } ++ if ((width & 1) != 0) { ++ unsigned int b = src[6 * i + 0]; ++ unsigned int g = src[6 * i + 1]; ++ unsigned int r = src[6 * i + 2]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ unsigned int V = ((rv * r + gv * g + bv * b) >> RGB2YUV_SHIFT) + 128; ++ unsigned int U = ((ru * r + gu * g + bu * b) >> RGB2YUV_SHIFT) + 128; ++ ++ udst[i] = U; ++ vdst[i] = V; ++ ydst[2 * i] = Y; ++ } + ydst += lumStride; + src += srcStride; + +@@ -700,6 +714,125 @@ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; + ydst[2 * i + 1] = Y; + } ++ if ((width & 1) != 0) { ++ unsigned int b = src[6 * i + 0]; ++ unsigned int g = src[6 * i + 1]; ++ unsigned int r = src[6 * i + 2]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ ++ ydst[2 * i] = Y; ++ } ++ udst += chromStride; ++ vdst += chromStride; ++ ydst += lumStride; ++ src += srcStride; ++ } ++} ++ ++static const uint8_t x_rgb[9] = { ++ RY_IDX, GY_IDX, BY_IDX, ++ RU_IDX, GU_IDX, BU_IDX, ++ RV_IDX, GV_IDX, BV_IDX, ++}; ++ ++static const uint8_t x_bgr[9] = { ++ BY_IDX, GY_IDX, RY_IDX, ++ BU_IDX, GU_IDX, RU_IDX, ++ BV_IDX, GV_IDX, RV_IDX, ++}; ++ ++void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgb24toyv12_x(src, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_rgb); ++} ++ ++void ff_bgr24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgb24toyv12_x(src, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_bgr); ++} ++ ++static void rgbxtoyv12_x(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv, ++ const uint8_t x[9]) ++{ ++ int32_t ry = rgb2yuv[x[0]], gy = rgb2yuv[x[1]], by = rgb2yuv[x[2]]; ++ int32_t ru = rgb2yuv[x[3]], gu = rgb2yuv[x[4]], bu = rgb2yuv[x[5]]; ++ int32_t rv = rgb2yuv[x[6]], gv = rgb2yuv[x[7]], bv = rgb2yuv[x[8]]; ++ int y; ++ const int chromWidth = width >> 1; ++ ++ for (y = 0; y < height; y += 2) { ++ int i; ++ for (i = 0; i < chromWidth; i++) { ++ unsigned int b = src[8 * i + 2]; ++ unsigned int g = src[8 * i + 1]; ++ unsigned int r = src[8 * i + 0]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ unsigned int V = ((rv * r + gv * g + bv * b) >> RGB2YUV_SHIFT) + 128; ++ unsigned int U = ((ru * r + gu * g + bu * b) >> RGB2YUV_SHIFT) + 128; ++ ++ udst[i] = U; ++ vdst[i] = V; ++ ydst[2 * i] = Y; ++ ++ b = src[8 * i + 6]; ++ g = src[8 * i + 5]; ++ r = src[8 * i + 4]; ++ ++ Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ ydst[2 * i + 1] = Y; ++ } ++ if ((width & 1) != 0) { ++ unsigned int b = src[8 * i + 2]; ++ unsigned int g = src[8 * i + 1]; ++ unsigned int r = src[8 * i + 0]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ unsigned int V = ((rv * r + gv * g + bv * b) >> RGB2YUV_SHIFT) + 128; ++ unsigned int U = ((ru * r + gu * g + bu * b) >> RGB2YUV_SHIFT) + 128; ++ ++ udst[i] = U; ++ vdst[i] = V; ++ ydst[2 * i] = Y; ++ } ++ ydst += lumStride; ++ src += srcStride; ++ ++ if (y+1 == height) ++ break; ++ ++ for (i = 0; i < chromWidth; i++) { ++ unsigned int b = src[8 * i + 2]; ++ unsigned int g = src[8 * i + 1]; ++ unsigned int r = src[8 * i + 0]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ ++ ydst[2 * i] = Y; ++ ++ b = src[8 * i + 6]; ++ g = src[8 * i + 5]; ++ r = src[8 * i + 4]; ++ ++ Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ ydst[2 * i + 1] = Y; ++ } ++ if ((width & 1) != 0) { ++ unsigned int b = src[8 * i + 2]; ++ unsigned int g = src[8 * i + 1]; ++ unsigned int r = src[8 * i + 0]; ++ ++ unsigned int Y = ((ry * r + gy * g + by * b) >> RGB2YUV_SHIFT) + 16; ++ ++ ydst[2 * i] = Y; ++ } + udst += chromStride; + vdst += chromStride; + ydst += lumStride; +@@ -707,6 +840,37 @@ void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, + } + } + ++static void ff_rgbxtoyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgbxtoyv12_x(src, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_rgb); ++} ++ ++static void ff_bgrxtoyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgbxtoyv12_x(src, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_bgr); ++} ++ ++// As the general code does no SIMD-like ops simply adding 1 to the src address ++// will fix the ignored alpha position ++static void ff_xrgbtoyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgbxtoyv12_x(src + 1, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_rgb); ++} ++ ++static void ff_xbgrtoyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, ++ uint8_t *vdst, int width, int height, int lumStride, ++ int chromStride, int srcStride, int32_t *rgb2yuv) ++{ ++ rgbxtoyv12_x(src + 1, ydst, udst, vdst, width, height, lumStride, chromStride, srcStride, rgb2yuv, x_bgr); ++} ++ ++ + static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2, + uint8_t *dest, int width, int height, + int src1Stride, int src2Stride, int dstStride) +@@ -980,6 +1144,11 @@ static av_cold void rgb2rgb_init_c(void) + yuy2toyv12 = yuy2toyv12_c; + planar2x = planar2x_c; + ff_rgb24toyv12 = ff_rgb24toyv12_c; ++ ff_bgr24toyv12 = ff_bgr24toyv12_c; ++ ff_rgbxtoyv12 = ff_rgbxtoyv12_c; ++ ff_bgrxtoyv12 = ff_bgrxtoyv12_c; ++ ff_xrgbtoyv12 = ff_xrgbtoyv12_c; ++ ff_xbgrtoyv12 = ff_xbgrtoyv12_c; + interleaveBytes = interleaveBytes_c; + deinterleaveBytes = deinterleaveBytes_c; + vu9_to_vu12 = vu9_to_vu12_c; +diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c +index c4dd8a4d83..da38d7f8ac 100644 +--- a/libswscale/swscale_unscaled.c ++++ b/libswscale/swscale_unscaled.c +@@ -1655,6 +1655,91 @@ static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[], + return srcSliceH; + } + ++static int rgb24ToYv12Wrapper(SwsContext *c, const uint8_t *src[], ++ int srcStride[], int srcSliceY, int srcSliceH, ++ uint8_t *dst[], int dstStride[]) ++{ ++ ff_bgr24toyv12( ++ src[0], ++ dst[0] + srcSliceY * dstStride[0], ++ dst[1] + (srcSliceY >> 1) * dstStride[1], ++ dst[2] + (srcSliceY >> 1) * dstStride[2], ++ c->srcW, srcSliceH, ++ dstStride[0], dstStride[1], srcStride[0], ++ c->input_rgb2yuv_table); ++ if (dst[3]) ++ fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); ++ return srcSliceH; ++} ++ ++static int bgrxToYv12Wrapper(SwsContext *c, const uint8_t *src[], ++ int srcStride[], int srcSliceY, int srcSliceH, ++ uint8_t *dst[], int dstStride[]) ++{ ++ ff_bgrxtoyv12( ++ src[0], ++ dst[0] + srcSliceY * dstStride[0], ++ dst[1] + (srcSliceY >> 1) * dstStride[1], ++ dst[2] + (srcSliceY >> 1) * dstStride[2], ++ c->srcW, srcSliceH, ++ dstStride[0], dstStride[1], srcStride[0], ++ c->input_rgb2yuv_table); ++ if (dst[3]) ++ fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); ++ return srcSliceH; ++} ++ ++static int rgbxToYv12Wrapper(SwsContext *c, const uint8_t *src[], ++ int srcStride[], int srcSliceY, int srcSliceH, ++ uint8_t *dst[], int dstStride[]) ++{ ++ ff_rgbxtoyv12( ++ src[0], ++ dst[0] + srcSliceY * dstStride[0], ++ dst[1] + (srcSliceY >> 1) * dstStride[1], ++ dst[2] + (srcSliceY >> 1) * dstStride[2], ++ c->srcW, srcSliceH, ++ dstStride[0], dstStride[1], srcStride[0], ++ c->input_rgb2yuv_table); ++ if (dst[3]) ++ fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); ++ return srcSliceH; ++} ++ ++static int xbgrToYv12Wrapper(SwsContext *c, const uint8_t *src[], ++ int srcStride[], int srcSliceY, int srcSliceH, ++ uint8_t *dst[], int dstStride[]) ++{ ++ ff_xbgrtoyv12( ++ src[0], ++ dst[0] + srcSliceY * dstStride[0], ++ dst[1] + (srcSliceY >> 1) * dstStride[1], ++ dst[2] + (srcSliceY >> 1) * dstStride[2], ++ c->srcW, srcSliceH, ++ dstStride[0], dstStride[1], srcStride[0], ++ c->input_rgb2yuv_table); ++ if (dst[3]) ++ fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); ++ return srcSliceH; ++} ++ ++static int xrgbToYv12Wrapper(SwsContext *c, const uint8_t *src[], ++ int srcStride[], int srcSliceY, int srcSliceH, ++ uint8_t *dst[], int dstStride[]) ++{ ++ ff_xrgbtoyv12( ++ src[0], ++ dst[0] + srcSliceY * dstStride[0], ++ dst[1] + (srcSliceY >> 1) * dstStride[1], ++ dst[2] + (srcSliceY >> 1) * dstStride[2], ++ c->srcW, srcSliceH, ++ dstStride[0], dstStride[1], srcStride[0], ++ c->input_rgb2yuv_table); ++ if (dst[3]) ++ fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255); ++ return srcSliceH; ++} ++ + static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[], + int srcStride[], int srcSliceY, int srcSliceH, + uint8_t *dst[], int dstStride[]) +@@ -2035,6 +2120,32 @@ void ff_get_unscaled_swscale(SwsContext *c) + (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && + !(flags & SWS_ACCURATE_RND)) + c->swscale = bgr24ToYv12Wrapper; ++ /* rgb24toYV12 */ ++ if (srcFormat == AV_PIX_FMT_RGB24 && ++ (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && ++ !(flags & SWS_ACCURATE_RND)) ++ c->swscale = rgb24ToYv12Wrapper; ++ ++ /* bgrxtoYV12 */ ++ if (((srcFormat == AV_PIX_FMT_BGRA && dstFormat == AV_PIX_FMT_YUV420P) || ++ (srcFormat == AV_PIX_FMT_BGR0 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))) && ++ !(flags & SWS_ACCURATE_RND)) ++ c->swscale = bgrxToYv12Wrapper; ++ /* rgbx24toYV12 */ ++ if (((srcFormat == AV_PIX_FMT_RGBA && dstFormat == AV_PIX_FMT_YUV420P) || ++ (srcFormat == AV_PIX_FMT_RGB0 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))) && ++ !(flags & SWS_ACCURATE_RND)) ++ c->swscale = rgbxToYv12Wrapper; ++ /* xbgrtoYV12 */ ++ if (((srcFormat == AV_PIX_FMT_ABGR && dstFormat == AV_PIX_FMT_YUV420P) || ++ (srcFormat == AV_PIX_FMT_0BGR && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))) && ++ !(flags & SWS_ACCURATE_RND)) ++ c->swscale = xbgrToYv12Wrapper; ++ /* xrgb24toYV12 */ ++ if (((srcFormat == AV_PIX_FMT_ARGB && dstFormat == AV_PIX_FMT_YUV420P) || ++ (srcFormat == AV_PIX_FMT_0RGB && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P))) && ++ !(flags & SWS_ACCURATE_RND)) ++ c->swscale = xrgbToYv12Wrapper; + + /* RGB/BGR -> RGB/BGR (no dither needed forms) */ + if (isAnyRGB(srcFormat) && isAnyRGB(dstFormat) && findRgbConvFn(c) +diff --git a/libswscale/tests/swscale.c b/libswscale/tests/swscale.c +index 6c38041ddb..12776ffec7 100644 +--- a/libswscale/tests/swscale.c ++++ b/libswscale/tests/swscale.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #undef HAVE_AV_CONFIG_H + #include "libavutil/cpu.h" +@@ -78,6 +79,15 @@ struct Results { + uint32_t crc; + }; + ++static int time_rep = 0; ++ ++static uint64_t utime(void) ++{ ++ struct timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ return ts.tv_nsec / 1000 + (uint64_t)ts.tv_sec * 1000000; ++} ++ + // test by ref -> src -> dst -> out & compare out against ref + // ref & out are YV12 + static int doTest(const uint8_t * const ref[4], int refStride[4], int w, int h, +@@ -174,7 +184,7 @@ static int doTest(const uint8_t * const ref[4], int refStride[4], int w, int h, + goto end; + } + +- printf(" %s %dx%d -> %s %3dx%3d flags=%2d", ++ printf(" %s %4dx%4d -> %s %4dx%4d flags=%2d", + desc_src->name, srcW, srcH, + desc_dst->name, dstW, dstH, + flags); +@@ -182,6 +192,17 @@ static int doTest(const uint8_t * const ref[4], int refStride[4], int w, int h, + + sws_scale(dstContext, (const uint8_t * const*)src, srcStride, 0, srcH, dst, dstStride); + ++ if (time_rep != 0) ++ { ++ const uint64_t now = utime(); ++ uint64_t done; ++ for (i = 1; i != time_rep; ++i) { ++ sws_scale(dstContext, (const uint8_t * const*)src, srcStride, 0, srcH, dst, dstStride); ++ } ++ done = utime(); ++ printf(" T=%7"PRId64"us ", done-now); ++ } ++ + for (i = 0; i < 4 && dstStride[i]; i++) + crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), crc, dst[i], + dstStride[i] * dstH); +@@ -355,56 +376,78 @@ static int fileTest(const uint8_t * const ref[4], int refStride[4], + return 0; + } + +-#define W 96 +-#define H 96 +- + int main(int argc, char **argv) + { ++ unsigned int W = 96; ++ unsigned int H = 96; ++ unsigned int W2; ++ unsigned int H2; ++ unsigned int S; + enum AVPixelFormat srcFormat = AV_PIX_FMT_NONE; + enum AVPixelFormat dstFormat = AV_PIX_FMT_NONE; +- uint8_t *rgb_data = av_malloc(W * H * 4); +- const uint8_t * const rgb_src[4] = { rgb_data, NULL, NULL, NULL }; +- int rgb_stride[4] = { 4 * W, 0, 0, 0 }; +- uint8_t *data = av_malloc(4 * W * H); +- const uint8_t * const src[4] = { data, data + W * H, data + W * H * 2, data + W * H * 3 }; +- int stride[4] = { W, W, W, W }; + int x, y; + struct SwsContext *sws; + AVLFG rand; + int res = -1; + int i; + FILE *fp = NULL; +- +- if (!rgb_data || !data) +- return -1; ++ uint8_t *rgb_data; ++ uint8_t * rgb_src[4] = { NULL }; ++ int rgb_stride[4] = { 0 }; ++ uint8_t *data; ++ uint8_t * src[4] = { NULL }; ++ int stride[4] = { 0 }; + + for (i = 1; i < argc; i += 2) { ++ const char * const arg2 = argv[i+1]; ++ + if (argv[i][0] != '-' || i + 1 == argc) + goto bad_option; + if (!strcmp(argv[i], "-ref")) { +- fp = fopen(argv[i + 1], "r"); ++ fp = fopen(arg2, "r"); + if (!fp) { +- fprintf(stderr, "could not open '%s'\n", argv[i + 1]); ++ fprintf(stderr, "could not open '%s'\n", arg2); + goto error; + } + } else if (!strcmp(argv[i], "-cpuflags")) { + unsigned flags = av_get_cpu_flags(); +- int ret = av_parse_cpu_caps(&flags, argv[i + 1]); ++ int ret = av_parse_cpu_caps(&flags, arg2); + if (ret < 0) { +- fprintf(stderr, "invalid cpu flags %s\n", argv[i + 1]); ++ fprintf(stderr, "invalid cpu flags %s\n", arg2); + return ret; + } + av_force_cpu_flags(flags); + } else if (!strcmp(argv[i], "-src")) { +- srcFormat = av_get_pix_fmt(argv[i + 1]); ++ srcFormat = av_get_pix_fmt(arg2); + if (srcFormat == AV_PIX_FMT_NONE) { +- fprintf(stderr, "invalid pixel format %s\n", argv[i + 1]); ++ fprintf(stderr, "invalid pixel format %s\n", arg2); + return -1; + } + } else if (!strcmp(argv[i], "-dst")) { +- dstFormat = av_get_pix_fmt(argv[i + 1]); ++ dstFormat = av_get_pix_fmt(arg2); + if (dstFormat == AV_PIX_FMT_NONE) { +- fprintf(stderr, "invalid pixel format %s\n", argv[i + 1]); ++ fprintf(stderr, "invalid pixel format %s\n", arg2); ++ return -1; ++ } ++ } else if (!strcmp(argv[i], "-w")) { ++ char * p = NULL; ++ W = strtoul(arg2, &p, 0); ++ if (!W || *p) { ++ fprintf(stderr, "bad width %s\n", arg2); ++ return -1; ++ } ++ } else if (!strcmp(argv[i], "-h")) { ++ char * p = NULL; ++ H = strtoul(arg2, &p, 0); ++ if (!H || *p) { ++ fprintf(stderr, "bad height '%s'\n", arg2); ++ return -1; ++ } ++ } else if (!strcmp(argv[i], "-t")) { ++ char * p = NULL; ++ time_rep = (int)strtol(arg2, &p, 0); ++ if (*p) { ++ fprintf(stderr, "bad time repetitions '%s'\n", arg2); + return -1; + } + } else { +@@ -414,15 +457,34 @@ bad_option: + } + } + +- sws = sws_getContext(W / 12, H / 12, AV_PIX_FMT_RGB32, W, H, ++ S = (W + 15) & ~15; ++ rgb_data = av_mallocz(S * H * 4); ++ rgb_src[0] = rgb_data; ++ rgb_stride[0] = 4 * S; ++ data = av_mallocz(4 * S * H); ++ src[0] = data; ++ src[1] = data + S * H; ++ src[2] = data + S * H * 2; ++ src[3] = data + S * H * 3; ++ stride[0] = S; ++ stride[1] = S; ++ stride[2] = S; ++ stride[3] = S; ++ H2 = H < 96 ? 8 : H / 12; ++ W2 = W < 96 ? 8 : W / 12; ++ ++ if (!rgb_data || !data) ++ return -1; ++ ++ sws = sws_getContext(W2, H2, AV_PIX_FMT_RGB32, W, H, + AV_PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL); + + av_lfg_init(&rand, 1); + + for (y = 0; y < H; y++) + for (x = 0; x < W * 4; x++) +- rgb_data[ x + y * 4 * W] = av_lfg_get(&rand); +- res = sws_scale(sws, rgb_src, rgb_stride, 0, H / 12, (uint8_t * const *) src, stride); ++ rgb_data[ x + y * 4 * S] = av_lfg_get(&rand); ++ res = sws_scale(sws, (const uint8_t * const *)rgb_src, rgb_stride, 0, H2, (uint8_t * const *) src, stride); + if (res < 0 || res != H) { + res = -1; + goto error; +@@ -431,10 +493,10 @@ bad_option: + av_free(rgb_data); + + if(fp) { +- res = fileTest(src, stride, W, H, fp, srcFormat, dstFormat); ++ res = fileTest((const uint8_t * const *)src, stride, W, H, fp, srcFormat, dstFormat); + fclose(fp); + } else { +- selfTest(src, stride, W, H, srcFormat, dstFormat); ++ selfTest((const uint8_t * const *)src, stride, W, H, srcFormat, dstFormat); + res = 0; + } + error: diff --git a/pi-util/BUILD.txt b/pi-util/BUILD.txt new file mode 100644 -index 0000000000..b050971f63 +index 0000000000..2b62d660c0 --- /dev/null +++ b/pi-util/BUILD.txt -@@ -0,0 +1,59 @@ +@@ -0,0 +1,67 @@ +Building Pi FFmpeg +================== + @@ -68332,6 +69669,8 @@ index 0000000000..b050971f63 + paths being confused and therefore running the wrong code, Shared + is what is needed, in most cases, when building for use by other + programs. ++ --usr Set install dir to /usr (i.e. system default) rather than in ++ /install + +So for a static build +--------------------- @@ -68345,25 +69684,31 @@ index 0000000000..b050971f63 +For a shared build +------------------ + ++There are two choices here ++ +$ pi-util/conf_native.sh -+ -+You will normally want an install target if shared. Note that the script has -+set this up to be generated in out//install, you don't have to worry -+about overwriting your system libs. -+ +$ make -j8 -C out/ install + ++This sets the install prefix to /install and is probably what you ++want if you don't want to overwrite the system files. ++ +You can now set LD_LIBRARY_PATH appropriately and run ffmpeg from where it was -+built or install the image on the system - you have to be careful to get rid -+of all other ffmpeg libs or confusion may result. There is a little script -+that wipes all other versions - obviously use with care! ++built. You can copy the contents of /install to /usr and that mostly ++works. The only downside is that paths in pkgconfig end up being set to the ++install directory in your build directory which may be less than ideal when ++building other packages. + ++The alternative if you just want to replace the system libs is: ++ ++$ pi-util/conf_native.sh --usr ++$ make -j8 -C out/ +$ sudo pi-util/clean_usr_libs.sh ++$ sudo make -j8 -C out/ install + -+Then simply copying from the install to /usr works -+ -+$ sudo cp -r out//install/* /usr -+ ++The clean_usr_libs.sh step wipes any existing libs & includes (for all ++architectures) from the system which helps avoid confusion when running other ++progs as you can be sure you're not running old code which is unfortunately ++easy to do otherwise. + diff --git a/pi-util/NOTES.txt b/pi-util/NOTES.txt new file mode 100644 @@ -68530,11 +69875,27 @@ index 0000000000..92bc13a3df + diff --git a/pi-util/clean_usr_libs.sh b/pi-util/clean_usr_libs.sh new file mode 100755 -index 0000000000..b3b2d5509d +index 0000000000..01bd6a6a22 --- /dev/null +++ b/pi-util/clean_usr_libs.sh -@@ -0,0 +1,26 @@ +@@ -0,0 +1,42 @@ +set -e ++U=/usr/include/arm-linux-gnueabihf ++rm -rf $U/libavcodec ++rm -rf $U/libavdevice ++rm -rf $U/libavfilter ++rm -rf $U/libavformat ++rm -rf $U/libavutil ++rm -rf $U/libswresample ++rm -rf $U/libswscale ++U=/usr/include/aarch64-linux-gnu ++rm -rf $U/libavcodec ++rm -rf $U/libavdevice ++rm -rf $U/libavfilter ++rm -rf $U/libavformat ++rm -rf $U/libavutil ++rm -rf $U/libswresample ++rm -rf $U/libswscale +U=/usr/lib/arm-linux-gnueabihf +rm -f $U/libavcodec.* +rm -f $U/libavdevice.* @@ -69117,10 +70478,10 @@ index 0000000000..fc14f2a3c2 +1,WPP_F_ericsson_MAIN_2,WPP_F_ericsson_MAIN_2.bit,WPP_F_ericsson_MAIN_2_yuv.md5 diff --git a/pi-util/conf_native.sh b/pi-util/conf_native.sh new file mode 100755 -index 0000000000..a9e053801c +index 0000000000..5fb69ccee2 --- /dev/null +++ b/pi-util/conf_native.sh -@@ -0,0 +1,107 @@ +@@ -0,0 +1,127 @@ +echo "Configure for native build" + +FFSRC=`pwd` @@ -69132,6 +70493,7 @@ index 0000000000..a9e053801c + +NOSHARED= +MMAL= ++USR_PREFIX= + +while [ "$1" != "" ] ; do + case $1 in @@ -69141,8 +70503,14 @@ index 0000000000..a9e053801c + --mmal) + MMAL=1 + ;; ++ --usr) ++ USR_PREFIX=/usr ++ ;; + *) -+ echo "Usage $0: [--noshared] [--mmal]" ++ echo "Usage $0: [--noshared] [--mmal] [--usr]" ++ echo " noshared Build static libs and executable - good for testing" ++ echo " mmal Build mmal decoders" ++ echo " usr Set install prefix to /usr [default=/install]" + exit 1 + ;; + esac @@ -69156,18 +70524,28 @@ index 0000000000..a9e053801c +RPI_DEFINES= +RPI_EXTRALIBS= + -+if [ "$MC" == "arm64" ]; then -+ echo "M/C aarch64" -+ A=aarch64-linux-gnu -+ B=arm64 -+elif [ "$MC" == "armhf" ]; then -+ echo "M/C armv7" -+ A=arm-linux-gnueabihf -+ B=armv7 -+ MCOPTS="--arch=armv6t2 --cpu=cortex-a7" -+ RPI_DEFINES=-mfpu=neon-vfpv4 ++# uname -m gives kernel type which may not have the same ++# 32/64bitness as userspace :-( getconf shoudl provide the answer ++# but use uname to check we are on the right processor ++MC=`uname -m` ++LB=`getconf LONG_BIT` ++if [ "$MC" == "armv7l" ] || [ "$MC" == "aarch64" ]; then ++ if [ "$LB" == "32" ]; then ++ echo "M/C armv7" ++ A=arm-linux-gnueabihf ++ B=armv7 ++ MCOPTS="--arch=armv6t2 --cpu=cortex-a7" ++ RPI_DEFINES=-mfpu=neon-vfpv4 ++ elif [ "$LB" == "64" ]; then ++ echo "M/C aarch64" ++ A=aarch64-linux-gnu ++ B=arm64 ++ else ++ echo "Unknown LONG_BIT name: $LB" ++ exit 1 ++ fi +else -+ echo Unexpected architecture $MC ++ echo "Unknown machine name: $MC" + exit 1 +fi + @@ -69195,7 +70573,9 @@ index 0000000000..a9e053801c + OUT=$BUILDBASE/$B-$C-$V-shared-rel +fi + -+USR_PREFIX=$OUT/install ++if [ ! $USR_PREFIX ]; then ++ USR_PREFIX=$OUT/install ++fi +LIB_PREFIX=$USR_PREFIX/lib/$A +INC_PREFIX=$USR_PREFIX/include/$A + @@ -69225,6 +70605,7 @@ index 0000000000..a9e053801c + --extra-libs="$RPI_EXTRALIBS"\ + --extra-version="rpi" + ++echo "Configured into $OUT" + +# gcc option for getting asm listing +# -Wa,-ahls From 387ecdc9e7c9ab018c0f103b2cb283f7346d603c Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 13 Jun 2023 15:31:07 +0200 Subject: [PATCH 145/157] ffmpeg: update rpi patch Patch created using revisions 7e0d640..8832f79 from branch test/4.4.1/main of https://github.com/jc-kynesim/rpi-ffmpeg --- packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch index c835a0de3a..659c5d7d13 100644 --- a/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch +++ b/packages/multimedia/ffmpeg/patches/rpi/ffmpeg-001-rpi.patch @@ -53060,7 +53060,7 @@ index b67b216331..a506e69d67 100644 + #endif /* AVCODEC_V4L2_M2M_H */ diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c -index ab07c0a24a..80d131eae4 100644 +index ab07c0a24a..cec98cc16a 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -21,8 +21,14 @@ @@ -54123,8 +54123,8 @@ index ab07c0a24a..80d131eae4 100644 + if (sps) { + avctx->profile = ff_h264_get_profile(sps); + avctx->level = sps->level_idc; ++ s->reorder_size = sps->num_reorder_frames; + } -+ s->reorder_size = sps->num_reorder_frames; + } + ff_h264_ps_uninit(&ps); + break; From a3ca53e54bd9607692d5e199ca6ff3a3745357d6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 16 Jun 2023 23:26:51 +0000 Subject: [PATCH 146/157] kodi-binary-addons: update to latest versions - peripheral.joystick: update 20.1.8-Nexus to 20.1.9-Nexus - pvr.sledovanitv.cz: update 20.5.0-Nexus to 20.6.0-Nexus --- .../kodi-binary-addons/peripheral.joystick/package.mk | 4 ++-- .../kodi-binary-addons/pvr.sledovanitv.cz/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index 946a670d63..43dcdf80a7 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="peripheral.joystick" -PKG_VERSION="20.1.8-Nexus" -PKG_SHA256="6e8fb553309d3ad48fad21d2d6cebdb537a4e2b88878b6fdc43707c7bc37e160" +PKG_VERSION="20.1.9-Nexus" +PKG_SHA256="b1b379e7eb24a16702745c78a57b2f246a013becf5c2daf7579651cbf2188b82" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk index b3a75bf07d..fc77c8d133 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.sledovanitv.cz" -PKG_VERSION="20.5.0-Nexus" -PKG_SHA256="e9da3dbc7724eb35b8458fbb927233164b38f5a07f16839490c8eab526ac0eca" +PKG_VERSION="20.6.0-Nexus" +PKG_SHA256="677f9893187ce14b18f4984b7175f59bb1d2354f3b6a153a58a33d166d5eac28" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" From d174df44a65034f67b8c5951f965510f11f78a82 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Wed, 7 Jun 2023 16:58:30 +0200 Subject: [PATCH 147/157] linux (RPi): update to 6.1.32-bb63dc3 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c3e2207f30..38fe414036 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="3a4603db1c0e33167153244deb198c2b13370f98" # 6.1.31 - PKG_SHA256="6e3b2323687c66bdd1cbb2547b0a11c5d9ad69d7dab1400a4055183c8e20f3c2" + PKG_VERSION="bb63dc31e48948bc2649357758c7a152210109c4" # 6.1.32 + PKG_SHA256="41898b9bd88eec0843e4115156f239bd5bfc086814b3ada52e3db7116a337474" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 086ba5e6feca45a26f3e196e11e7948037741a83 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 16 Jun 2023 17:31:15 +0200 Subject: [PATCH 148/157] linux (RPi): update to 6.1.34-a72a720 Signed-off-by: Matthias Reichl --- packages/linux/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 38fe414036..61f14d83e8 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -23,8 +23,8 @@ case "${LINUX}" in PKG_PATCH_DIRS="default" ;; raspberrypi) - PKG_VERSION="bb63dc31e48948bc2649357758c7a152210109c4" # 6.1.32 - PKG_SHA256="41898b9bd88eec0843e4115156f239bd5bfc086814b3ada52e3db7116a337474" + PKG_VERSION="a72a720bfd4d2093ce9e51239cd7067dd060ff81" # 6.1.34 + PKG_SHA256="3acaf74f06c04c5727e8d917251b40e5378303b9e2fc62eca81f362857c1db70" PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; From 5b92ff99abc387f5381b0b60cf61a229808db1fa Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 25 May 2023 22:38:24 +0000 Subject: [PATCH 149/157] snapserver: update shairport-sync to 4.2 and addon (2) - asio: update to 1.28.0 - https://think-async.com/Asio/asio-1.28.0/doc/asio/history.html#asio.history.asio_1_28_0 - nqptp: update to 1.2.1 - https://github.com/mikebrady/nqptp/releases/tag/1.2.1 - shairport-sync: update to 4.2 - https://github.com/mikebrady/shairport-sync/releases/tag/4.2 --- packages/addons/service/snapserver/changelog.txt | 5 +++++ packages/addons/service/snapserver/package.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/snapserver/changelog.txt b/packages/addons/service/snapserver/changelog.txt index d8ff4d89e6..e9c8033a9f 100644 --- a/packages/addons/service/snapserver/changelog.txt +++ b/packages/addons/service/snapserver/changelog.txt @@ -1,3 +1,8 @@ +2 +- asio: update to 1.28.0 +- nqptp: update to 1.2.1 +- shairport-sync: update to 4.2 + 1 - asio: update to 1.27.0 - snapcast: update to 0.27.0 diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index d4ccda5dd3..daecbde6de 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -3,7 +3,7 @@ PKG_NAME="snapserver" PKG_VERSION="0.27.0" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast" From 6fbd1e65dc5ae6aff9bc9f4461c7bf41761897e8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 25 May 2023 22:41:08 +0000 Subject: [PATCH 150/157] snapclient: update shairport-sync to 4.2 and addon (2) - asio: update to 1.28.0 - https://think-async.com/Asio/asio-1.28.0/doc/asio/history.html#asio.history.asio_1_28_0 - nqptp: update to 1.2.1 - https://github.com/mikebrady/nqptp/releases/tag/1.2.1 - shairport-sync: update to 4.2 - https://github.com/mikebrady/shairport-sync/releases/tag/4.2 --- packages/addons/service/snapclient/changelog.txt | 5 +++++ packages/addons/service/snapclient/package.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/snapclient/changelog.txt b/packages/addons/service/snapclient/changelog.txt index d8ff4d89e6..e9c8033a9f 100644 --- a/packages/addons/service/snapclient/changelog.txt +++ b/packages/addons/service/snapclient/changelog.txt @@ -1,3 +1,8 @@ +2 +- asio: update to 1.28.0 +- nqptp: update to 1.2.1 +- shairport-sync: update to 4.2 + 1 - asio: update to 1.27.0 - snapcast: update to 0.27.0 diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index ebd711f292..fa4e117945 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -3,7 +3,7 @@ PKG_NAME="snapclient" PKG_VERSION="0.27.0" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast" From c0d7eb62c579cdba6a2b8dbd866fcc293b0b3f37 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 14 Jun 2023 17:10:47 +0000 Subject: [PATCH 151/157] aspnet6-runtime: update to 6.0.18 --- .../aspnet6-runtime/package.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk index 37cc5423d8..addbeb9927 100644 --- a/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk +++ b/packages/addons/addon-depends/dotnet-runtime-depends/aspnet6-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="aspnet6-runtime" -PKG_VERSION="6.0.16" +PKG_VERSION="6.0.18" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" PKG_DEPENDS_TARGET="toolchain" @@ -11,16 +11,16 @@ PKG_TOOLCHAIN="manual" case "${ARCH}" in "aarch64") - PKG_SHA256="eba3d57245dcc02ef7b9677a6f205d8a0b932a4aa1e552c9e9094cefab6b52c2" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/5fe35f73-59e4-462e-b7aa-98b5b8782051/74a27e03d896663a9483eb72bc59b275/aspnetcore-runtime-6.0.16-linux-arm64.tar.gz" + PKG_SHA256="cae83353c508eb7766be43f6cae4e500569f3bcf8a1139e4e762c5b9f7dabbf1" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/f60912b4-b50d-4d85-b3aa-3b69504a426b/190ebc4012cd4da240e4d5247b484b15/aspnetcore-runtime-6.0.18-linux-arm64.tar.gz" ;; "arm") - PKG_SHA256="717d98c382cdc3abb5e25cc7437b7ffe4b195c072a233b5be44b762d374683c7" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/4054a868-d2c9-4e04-84ea-d78b6b77c8cb/f69efb40d4cc84fa5f792d0bb821eea8/aspnetcore-runtime-6.0.16-linux-arm.tar.gz" + PKG_SHA256="45d22a5ef4eb687648fdd4bf918e25f2fc9a63a0f84fa68a45a88ee6d44f204d" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/7b10cc0d-3627-4d1b-8307-630c05fb30be/06e4498eeb854db5a723b46114377fce/aspnetcore-runtime-6.0.18-linux-arm.tar.gz" ;; "x86_64") - PKG_SHA256="099a6aa6516413b88fb877d10deb1d171c1a772f1cd83cdb46003de72aec07cd" - PKG_URL="https://download.visualstudio.microsoft.com/download/pr/877a2d48-74ed-484b-85a1-605078f5e718/752ce1e38b76ffb5ebfc2ee1772307bf/aspnetcore-runtime-6.0.16-linux-x64.tar.gz" + PKG_SHA256="8b7a6c4fc46887d1281f18558e76e34b1656ca1f487c3c71f63d3453a1f5c63b" + PKG_URL="https://download.visualstudio.microsoft.com/download/pr/503c4325-104f-41e0-8dc6-1a8b55e0651a/3dcd8a5d03d3a04bb4111296b12cd11d/aspnetcore-runtime-6.0.18-linux-x64.tar.gz" ;; esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" From bf84e20652035b4bc7da5f8eabcb37fe4027ee27 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 14 Jun 2023 17:12:32 +0000 Subject: [PATCH 152/157] dotnet-runtime: update aspnet6-runtime to 6.0.18 and addon (3) --- packages/addons/tools/dotnet-runtime/changelog.txt | 7 +++++-- packages/addons/tools/dotnet-runtime/package.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/addons/tools/dotnet-runtime/changelog.txt b/packages/addons/tools/dotnet-runtime/changelog.txt index 21dfca6287..ef0d2cd680 100644 --- a/packages/addons/tools/dotnet-runtime/changelog.txt +++ b/packages/addons/tools/dotnet-runtime/changelog.txt @@ -1,5 +1,8 @@ -1 -- aspnet6-runtime: update to 6.0.15 +3 +- aspnet6-runtime: update to 6.0.18 2 - aspnet6-runtime: update to 6.0.16 + +1 +- aspnet6-runtime: update to 6.0.15 diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index 7af96313dc..0363bc562e 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dotnet-runtime" -PKG_REV="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://dotnet.microsoft.com/" From 7a744cf99ac1fb5d9c2f9aae118b55d9d711ec68 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 14 Jun 2023 17:18:49 +0000 Subject: [PATCH 153/157] intel-ucode: update to 20230613 --- packages/linux-firmware/intel-ucode/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index c17e34d3a2..18a84e74d7 100644 --- a/packages/linux-firmware/intel-ucode/package.mk +++ b/packages/linux-firmware/intel-ucode/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="intel-ucode" -PKG_VERSION="20230516" -PKG_SHA256="ad8cbc5a273f4640003f6a3f1b129ac6a046f3498ce037921ebac1adf267e55d" +PKG_VERSION="20230613" +PKG_SHA256="894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9" PKG_ARCH="x86_64" PKG_LICENSE="other" PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode" From 2fd6b9ae3151be6cf17f08b8b71cc3f8ca5a6b0a Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Jun 2023 11:34:15 +0200 Subject: [PATCH 154/157] kodi: update to 9a44d07 Signed-off-by: Matthias Reichl --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index c15c865971..4f7f2b843b 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="20.1-Nexus" -PKG_SHA256="cd4158b2bc2d9593ad2f5c1cd2494957ab726b13d8379bbfb09d7d36df7b7d7e" +PKG_VERSION="9a44d078a3063fa415b91727ae3f573bf17bbf20" +PKG_SHA256="ace137d1dd424160b7915bd3d326040047ecf2a2b74a5499d128ceece34a4638" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" From ee35c2601b02d634c35819c56f7e818f61543da9 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 18 Jun 2023 11:34:31 +0200 Subject: [PATCH 155/157] kodi: add backport PR 23411 with E-AC3 fixes Signed-off-by: Matthias Reichl --- ...i-010.01-pr23411-backport-eac3-fixes.patch | 966 ++++++++++++++++++ 1 file changed, 966 insertions(+) create mode 100644 packages/mediacenter/kodi/patches/kodi-010.01-pr23411-backport-eac3-fixes.patch diff --git a/packages/mediacenter/kodi/patches/kodi-010.01-pr23411-backport-eac3-fixes.patch b/packages/mediacenter/kodi/patches/kodi-010.01-pr23411-backport-eac3-fixes.patch new file mode 100644 index 0000000000..c2b259bff3 --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-010.01-pr23411-backport-eac3-fixes.patch @@ -0,0 +1,966 @@ +From 50f7310fc8162f1885e5b6bf9b76e00e07900415 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Tue, 25 Apr 2023 18:19:07 +0100 +Subject: [PATCH 1/4] AEStreamInfo: Support EAC3 independent + EAC3 (dependent) + streams + +Fixes: https://github.com/xbmc/xbmc/issues/19182 +--- + xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +index 1489a8be7f204..aac2356177b8e 100644 +--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp ++++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +@@ -446,6 +446,25 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + m_fsize = framesize << 1; + m_info.m_repeat = MAX_EAC3_BLOCKS / blocks; + ++ /* EAC3 can have a dependent stream too */ ++ if (!wantEAC3dependent) ++ { ++ unsigned int fsizeMain = m_fsize; ++ unsigned int reqBytes = fsizeMain + 8; ++ if (size < reqBytes) { ++ /* not enough data to check for E-AC3 dependent frame, request more */ ++ m_needBytes = reqBytes; ++ m_fsize = 0; ++ /* no need to resync => return true */ ++ return true; ++ } ++ if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) { ++ /* concatenate the main and dependent frames */ ++ m_fsize += fsizeMain; ++ return true; ++ } ++ } ++ + if (m_info.m_type == CAEStreamInfo::STREAM_TYPE_EAC3 && m_hasSync && !resyncing) + return true; + + +From afb9169af87ed5de2afaacb3382d718eb985028c Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Fri, 5 May 2023 18:18:51 +0100 +Subject: [PATCH 2/4] AEStreamInfo: Apply clang-format to file + +No functional change +--- + xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp | 181 +++++++++--------- + 1 file changed, 94 insertions(+), 87 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +index aac2356177b8e..5ce9a33ce471e 100644 +--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp ++++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +@@ -13,50 +13,34 @@ + #include + #include + +-#define DTS_PREAMBLE_14BE 0x1FFFE800 +-#define DTS_PREAMBLE_14LE 0xFF1F00E8 +-#define DTS_PREAMBLE_16BE 0x7FFE8001 +-#define DTS_PREAMBLE_16LE 0xFE7F0180 +-#define DTS_PREAMBLE_HD 0x64582025 +-#define DTS_PREAMBLE_XCH 0x5a5a5a5a +-#define DTS_PREAMBLE_XXCH 0x47004a03 +-#define DTS_PREAMBLE_X96K 0x1d95f262 +-#define DTS_PREAMBLE_XBR 0x655e315e +-#define DTS_PREAMBLE_LBR 0x0a801921 +-#define DTS_PREAMBLE_XLL 0x41a29547 +-#define DTS_SFREQ_COUNT 16 +-#define MAX_EAC3_BLOCKS 6 ++#define DTS_PREAMBLE_14BE 0x1FFFE800 ++#define DTS_PREAMBLE_14LE 0xFF1F00E8 ++#define DTS_PREAMBLE_16BE 0x7FFE8001 ++#define DTS_PREAMBLE_16LE 0xFE7F0180 ++#define DTS_PREAMBLE_HD 0x64582025 ++#define DTS_PREAMBLE_XCH 0x5a5a5a5a ++#define DTS_PREAMBLE_XXCH 0x47004a03 ++#define DTS_PREAMBLE_X96K 0x1d95f262 ++#define DTS_PREAMBLE_XBR 0x655e315e ++#define DTS_PREAMBLE_LBR 0x0a801921 ++#define DTS_PREAMBLE_XLL 0x41a29547 ++#define DTS_SFREQ_COUNT 16 ++#define MAX_EAC3_BLOCKS 6 + #define UNKNOWN_DTS_EXTENSION 255 + +-static const uint16_t AC3Bitrates [] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 448, 512, 576, 640}; +-static const uint16_t AC3FSCod [] = {48000, 44100, 32000, 0}; +-static const uint8_t AC3BlkCod [] = {1, 2, 3, 6}; +-static const uint8_t AC3Channels [] = {2, 1, 2, 3, 3, 4, 4, 5}; +-static const uint8_t DTSChannels [] = {1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8}; +-static const uint8_t THDChanMap [] = {2, 1, 1, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1}; ++static const uint16_t AC3Bitrates[] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, ++ 192, 224, 256, 320, 384, 448, 512, 576, 640}; ++static const uint16_t AC3FSCod[] = {48000, 44100, 32000, 0}; ++static const uint8_t AC3BlkCod[] = {1, 2, 3, 6}; ++static const uint8_t AC3Channels[] = {2, 1, 2, 3, 3, 4, 4, 5}; ++static const uint8_t DTSChannels[] = {1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8}; ++static const uint8_t THDChanMap[] = {2, 1, 1, 2, 2, 2, 2, 1, 1, 2, 2, 1, 1}; + +-static const uint32_t DTSSampleRates[DTS_SFREQ_COUNT] = +-{ +- 0 , +- 8000 , +- 16000 , +- 32000 , +- 64000 , +- 128000, +- 11025 , +- 22050 , +- 44100 , +- 88200 , +- 176400, +- 12000 , +- 24000 , +- 48000 , +- 96000 , +- 192000 +-}; +- +-CAEStreamParser::CAEStreamParser() : +- m_syncFunc (&CAEStreamParser::DetectType) ++static const uint32_t DTSSampleRates[DTS_SFREQ_COUNT] = {0, 8000, 16000, 32000, 64000, 128000, ++ 11025, 22050, 44100, 88200, 176400, 12000, ++ 24000, 48000, 96000, 192000}; ++ ++CAEStreamParser::CAEStreamParser() : m_syncFunc(&CAEStreamParser::DetectType) + { + av_crc_init(m_crcTrueHD, 0, 16, 0x2D, sizeof(m_crcTrueHD)); + } +@@ -74,9 +58,7 @@ double CAEStreamInfo::GetDuration() const + break; + case STREAM_TYPE_TRUEHD: + int rate; +- if (m_sampleRate == 48000 || +- m_sampleRate == 96000 || +- m_sampleRate == 192000) ++ if (m_sampleRate == 48000 || m_sampleRate == 96000 || m_sampleRate == 192000) + rate = 192000; + else + rate = 176400; +@@ -120,7 +102,10 @@ void CAEStreamParser::Reset() + m_hasSync = false; + } + +-int CAEStreamParser::AddData(uint8_t *data, unsigned int size, uint8_t **buffer/* = NULL */, unsigned int *bufferSize/* = 0 */) ++int CAEStreamParser::AddData(uint8_t* data, ++ unsigned int size, ++ uint8_t** buffer /* = NULL */, ++ unsigned int* bufferSize /* = 0 */) + { + if (size == 0) + { +@@ -154,7 +139,7 @@ int CAEStreamParser::AddData(uint8_t *data, unsigned int size, uint8_t **buffer/ + unsigned int consumed = 0; + unsigned int offset = 0; + unsigned int room = sizeof(m_buffer) - m_bufferSize; +- while(true) ++ while (true) + { + if (!size) + { +@@ -223,7 +208,7 @@ int CAEStreamParser::AddData(uint8_t *data, unsigned int size, uint8_t **buffer/ + } + } + +-void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize) ++void CAEStreamParser::GetPacket(uint8_t** buffer, unsigned int* bufferSize) + { + /* if the caller wants the packet */ + if (buffer) +@@ -236,7 +221,7 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize) + /* make sure the buffer is allocated and big enough */ + if (!*buffer || !bufferSize || *bufferSize < size) + { +- delete[] *buffer; ++ delete[] * buffer; + *buffer = new uint8_t[size]; + } + +@@ -261,18 +246,16 @@ void CAEStreamParser::GetPacket(uint8_t **buffer, unsigned int *bufferSize) + m_syncFunc to itself. This function will only be called again if total sync is lost, which + allows is to switch stream types on the fly much like a real receiver does. + */ +-unsigned int CAEStreamParser::DetectType(uint8_t *data, unsigned int size) ++unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + { +- unsigned int skipped = 0; ++ unsigned int skipped = 0; + unsigned int possible = 0; + + while (size > 8) + { + /* if it could be DTS */ + unsigned int header = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; +- if (header == DTS_PREAMBLE_14LE || +- header == DTS_PREAMBLE_14BE || +- header == DTS_PREAMBLE_16LE || ++ if (header == DTS_PREAMBLE_14LE || header == DTS_PREAMBLE_14BE || header == DTS_PREAMBLE_16LE || + header == DTS_PREAMBLE_16BE) + { + unsigned int skip = SyncDTS(data, size); +@@ -311,7 +294,10 @@ unsigned int CAEStreamParser::DetectType(uint8_t *data, unsigned int size) + return possible ? possible : skipped; + } + +-bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncing, bool wantEAC3dependent) ++bool CAEStreamParser::TrySyncAC3(uint8_t* data, ++ unsigned int size, ++ bool resyncing, ++ bool wantEAC3dependent) + { + if (size < 8) + return false; +@@ -320,14 +306,14 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + if (data[0] != 0x0b || data[1] != 0x77) + return false; + +- uint8_t bsid = data[5] >> 3; ++ uint8_t bsid = data[5] >> 3; + uint8_t acmod = data[6] >> 5; + uint8_t lfeon; + + int8_t pos = 4; + if ((acmod & 0x1) && (acmod != 0x1)) + pos -= 2; +- if (acmod & 0x4 ) ++ if (acmod & 0x4) + pos -= 2; + if (acmod == 0x2) + pos -= 2; +@@ -356,9 +342,15 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + unsigned int framesize = 0; + switch (fscod) + { +- case 0: framesize = bitRate * 2; break; +- case 1: framesize = (320 * bitRate / 147 + (frmsizecod & 1 ? 1 : 0)); break; +- case 2: framesize = bitRate * 4; break; ++ case 0: ++ framesize = bitRate * 2; ++ break; ++ case 1: ++ framesize = (320 * bitRate / 147 + (frmsizecod & 1 ? 1 : 0)); ++ break; ++ case 2: ++ framesize = bitRate * 4; ++ break; + } + + m_fsize = framesize << 1; +@@ -371,14 +363,16 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + /* this may be the main stream of EAC3 */ + unsigned int fsizeMain = m_fsize; + unsigned int reqBytes = fsizeMain + 8; +- if (size < reqBytes) { ++ if (size < reqBytes) ++ { + /* not enough data to check for E-AC3 dependent frame, request more */ + m_needBytes = reqBytes; + m_fsize = 0; + /* no need to resync => return true */ + return true; + } +- if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) { ++ if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) ++ { + /* concatenate the main and dependent frames */ + m_fsize += fsizeMain; + return true; +@@ -451,14 +445,16 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + { + unsigned int fsizeMain = m_fsize; + unsigned int reqBytes = fsizeMain + 8; +- if (size < reqBytes) { ++ if (size < reqBytes) ++ { + /* not enough data to check for E-AC3 dependent frame, request more */ + m_needBytes = reqBytes; + m_fsize = 0; + /* no need to resync => return true */ + return true; + } +- if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) { ++ if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) ++ { + /* concatenate the main and dependent frames */ + m_fsize += fsizeMain; + return true; +@@ -481,7 +477,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t *data, unsigned int size, bool resyncin + } + } + +-unsigned int CAEStreamParser::SyncAC3(uint8_t *data, unsigned int size) ++unsigned int CAEStreamParser::SyncAC3(uint8_t* data, unsigned int size) + { + unsigned int skip = 0; + +@@ -498,7 +494,7 @@ unsigned int CAEStreamParser::SyncAC3(uint8_t *data, unsigned int size) + return skip; + } + +-unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) ++unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + { + if (size < 13) + { +@@ -535,7 +531,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + ext_type = ((data[11] & 0xe) >> 1); + sfreq = data[9] & 0xF; + lfe = (data[12] & 0x18) >> 3; +- m_info.m_dataIsLE = false; ++ m_info.m_dataIsLE = false; + bits = 14; + break; + +@@ -598,9 +594,15 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + CAEStreamInfo::DataType dataType; + switch (dtsBlocks << 5) + { +- case 512 : dataType = CAEStreamInfo::STREAM_TYPE_DTS_512 ; break; +- case 1024: dataType = CAEStreamInfo::STREAM_TYPE_DTS_1024; break; +- case 2048: dataType = CAEStreamInfo::STREAM_TYPE_DTS_2048; break; ++ case 512: ++ dataType = CAEStreamInfo::STREAM_TYPE_DTS_512; ++ break; ++ case 1024: ++ dataType = CAEStreamInfo::STREAM_TYPE_DTS_1024; ++ break; ++ case 2048: ++ dataType = CAEStreamInfo::STREAM_TYPE_DTS_2048; ++ break; + default: + invalid = true; + break; +@@ -617,23 +619,28 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + if (size - skip < m_fsize + 10) + { + /* we can assume DTS sync at this point */ +- m_syncFunc = &CAEStreamParser::SyncDTS; ++ m_syncFunc = &CAEStreamParser::SyncDTS; + m_needBytes = m_fsize + 10; +- m_fsize = 0; ++ m_fsize = 0; + + return skip; + } + + /* look for DTS-HD */ +- hd_sync = (data[m_fsize] << 24) | (data[m_fsize + 1] << 16) | (data[m_fsize + 2] << 8) | data[m_fsize + 3]; ++ hd_sync = (data[m_fsize] << 24) | (data[m_fsize + 1] << 16) | (data[m_fsize + 2] << 8) | ++ data[m_fsize + 3]; + if (hd_sync == DTS_PREAMBLE_HD) + { + int hd_size; + bool blownup = (data[m_fsize + 5] & 0x20) != 0; + if (blownup) +- hd_size = (((data[m_fsize + 6] & 0x01) << 19) | (data[m_fsize + 7] << 11) | (data[m_fsize + 8] << 3) | ((data[m_fsize + 9] & 0xe0) >> 5)) + 1; ++ hd_size = (((data[m_fsize + 6] & 0x01) << 19) | (data[m_fsize + 7] << 11) | ++ (data[m_fsize + 8] << 3) | ((data[m_fsize + 9] & 0xe0) >> 5)) + ++ 1; + else +- hd_size = (((data[m_fsize + 6] & 0x1f) << 11) | (data[m_fsize + 7] << 3) | ((data[m_fsize + 8] & 0xe0) >> 5)) + 1; ++ hd_size = (((data[m_fsize + 6] & 0x1f) << 11) | (data[m_fsize + 7] << 3) | ++ ((data[m_fsize + 8] & 0xe0) >> 5)) + ++ 1; + + int header_size; + if (blownup) +@@ -641,17 +648,16 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + else + header_size = (((data[m_fsize + 5] & 0x1f) << 3) | ((data[m_fsize + 6] & 0xe0) >> 5)) + 1; + +- hd_sync = data[m_fsize + header_size] << 24 | data[m_fsize + header_size + 1] << 16 | data[m_fsize + header_size + 2] << 8 | data[m_fsize + header_size + 3]; ++ hd_sync = data[m_fsize + header_size] << 24 | data[m_fsize + header_size + 1] << 16 | ++ data[m_fsize + header_size + 2] << 8 | data[m_fsize + header_size + 3]; + + /* set the type according to core or not */ + if (m_coreOnly) + dataType = CAEStreamInfo::STREAM_TYPE_DTSHD_CORE; + else if (hd_sync == DTS_PREAMBLE_XLL) + dataType = CAEStreamInfo::STREAM_TYPE_DTSHD_MA; +- else if (hd_sync == DTS_PREAMBLE_XCH || +- hd_sync == DTS_PREAMBLE_XXCH || +- hd_sync == DTS_PREAMBLE_X96K || +- hd_sync == DTS_PREAMBLE_XBR || ++ else if (hd_sync == DTS_PREAMBLE_XCH || hd_sync == DTS_PREAMBLE_XXCH || ++ hd_sync == DTS_PREAMBLE_X96K || hd_sync == DTS_PREAMBLE_XBR || + hd_sync == DTS_PREAMBLE_LBR) + dataType = CAEStreamInfo::STREAM_TYPE_DTSHD; + else +@@ -662,7 +668,8 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + } + + unsigned int sampleRate = DTSSampleRates[sfreq]; +- if (!m_hasSync || skip || dataType != m_info.m_type || sampleRate != m_info.m_sampleRate || dtsBlocks != m_dtsBlocks) ++ if (!m_hasSync || skip || dataType != m_info.m_type || sampleRate != m_info.m_sampleRate || ++ dtsBlocks != m_dtsBlocks) + { + m_hasSync = true; + m_info.m_type = dataType; +@@ -683,7 +690,8 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t *data, unsigned int size) + } + else + { +- m_info.m_dtsPeriod = (m_info.m_sampleRate * (2 >> 1)) * (m_dtsBlocks << 5) / m_info.m_sampleRate; ++ m_info.m_dtsPeriod = ++ (m_info.m_sampleRate * (2 >> 1)) * (m_dtsBlocks << 5) / m_info.m_sampleRate; + } + + std::string type; +@@ -746,7 +754,7 @@ inline unsigned int CAEStreamParser::GetTrueHDChannels(const uint16_t chanmap) + return channels; + } + +-unsigned int CAEStreamParser::SyncTrueHD(uint8_t *data, unsigned int size) ++unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + { + unsigned int left = size; + unsigned int skip = 0; +@@ -759,7 +767,7 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t *data, unsigned int size) + return size; + + /* if its a major audio unit */ +- uint16_t length = ((data[0] & 0x0F) << 8 | data[1]) << 1; ++ uint16_t length = ((data[0] & 0x0F) << 8 | data[1]) << 1; + uint32_t syncword = ((((data[4] << 8 | data[5]) << 8) | data[6]) << 8) | data[7]; + if (syncword == 0xf8726fba) + { +@@ -822,7 +830,7 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t *data, unsigned int size) + return skip; + + /* verify the parity */ +- int p = 0; ++ int p = 0; + uint8_t check = 0; + for (int i = -1; i < m_substreams; ++i) + { +@@ -839,7 +847,7 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t *data, unsigned int size) + if ((((check >> 4) ^ check) & 0xF) != 0xF) + { + /* lost sync */ +- m_hasSync = false; ++ m_hasSync = false; + CLog::Log(LOGINFO, "CAEStreamParser::SyncTrueHD - Sync Lost"); + continue; + } +@@ -852,7 +860,6 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t *data, unsigned int size) + } + + /* lost sync */ +- m_hasSync = false; ++ m_hasSync = false; + return skip; + } +- + +From 57df7a71ad80d644075dcba971d65fd1fe7cf1f6 Mon Sep 17 00:00:00 2001 +From: Dom Cobley +Date: Fri, 5 May 2023 18:29:28 +0100 +Subject: [PATCH 3/4] AEStreamInfo: Make comments follow code guidelines + +No functional change +--- + xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp | 132 +++++++++--------- + 1 file changed, 65 insertions(+), 67 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +index 5ce9a33ce471e..c98a306827880 100644 +--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp ++++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +@@ -104,8 +104,8 @@ void CAEStreamParser::Reset() + + int CAEStreamParser::AddData(uint8_t* data, + unsigned int size, +- uint8_t** buffer /* = NULL */, +- unsigned int* bufferSize /* = 0 */) ++ uint8_t** buffer, ++ unsigned int* bufferSize) + { + if (size == 0) + { +@@ -166,12 +166,12 @@ int CAEStreamParser::AddData(uint8_t* data, + break; + else + { +- /* lost sync */ ++ // lost sync + m_syncFunc = &CAEStreamParser::DetectType; + m_info.m_type = CAEStreamInfo::STREAM_TYPE_NULL; + m_info.m_repeat = 1; + +- /* if the buffer is full, or the offset < the buffer size */ ++ // if the buffer is full, or the offset < the buffer size + if (m_bufferSize == sizeof(m_buffer) || offset < m_bufferSize) + { + m_bufferSize -= offset; +@@ -181,16 +181,16 @@ int CAEStreamParser::AddData(uint8_t* data, + } + } + +- /* if we got here, we acquired sync on the buffer */ ++ // if we got here, we acquired sync on the buffer + +- /* align the buffer */ ++ // align the buffer + if (offset) + { + m_bufferSize -= offset; + memmove(m_buffer, m_buffer + offset, m_bufferSize); + } + +- /* bytes to skip until the next packet */ ++ // bytes to skip until the next packet + m_skipBytes = std::max(0, (int)m_fsize - (int)m_bufferSize); + if (m_skipBytes) + { +@@ -210,42 +210,40 @@ int CAEStreamParser::AddData(uint8_t* data, + + void CAEStreamParser::GetPacket(uint8_t** buffer, unsigned int* bufferSize) + { +- /* if the caller wants the packet */ ++ // if the caller wants the packet + if (buffer) + { +- /* if it is dtsHD and we only want the core, just fetch that */ ++ // if it is dtsHD and we only want the core, just fetch that + unsigned int size = m_fsize; + if (m_info.m_type == CAEStreamInfo::STREAM_TYPE_DTSHD_CORE) + size = m_coreSize; + +- /* make sure the buffer is allocated and big enough */ ++ // make sure the buffer is allocated and big enough + if (!*buffer || !bufferSize || *bufferSize < size) + { + delete[] * buffer; + *buffer = new uint8_t[size]; + } + +- /* copy the data into the buffer and update the size */ ++ // copy the data into the buffer and update the size + memcpy(*buffer, m_buffer, size); + if (bufferSize) + *bufferSize = size; + } + +- /* remove the parsed data from the buffer */ ++ // remove the parsed data from the buffer + m_bufferSize -= m_fsize; + memmove(m_buffer, m_buffer + m_fsize, m_bufferSize); + m_fsize = 0; + m_coreSize = 0; + } + +-/* SYNC FUNCTIONS */ ++// SYNC FUNCTIONS + +-/* +- This function looks for sync words across the types in parallel, and only does an exhaustive +- test if it finds a syncword. Once sync has been established, the relevant sync function sets +- m_syncFunc to itself. This function will only be called again if total sync is lost, which +- allows is to switch stream types on the fly much like a real receiver does. +-*/ ++// This function looks for sync words across the types in parallel, and only does an exhaustive ++// test if it finds a syncword. Once sync has been established, the relevant sync function sets ++// m_syncFunc to itself. This function will only be called again if total sync is lost, which ++// allows is to switch stream types on the fly much like a real receiver does. + unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + { + unsigned int skipped = 0; +@@ -253,7 +251,7 @@ unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + + while (size > 8) + { +- /* if it could be DTS */ ++ // if it could be DTS + unsigned int header = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3]; + if (header == DTS_PREAMBLE_14LE || header == DTS_PREAMBLE_14BE || header == DTS_PREAMBLE_16LE || + header == DTS_PREAMBLE_16BE) +@@ -265,7 +263,7 @@ unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + possible = skipped; + } + +- /* if it could be AC3 */ ++ // if it could be AC3 + if (data[0] == 0x0b && data[1] == 0x77) + { + unsigned int skip = SyncAC3(data, size); +@@ -275,7 +273,7 @@ unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + possible = skipped; + } + +- /* if it could be TrueHD */ ++ // if it could be TrueHD + if (data[4] == 0xf8 && data[5] == 0x72 && data[6] == 0x6f && data[7] == 0xba) + { + unsigned int skip = SyncTrueHD(data, size); +@@ -285,7 +283,7 @@ unsigned int CAEStreamParser::DetectType(uint8_t* data, unsigned int size) + possible = skipped; + } + +- /* move along one byte */ ++ // move along one byte + --size; + ++skipped; + ++data; +@@ -302,7 +300,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + if (size < 8) + return false; + +- /* look for an ac3 sync word */ ++ // look for an ac3 sync word + if (data[0] != 0x0b || data[1] != 0x77) + return false; + +@@ -327,7 +325,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + + if (bsid <= 10) + { +- /* Normal AC-3 */ ++ // Normal AC-3 + + if (wantEAC3dependent) + return false; +@@ -337,7 +335,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + if (fscod == 3 || frmsizecod > 37) + return false; + +- /* get the details we need to check crc1 and framesize */ ++ // get the details we need to check crc1 and framesize + unsigned int bitRate = AC3Bitrates[frmsizecod >> 1]; + unsigned int framesize = 0; + switch (fscod) +@@ -356,30 +354,30 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + m_fsize = framesize << 1; + m_info.m_sampleRate = AC3FSCod[fscod]; + +- /* dont do extensive testing if we have not lost sync */ ++ // dont do extensive testing if we have not lost sync + if (m_info.m_type == CAEStreamInfo::STREAM_TYPE_AC3 && !resyncing) + return true; + +- /* this may be the main stream of EAC3 */ ++ // this may be the main stream of EAC3 + unsigned int fsizeMain = m_fsize; + unsigned int reqBytes = fsizeMain + 8; + if (size < reqBytes) + { +- /* not enough data to check for E-AC3 dependent frame, request more */ ++ // not enough data to check for E-AC3 dependent frame, request more + m_needBytes = reqBytes; + m_fsize = 0; +- /* no need to resync => return true */ ++ // no need to resync => return true + return true; + } +- if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) ++ if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, true)) + { +- /* concatenate the main and dependent frames */ ++ // concatenate the main and dependent frames + m_fsize += fsizeMain; + return true; + } + + unsigned int crc_size; +- /* if we have enough data, validate the entire packet, else try to validate crc2 (5/8 of the packet) */ ++ // if we have enough data, validate the entire packet, else try to validate crc2 (5/8 of the packet) + if (framesize <= size) + crc_size = framesize - 1; + else +@@ -389,7 +387,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &data[2], crc_size * 2)) + return false; + +- /* if we get here, we can sync */ ++ // if we get here, we can sync + m_hasSync = true; + m_info.m_channels = AC3Channels[acmod] + lfeon; + m_syncFunc = &CAEStreamParser::SyncAC3; +@@ -440,22 +438,22 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + m_fsize = framesize << 1; + m_info.m_repeat = MAX_EAC3_BLOCKS / blocks; + +- /* EAC3 can have a dependent stream too */ ++ // EAC3 can have a dependent stream too + if (!wantEAC3dependent) + { + unsigned int fsizeMain = m_fsize; + unsigned int reqBytes = fsizeMain + 8; + if (size < reqBytes) + { +- /* not enough data to check for E-AC3 dependent frame, request more */ ++ // not enough data to check for E-AC3 dependent frame, request more + m_needBytes = reqBytes; + m_fsize = 0; +- /* no need to resync => return true */ ++ // no need to resync => return true + return true; + } +- if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, /*wantEAC3dependent*/ true)) ++ if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, true)) + { +- /* concatenate the main and dependent frames */ ++ // concatenate the main and dependent frames + m_fsize += fsizeMain; + return true; + } +@@ -484,7 +482,7 @@ unsigned int CAEStreamParser::SyncAC3(uint8_t* data, unsigned int size) + for (; size - skip > 7; ++skip, ++data) + { + bool resyncing = (skip != 0); +- if (TrySyncAC3(data, size - skip, resyncing, /*wantEAC3dependent*/ false)) ++ if (TrySyncAC3(data, size - skip, resyncing, false)) + return skip; + } + +@@ -519,7 +517,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + + switch (header) + { +- /* 14bit BE */ ++ // 14bit BE + case DTS_PREAMBLE_14BE: + if (data[4] != 0x07 || (data[5] & 0xf0) != 0xf0) + continue; +@@ -535,7 +533,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + bits = 14; + break; + +- /* 14bit LE */ ++ // 14bit LE + case DTS_PREAMBLE_14LE: + if (data[5] != 0x07 || (data[4] & 0xf0) != 0xf0) + continue; +@@ -551,7 +549,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + bits = 14; + break; + +- /* 16bit BE */ ++ // 16bit BE + case DTS_PREAMBLE_16BE: + dtsBlocks = (((data[4] & 0x1) << 7) | ((data[5] & 0xFC) >> 2)) + 1; + m_fsize = (((((data[5] & 0x3) << 8) | data[6]) << 4) | ((data[7] & 0xF0) >> 4)) + 1; +@@ -565,7 +563,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + bits = 16; + break; + +- /* 16bit LE */ ++ // 16bit LE + case DTS_PREAMBLE_16LE: + dtsBlocks = (((data[5] & 0x1) << 7) | ((data[4] & 0xFC) >> 2)) + 1; + m_fsize = (((((data[4] & 0x3) << 8) | data[7]) << 4) | ((data[6] & 0xF0) >> 4)) + 1; +@@ -586,7 +584,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + if (sfreq == 0 || sfreq >= DTS_SFREQ_COUNT) + continue; + +- /* make sure the framesize is sane */ ++ // make sure the framesize is sane + if (m_fsize < 96 || m_fsize > 16384) + continue; + +@@ -611,14 +609,14 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + if (invalid) + continue; + +- /* adjust the fsize for 14 bit streams */ ++ // adjust the fsize for 14 bit streams + if (bits == 14) + m_fsize = m_fsize / 14 * 16; + +- /* we need enough data to check for DTS-HD */ ++ // we need enough data to check for DTS-HD + if (size - skip < m_fsize + 10) + { +- /* we can assume DTS sync at this point */ ++ // we can assume DTS sync at this point + m_syncFunc = &CAEStreamParser::SyncDTS; + m_needBytes = m_fsize + 10; + m_fsize = 0; +@@ -626,7 +624,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + return skip; + } + +- /* look for DTS-HD */ ++ // look for DTS-HD + hd_sync = (data[m_fsize] << 24) | (data[m_fsize + 1] << 16) | (data[m_fsize + 2] << 8) | + data[m_fsize + 3]; + if (hd_sync == DTS_PREAMBLE_HD) +@@ -651,7 +649,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + hd_sync = data[m_fsize + header_size] << 24 | data[m_fsize + header_size + 1] << 16 | + data[m_fsize + header_size + 2] << 8 | data[m_fsize + header_size + 3]; + +- /* set the type according to core or not */ ++ // set the type according to core or not + if (m_coreOnly) + dataType = CAEStreamInfo::STREAM_TYPE_DTSHD_CORE; + else if (hd_sync == DTS_PREAMBLE_XLL) +@@ -681,7 +679,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + + if (dataType == CAEStreamInfo::STREAM_TYPE_DTSHD_MA) + { +- m_info.m_channels += 2; /* FIXME: this needs to be read out, not sure how to do that yet */ ++ m_info.m_channels += 2; // FIXME: this needs to be read out, not sure how to do that yet + m_info.m_dtsPeriod = (192000 * (8 >> 1)) * (m_dtsBlocks << 5) / m_info.m_sampleRate; + } + else if (dataType == CAEStreamInfo::STREAM_TYPE_DTSHD) +@@ -740,7 +738,7 @@ unsigned int CAEStreamParser::SyncDTS(uint8_t* data, unsigned int size) + return skip; + } + +- /* lost sync */ ++ // lost sync + CLog::Log(LOGINFO, "CAEStreamParser::SyncDTS - DTS sync lost"); + m_hasSync = false; + return skip; +@@ -759,23 +757,23 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + unsigned int left = size; + unsigned int skip = 0; + +- /* if MLP */ ++ // if MLP + for (; left; ++skip, ++data, --left) + { +- /* if we dont have sync and there is less the 8 bytes, then break out */ ++ // if we dont have sync and there is less the 8 bytes, then break out + if (!m_hasSync && left < 8) + return size; + +- /* if its a major audio unit */ ++ // if its a major audio unit + uint16_t length = ((data[0] & 0x0F) << 8 | data[1]) << 1; + uint32_t syncword = ((((data[4] << 8 | data[5]) << 8) | data[6]) << 8) | data[7]; + if (syncword == 0xf8726fba) + { +- /* we need 32 bytes to sync on a master audio unit */ ++ // we need 32 bytes to sync on a master audio unit + if (left < 32) + return skip; + +- /* get the rate and ensure its valid */ ++ // get the rate and ensure its valid + int rate = (data[8] & 0xf0) >> 4; + if (rate == 0xF) + continue; +@@ -783,7 +781,7 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + unsigned int major_sync_size = 28; + if (data[29] & 1) + { +- /* extension(s) present, look up count */ ++ // extension(s) present, look up count + int extension_count = data[30] >> 4; + major_sync_size += 2 + extension_count * 2; + } +@@ -791,17 +789,17 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + if (left < 4 + major_sync_size) + return skip; + +- /* verify the crc of the audio unit */ ++ // verify the crc of the audio unit + uint16_t crc = av_crc(m_crcTrueHD, 0, data + 4, major_sync_size - 4); + crc ^= (data[4 + major_sync_size - 3] << 8) | data[4 + major_sync_size - 4]; + if (((data[4 + major_sync_size - 1] << 8) | data[4 + major_sync_size - 2]) != crc) + continue; + +- /* get the sample rate and substreams, we have a valid master audio unit */ ++ // get the sample rate and substreams, we have a valid master audio unit + m_info.m_sampleRate = (rate & 0x8 ? 44100 : 48000) << (rate & 0x7); + m_substreams = (data[20] & 0xF0) >> 4; + +- /* get the number of encoded channels */ ++ // get the number of encoded channels + uint16_t channel_map = ((data[10] & 0x1F) << 8) | data[11]; + if (!channel_map) + channel_map = (data[9] << 1) | (data[10] >> 7); +@@ -821,15 +819,15 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + } + else + { +- /* we cant sink to a subframe until we have the information from a master audio unit */ ++ // we cant sink to a subframe until we have the information from a master audio unit + if (!m_hasSync) + continue; + +- /* if there is not enough data left to verify the packet, just return the skip amount */ ++ // if there is not enough data left to verify the packet, just return the skip amount + if (left < (unsigned int)m_substreams * 4) + return skip; + +- /* verify the parity */ ++ // verify the parity + int p = 0; + uint8_t check = 0; + for (int i = -1; i < m_substreams; ++i) +@@ -843,10 +841,10 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + } + } + +- /* if the parity nibble does not match */ ++ // if the parity nibble does not match + if ((((check >> 4) ^ check) & 0xF) != 0xF) + { +- /* lost sync */ ++ // lost sync + m_hasSync = false; + CLog::Log(LOGINFO, "CAEStreamParser::SyncTrueHD - Sync Lost"); + continue; +@@ -859,7 +857,7 @@ unsigned int CAEStreamParser::SyncTrueHD(uint8_t* data, unsigned int size) + } + } + +- /* lost sync */ ++ // lost sync + m_hasSync = false; + return skip; + } + +From eb85829058e27d9c92ccc1449cbd650186c01c17 Mon Sep 17 00:00:00 2001 +From: Stephan Sundermann +Date: Wed, 17 May 2023 22:29:08 +0200 +Subject: [PATCH 4/4] [StreamInfo] Fix EAC3 frame size + +The field m_ac3FrameSize was never updated with the concatenated value of the independent and dependent substream +--- + xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +index c98a306827880..f12a0253e17ee 100644 +--- a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp ++++ b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp +@@ -369,6 +369,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + // no need to resync => return true + return true; + } ++ m_info.m_ac3FrameSize = fsizeMain; + if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, true)) + { + // concatenate the main and dependent frames +@@ -392,7 +393,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + m_info.m_channels = AC3Channels[acmod] + lfeon; + m_syncFunc = &CAEStreamParser::SyncAC3; + m_info.m_type = CAEStreamInfo::STREAM_TYPE_AC3; +- m_info.m_ac3FrameSize = m_fsize; ++ m_info.m_ac3FrameSize += m_fsize; + m_info.m_repeat = 1; + + CLog::Log(LOGINFO, "CAEStreamParser::TrySyncAC3 - AC3 stream detected ({} channels, {}Hz)", +@@ -451,6 +452,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + // no need to resync => return true + return true; + } ++ m_info.m_ac3FrameSize = fsizeMain; + if (TrySyncAC3(data + fsizeMain, size - fsizeMain, resyncing, true)) + { + // concatenate the main and dependent frames +@@ -467,7 +469,7 @@ bool CAEStreamParser::TrySyncAC3(uint8_t* data, + m_info.m_channels = AC3Channels[acmod] + lfeon; + m_syncFunc = &CAEStreamParser::SyncAC3; + m_info.m_type = CAEStreamInfo::STREAM_TYPE_EAC3; +- m_info.m_ac3FrameSize = m_fsize; ++ m_info.m_ac3FrameSize += m_fsize; + + CLog::Log(LOGINFO, "CAEStreamParser::TrySyncAC3 - E-AC3 stream detected ({} channels, {}Hz)", + m_info.m_channels, m_info.m_sampleRate); From 248f640eadc9cfb6825ef557cd4a165687b90bda Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 20 Jun 2023 13:57:38 +0000 Subject: [PATCH 156/157] pvr.zattoo: update 20.3.8-Nexus to 20.3.9-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk index 212a275b6b..a9d78a8bfd 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.zattoo" -PKG_VERSION="20.3.8-Nexus" -PKG_SHA256="451d4e4dbdca71c9bd31d3d11528db4759b93c323476e5e881f617fa3eadc600" +PKG_VERSION="20.3.9-Nexus" +PKG_SHA256="f4f7bbdb9704d3844a0e31ae552e35d9c83d738b41aaa3637d9a550e2dd535f5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From bcb3a254e57dc1afbe8be67c1e83477bf920d801 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 23 Jun 2023 12:47:38 +0000 Subject: [PATCH 157/157] pvr.zattoo: update 20.3.9-Nexus to 20.3.10-Nexus --- packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk index a9d78a8bfd..208f4d0708 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pvr.zattoo" -PKG_VERSION="20.3.9-Nexus" -PKG_SHA256="f4f7bbdb9704d3844a0e31ae552e35d9c83d738b41aaa3637d9a550e2dd535f5" +PKG_VERSION="20.3.10-Nexus" +PKG_SHA256="68aa0a3af4f10396c866b0da225928033d0bbf980b8884c944dd1829e013435d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"