diff --git a/packages/linux/package.mk b/packages/linux/package.mk index c49483a70c..a9df51dc87 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="d60c95efffe84428e3611431bf688f50bfc13f4e" # 6.1.11 - PKG_SHA256="e6d5524d72b0ccb047a429f4d46a119a823622507c14985e95f8aa3e2600a779" + PKG_VERSION="7d54cb2c26dad1264ecca85992bfe8984df4b7b5" # 6.1.14 + PKG_SHA256="76f039741d61e06c740b846291e5017b97da7d3f91fb2f368230a161d46905a6" 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/packages/sysutils/busybox/scripts/vfd-clock b/packages/sysutils/busybox/scripts/vfd-clock index f43ac7e44a..a4618ea3cb 100755 --- a/packages/sysutils/busybox/scripts/vfd-clock +++ b/packages/sysutils/busybox/scripts/vfd-clock @@ -23,7 +23,7 @@ do_stop(){ } case $(dtname) in - oranth,tx3-mini|oranth,tx9-pro) + oranth,tx3-mini|oranth,tx9-pro|sunvell,t95z-plus) LED_PATH_COLON="/sys/devices/platform/spi/spi_master/spi0/spi0.0/leds/:colon/brightness" LED_PATH_TEXT="/sys/devices/platform/spi/spi_master/spi0/spi0.0/display_text" ;; diff --git a/packages/tools/emmctool/scripts/emmctool b/packages/tools/emmctool/scripts/emmctool index 653d25e016..cd76b47b0d 100755 --- a/packages/tools/emmctool/scripts/emmctool +++ b/packages/tools/emmctool/scripts/emmctool @@ -148,19 +148,31 @@ do_write(){ do_umount case $(dtname) in - radxa,zero) + radxa,zero*) do_writeprotect ;; esac - if [ "${2: -7}" == ".img.gz" ]; then - echo "info: writing ${2} to ${EMMC}" - gunzip -c "${2}" | dd of="${EMMC}" bs=1M - elif [ "${2: -4}" == ".img" ]; then - echo "info: writing ${2} to ${EMMC}" - dd if="${2}" of="${EMMC}" bs=1M + if [ -e "${2}" ]; then + case "${2}" in + *box.img.gz|*box.img) + echo "error: ${2} is not a bootable image, aborting!" + exit 1 + ;; + *.img.gz) + echo "info: writing ${2} to ${EMMC}" + gunzip -c "${2}" | dd of="${EMMC}" bs=1M + ;; + *.img) + echo "info: writing ${2} to ${EMMC}" + dd if="${2}" of="${EMMC}" bs=1M + ;; + *) + echo "error: ${2} is not a valid image file!" + exit 1 + esac else - echo "error: ${2} is not a valid image file!" + echo "error: ${2} not found!" exit 1 fi } diff --git a/projects/Amlogic/config/kernel-firmware.dat b/projects/Amlogic/config/kernel-firmware.dat index 98c9b19018..935339968d 100644 --- a/projects/Amlogic/config/kernel-firmware.dat +++ b/projects/Amlogic/config/kernel-firmware.dat @@ -8,9 +8,17 @@ rtlwifi/rtl8192cufw_TMSC.bin rtlwifi/rtl8192cufw.bin rtlwifi/rtl8192eu_nic.bin rtlwifi/rtl8723bs_nic.bin +rtw88/rtw8821c_fw.bin +rtw88/rtw8822c_fw.bin +rtw88/rtw8822c_wow_fw.bin rtl_bt/rtl8723bs_fw.bin rtl_bt/rtl8723bs_config-OBDA8723.bin +rtl_bt/rtl8821c_config.bin +rtl_bt/rtl8821c_fw.bin rtl_bt/rtl8822cs_config.bin rtl_bt/rtl8822cs_fw.bin +rtl_bt/rtl8822cu_config.bin +rtl_bt/rtl8822cu_fw.bin rtl_nic/rtl8153a-3.fw +rtl_nic/rtl8168h-2.fw meson 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 982ffa724e..4a8da94498 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 96c275bc11a788a05f203a350cb554a249e51eae Mon Sep 17 00:00:00 2001 +From 6142085e9460414a2fc7f51f0a52afea5eaf0923 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:41:51 +0000 -Subject: [PATCH 001/111] LOCAL: set meson-gx cma pool to 896MB +Subject: [PATCH 001/119] 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 023a52005494..ca0d1733d515 100644 +index fa6cff4a2ebc..5ee7640fad06 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 f65ff8a4ed..6c80208d35 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 b381fd01e0f8121106c943ce2e97965b5a8f1eb5 Mon Sep 17 00:00:00 2001 +From c0df9052aeb8d47bc2a18e0873b20fb68b54321a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 14 Aug 2019 19:58:14 +0000 -Subject: [PATCH 002/111] LOCAL: set meson-g12 cma pool to 896MB +Subject: [PATCH 002/119] 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 45947c1031c4..2c56b216d6f9 100644 +index 894cea697550..8be0381cd419 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 6778e6233d..49e9890c83 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 254a90493072296f96a1f3ff12a2909fce8845fd Mon Sep 17 00:00:00 2001 +From 980967e34f6463f7b8dc3d37e7a255abb4950dfc Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 13 Apr 2019 05:45:18 +0000 -Subject: [PATCH 003/111] LOCAL: arm64: fix Kodi sysinfo CPU information +Subject: [PATCH 003/119] 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 ed1331a70c..2e0a3782aa 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 d9578c193745e8bc6351705b4048c666906abb9e Mon Sep 17 00:00:00 2001 +From 6ef4c65b5e4796e163beb7241cdb0b5d2c7698de Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:23 +0100 -Subject: [PATCH 004/111] LOCAL: arm64: meson: add Amlogic Meson GX PM Suspend +Subject: [PATCH 004/119] 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 4771d37c32..8eead0cde1 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 db9cc13e36dbbf385e625e69571ef987a3322c0d Mon Sep 17 00:00:00 2001 +From 2712b6a5207c3bdff9612c9938ee0d97a683e007 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 3 Nov 2016 15:29:25 +0100 -Subject: [PATCH 005/111] LOCAL: arm64: dts: meson: add support for GX PM and +Subject: [PATCH 005/119] 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 ca0d1733d515..b278a8380f8a 100644 +index 5ee7640fad06..b8e43b406cec 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 b6617f3511..94fe062c67 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 8031cf2c53a83213f9e2334041d03e9284cac733 Mon Sep 17 00:00:00 2001 +From 694b9b83d3442791ee6d6c01868d04357bc9b782 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 21 Jan 2021 01:35:36 +0000 -Subject: [PATCH 006/111] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 006/119] 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 911f6d4426..d4a8488c0c 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 e94b053abcbd21ae957cb23de89cc82e5d3a045c Mon Sep 17 00:00:00 2001 +From 70d3c7b8d66da08a0deef1c99657ed822b7131b0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 6 Nov 2021 13:01:08 +0000 -Subject: [PATCH 007/111] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 007/119] 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 fa331cf0f4..3f5512a399 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 d2f7e226584a6b78399478299fd5ba3a2e1d671c Mon Sep 17 00:00:00 2001 +From a2df580982a2c364aa35da82aa66feddf2e56f36 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 1 Feb 2021 19:27:40 +0000 -Subject: [PATCH 008/111] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 008/119] 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 3c2fd9628d..ce68e41167 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 76e432285ba1ec0f38c73ba98557f65363ad6049 Mon Sep 17 00:00:00 2001 +From 86032671e6f5efd8eac2ba503c50b10f538e2c52 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 17 Apr 2022 04:37:48 +0000 -Subject: [PATCH 009/111] LOCAL: ALSA: Assign internal PCM chmap/ELD/IEC958 +Subject: [PATCH 009/119] 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 7454a8ba82..848e870e0d 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 13366cc3b3163c1f4523074ef23d85d0022ceed2 Mon Sep 17 00:00:00 2001 +From 95087f3fd82785ef72de4dc4ab3364a76ecbfdf4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 3 Jan 2022 10:44:17 +0000 -Subject: [PATCH 010/111] LOCAL: usb: hub: disable autosuspend for Genesys +Subject: [PATCH 010/119] 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 0116ee959d..dcb7a837d3 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 3a73eb6db4399030da096bd884c382be9a8fac93 Mon Sep 17 00:00:00 2001 +From 9742de1efcdbf512e3ee5671e0b5d4b7b2dde9d1 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 15 Sep 2021 05:00:45 +0000 -Subject: [PATCH 011/111] LOCAL: of: partial revert of fdt.c changes +Subject: [PATCH 011/119] 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-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch index ec4e4889ba..412ee8dbf7 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-0012-FROMGIT-6.2-Revert-arm64-dts-meson-sm1-odroid-hc4-di.patch @@ -1,7 +1,7 @@ -From 3837d793e505f1578b55b89ee079b89cd89fb274 Mon Sep 17 00:00:00 2001 +From 933161dcf2708d0d8765f0134d6cf08f0634737f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 4 Jan 2023 15:19:06 +0000 -Subject: [PATCH 012/111] FROMGIT(6.2): Revert "arm64: dts: +Subject: [PATCH 012/119] 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-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch index 6a4ff68d0c..f7cdca579b 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-0013-FROMGIT-6.3-arm64-dts-meson-remove-CPU-opps-below-1G.patch @@ -1,7 +1,7 @@ -From e7055f8ff6e60ef492d6c1baef6cbfec6a346668 Mon Sep 17 00:00:00 2001 +From 04e35d23966417d7feea63379cfa97734e88882c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 19 Jan 2023 05:03:53 +0000 -Subject: [PATCH 013/111] FROMGIT(6.3): arm64: dts: meson: remove CPU opps +Subject: [PATCH 013/119] 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-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch index 163e349dc4..457910fb04 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-0014-FROMGIT-6.3-arm64-dts-meson-add-Broadcom-WiFi-to-P21.patch @@ -1,7 +1,7 @@ -From 673311690caf7aaf2c5436d1c1fe659923722266 Mon Sep 17 00:00:00 2001 +From dbc56924b4ef2ef4929dbbd3a71dd5f9c587cb56 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:50:01 +0000 -Subject: [PATCH 014/111] FROMGIT(6.3): arm64: dts: meson: add Broadcom WiFi to +Subject: [PATCH 014/119] 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-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch index 3749e4f44e..cdfe5c9a29 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-0015-FROMGIT-6.3-arm64-dts-meson-move-pwm_ef-node-in-P212.patch @@ -1,7 +1,7 @@ -From c57576fe884da0e37c2d8e2cfb60384bf1ef1525 Mon Sep 17 00:00:00 2001 +From 734fe8a9758c83353f4e87d92217fe3f0c94a773 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:56:12 +0000 -Subject: [PATCH 015/111] FROMGIT(6.3): arm64: dts: meson: move pwm_ef node in +Subject: [PATCH 015/119] 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-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch index 3b6a2fe719..fcd4482aca 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-0016-FROMGIT-6.3-arm64-dts-meson-remove-WiFi-BT-nodes-fro.patch @@ -1,7 +1,7 @@ -From 88b550fb8d8e2ae36f5dec1af6bcba7a354adfd9 Mon Sep 17 00:00:00 2001 +From 687aa721901391c0d26b6f11b164963881cccde0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 03:58:58 +0000 -Subject: [PATCH 016/111] FROMGIT(6.3): arm64: dts: meson: remove WiFi/BT nodes +Subject: [PATCH 016/119] 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-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch index 9637f7cef4..6fbb2ada58 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-0017-FROMGIT-6.3-arm64-dts-meson-add-audio-playback-to-S9.patch @@ -1,7 +1,7 @@ -From 0442a4911ff03670d8e6b7ad5aa4cc92bcb185bf Mon Sep 17 00:00:00 2001 +From 5b1f67e6014292c83505302f67d7f0d1ebd8a93f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 13 Jan 2022 04:30:44 +0000 -Subject: [PATCH 017/111] FROMGIT(6.3): arm64: dts: meson: add audio playback +Subject: [PATCH 017/119] 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-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch index d6514c83dd..34bb62d480 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-0018-FROMGIT-6.3-dt-bindings-reset-meson-g12a-Add-missing.patch @@ -1,7 +1,7 @@ -From aabc97b6f87e7ec9c91be72d23a9e2d01fcae006 Mon Sep 17 00:00:00 2001 +From 2650a26be4c5432a8263096f2a89a5d10d270154 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:03:14 +0000 -Subject: [PATCH 018/111] FROMGIT(6.3): dt-bindings: reset: meson-g12a: Add +Subject: [PATCH 018/119] 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-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch index 3ee256c1d3..5a1daa1fc6 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-0019-FROMGIT-6.3-dt-bindings-power-Add-G12A-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From 5779ea2a58e718e36f7c1c908accb8d11e153587 Mon Sep 17 00:00:00 2001 +From 3d021e127ccda3f91708b37f14ad3ea1da299d1e Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:02 +0000 -Subject: [PATCH 019/111] FROMGIT(6.3): dt-bindings: power: Add G12A NNA power +Subject: [PATCH 019/119] 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-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch index ec32d0796e..73eb4319c3 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-0020-FROMGIT-6.3-soc-amlogic-meson-pwrc-Add-NNA-power-dom.patch @@ -1,7 +1,7 @@ -From f55721060b899c1608b331ddb6f1e5b2286cdfd5 Mon Sep 17 00:00:00 2001 +From 0e9313ae8e525d1d811e35a778fc17cf590661f7 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:04:51 +0000 -Subject: [PATCH 020/111] FROMGIT(6.3): soc: amlogic: meson-pwrc: Add NNA power +Subject: [PATCH 020/119] 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-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch index 2027d881a4..f1b9875280 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-0021-FROMGIT-6.3-arm64-dts-Add-DT-node-for-the-VIPNano-QI.patch @@ -1,7 +1,7 @@ -From 1375fb3e0e176ee81b4836662851680795dbb8ce Mon Sep 17 00:00:00 2001 +From fe1c33c1c209927e3cf08485eba3498275dccc32 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 30 Nov 2022 12:05:46 +0000 -Subject: [PATCH 021/111] FROMGIT(6.3): arm64: dts: Add DT node for the +Subject: [PATCH 021/119] 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 2c56b216d6f9..ac5280df143e 100644 +index 8be0381cd419..146610cbf05e 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-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch index 24e5c51165..c32a7ac33d 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-0022-FROMGIT-6.3-drm-etnaviv-Add-nn_core_count-to-chip-fe.patch @@ -1,7 +1,7 @@ -From 040be3af745825591836564525c21c2168bf2067 Mon Sep 17 00:00:00 2001 +From 88b256191bb62756826193b5b8cce03f046bd946 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:01:47 +0000 -Subject: [PATCH 022/111] FROMGIT(6.3): drm/etnaviv: Add nn_core_count to chip +Subject: [PATCH 022/119] 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-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch index 5289a0003c..556d3fe37f 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-0023-FROMGIT-6.3-drm-etnaviv-Warn-when-probing-on-NPUs.patch @@ -1,7 +1,7 @@ -From 23de0a186d883057b2d9d1baaab20dd0799c66bf Mon Sep 17 00:00:00 2001 +From 6bc70bd7f8321a13dab880378d239c813a6c74c1 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:02:31 +0000 -Subject: [PATCH 023/111] FROMGIT(6.3): drm/etnaviv: Warn when probing on NPUs +Subject: [PATCH 023/119] 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-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch index 26ea770d5a..479a05c455 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-0024-FROMGIT-6.3-drm-etnaviv-add-HWDB-entry-for-VIPNano-Q.patch @@ -1,7 +1,7 @@ -From de2f35d7917a0c3a1ab70105ca19a37cd5e7f6e9 Mon Sep 17 00:00:00 2001 +From 726e813f6501345007ebca68891fd137945b8a88 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:03:16 +0000 -Subject: [PATCH 024/111] FROMGIT(6.3): drm/etnaviv: add HWDB entry for +Subject: [PATCH 024/119] 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-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch index 7f998accfd..5286242275 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-0025-FROMGIT-6.3-arm64-dts-Fix-NPU-power-domain-reference.patch @@ -1,7 +1,7 @@ -From fbdbc0b5333c5a16a96e84c3f7b5af251adec4a5 Mon Sep 17 00:00:00 2001 +From b314d9f65e9d729c33229230c61a6d7ca05d67ab Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Sat, 3 Dec 2022 06:04:00 +0000 -Subject: [PATCH 025/111] FROMGIT(6.3): arm64: dts: Fix NPU power domain +Subject: [PATCH 025/119] 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 ac5280df143e..6841e1909250 100644 +index 146610cbf05e..749d5b3e3554 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-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch index 67793e4b92..9f181383d1 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-0026-FROMGIT-6.3-clk-meson-mpll-Switch-from-.round_rate-t.patch @@ -1,7 +1,7 @@ -From 8278874258d78e4457481affb7ffd826e2408db2 Mon Sep 17 00:00:00 2001 +From feb3f7acd48af99a6a3cc3e247f1ee39dd8c0727 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:41:46 +0000 -Subject: [PATCH 026/111] FROMGIT(6.3): clk: meson: mpll: Switch from +Subject: [PATCH 026/119] 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-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch index 4507d3c694..af27f4ff86 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-0027-FROMGIT-6.3-clk-meson-dualdiv-switch-from-.round_rat.patch @@ -1,7 +1,7 @@ -From ceecaec793943916fdb1cfe79eafb3cf52dde66a Mon Sep 17 00:00:00 2001 +From d446faa2fd433dcdddf9bb3c6903fb41f21cc7de Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:42:41 +0000 -Subject: [PATCH 027/111] FROMGIT(6.3): clk: meson: dualdiv: switch from +Subject: [PATCH 027/119] 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-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch index ea959d0738..425850cd96 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-0028-FROMGIT-6.3-clk-meson-sclk-div-switch-from-.round_ra.patch @@ -1,7 +1,7 @@ -From 8bb0710558620503e3ec7cafc38738f5a9b93d3c Mon Sep 17 00:00:00 2001 +From b25c8b76c5c500741e1bae5be92f40af8302646f Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:43:33 +0000 -Subject: [PATCH 028/111] FROMGIT(6.3): clk: meson: sclk-div: switch from +Subject: [PATCH 028/119] 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-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch index e102cbe4c2..ddf522e1d2 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-0029-FROMGIT-6.3-clk-meson-clk-cpu-dyndiv-switch-from-.ro.patch @@ -1,7 +1,7 @@ -From 0c09663824b014b6c804bb8add4ab9cec14d800f Mon Sep 17 00:00:00 2001 +From b3173d4cbebb7494013b2471869f61aa7c50523b Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Mon, 26 Dec 2022 04:44:26 +0000 -Subject: [PATCH 029/111] FROMGIT(6.3): clk: meson: clk-cpu-dyndiv: switch from +Subject: [PATCH 029/119] 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-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch index e2607946ea..7ea47d5817 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-0030-FROMGIT-6.3-arm64-dts-amlogic-meson-sm1-odroid-hc4-f.patch @@ -1,7 +1,7 @@ -From b7216d87cf7ac3a8245e60686d6c366cf08ad0a4 Mon Sep 17 00:00:00 2001 +From 827db0a8686d83ae15ba6a60c219c9ca7a91a599 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Tue, 24 Jan 2023 12:39:08 +0100 -Subject: [PATCH 030/111] FROMGIT(6.3): arm64: dts: amlogic: +Subject: [PATCH 030/119] 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-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch index 1bba4651f5..547976d0d7 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-0031-FROMGIT-6.3-arm64-dts-meson-make-dts-use-gpio-fan-ma.patch @@ -1,7 +1,7 @@ -From 1319a6e3efd4430c98a8f140a88369575d9314c4 Mon Sep 17 00:00:00 2001 +From 6a563c7bffe748e52a415383f4fb9d1fcbf1caaa Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 27 Nov 2021 07:23:35 +0000 -Subject: [PATCH 031/111] FROMGIT(6.3): arm64: dts: meson: make dts use +Subject: [PATCH 031/119] 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-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch index 80f421b536..2b84e435ce 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-0032-FROMGIT-6.3-arm64-dts-meson-radxa-zero-allow-usb-otg.patch @@ -1,7 +1,7 @@ -From 90c3434be68f83289b15699de1ce6b7860992f4f Mon Sep 17 00:00:00 2001 +From 24cdc899972f989681b564140e1ac677cd0dc12a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 26 Jan 2023 12:20:19 +0000 -Subject: [PATCH 032/111] FROMGIT(6.3): arm64: dts: meson: radxa-zero: allow +Subject: [PATCH 032/119] 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-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch index 7f298a89fe..3a8e200faa 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-0033-FROMGIT-6.3-arm64-dts-meson-bananapi-m5-switch-VDDIO.patch @@ -1,7 +1,7 @@ -From e2ea4a7a55108c60d9e90f3fdcb1adb3158a8bb3 Mon Sep 17 00:00:00 2001 +From d4acc14701de1429557af4e427e4e85131f12802 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 26 Jan 2023 16:15:59 +0000 -Subject: [PATCH 033/111] FROMGIT(6.3): arm64: dts: meson: bananapi-m5: switch +Subject: [PATCH 033/119] 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-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch index c0dc8fa7c2..0f10888bfd 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-0034-FROMGIT-6.3-arm64-dts-meson-meson-sm1-bananapi-m5-co.patch @@ -1,7 +1,7 @@ -From 52c42f7f202692c55c448955875b326f9e885e49 Mon Sep 17 00:00:00 2001 +From fe8bd6ed716a8dee218e13d39eec3bf6df05f055 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:10:48 +0000 -Subject: [PATCH 034/111] FROMGIT(6.3): arm64: dts: meson: +Subject: [PATCH 034/119] 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-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 index 1576a33cbf..739bd2f779 100644 --- 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 @@ -1,7 +1,7 @@ -From 88b6e2cd10d2bcb2921f959c8d2781feae9e8e7d Mon Sep 17 00:00:00 2001 +From 84ce435b0892826680ab99807b7e086c8b5569f5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 09:28:27 +0000 -Subject: [PATCH 035/111] FROMGIT(6.3): dt-bindings: arm: amlogic: add support +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. 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-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch index 901e785480..854dd547a7 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-0036-FROMGIT-6.3-arm64-dts-meson-add-support-for-BananaPi.patch @@ -1,7 +1,7 @@ -From 1a6ff5c5aaf0f8f1e418766d09926eaac617e07e Mon Sep 17 00:00:00 2001 +From 8a627052d2914e54417e93d22900d3546d116e3a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 25 Jan 2023 08:13:28 +0000 -Subject: [PATCH 036/111] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 036/119] 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-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 8b8ddb8af0..bcff764519 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,7 +1,7 @@ -From 1ade064f078d44502e8f1bdfb9629364803916aa Mon Sep 17 00:00:00 2001 +From 7fa5cf2ed6c65f2071fcf92d5e1ede56322154f6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 16 Feb 2022 07:27:07 +0000 -Subject: [PATCH 037/111] FROMGIT(6.3): dt-bindings: arm: amlogic: add support +Subject: [PATCH 037/119] 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-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch index 976289d496..13aa301c17 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-0038-FROMGIT-6.3-arm64-dts-meson-add-support-for-Radxa-Ze.patch @@ -1,7 +1,7 @@ -From 1b7061d7b6255b8752d04c671bda9d2a250f9637 Mon Sep 17 00:00:00 2001 +From 158ba8f7ed4d4e6e774df5a400bdc63c70db384e Mon Sep 17 00:00:00 2001 From: Yuntian Zhang Date: Fri, 14 Jan 2022 15:50:02 +0000 -Subject: [PATCH 038/111] FROMGIT(6.3): arm64: dts: meson: add support for +Subject: [PATCH 038/119] 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-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch index 59feabac8e..4753aa2dfa 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-0039-FROMGIT-6.4-dt-bindings-net-add-amlogic-gxl-mdio-mul.patch @@ -1,7 +1,7 @@ -From 3ae86059d42184d4f7a8c73b2b8468076304230a Mon Sep 17 00:00:00 2001 +From 29d379e87a02cecbe4213618c2a66d1a03768d02 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:15 +0100 -Subject: [PATCH 039/111] FROMGIT(6.4): dt-bindings: net: add amlogic gxl mdio +Subject: [PATCH 039/119] 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-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch index c40c537cdd..1f235647b4 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-0040-FROMGIT-6.4-net-mdio-add-amlogic-gxl-mdio-mux-suppor.patch @@ -1,7 +1,7 @@ -From 5fefed97cf53d24b221ba5c4dd7d9dabb5adc25c Mon Sep 17 00:00:00 2001 +From 3fa339d30ff897466809b54738aef7b0884f1b54 Mon Sep 17 00:00:00 2001 From: Jerome Brunet Date: Mon, 30 Jan 2023 16:16:16 +0100 -Subject: [PATCH 040/111] FROMGIT(6.4): net: mdio: add amlogic gxl mdio mux +Subject: [PATCH 040/119] 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-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch new file mode 100644 index 0000000000..6c1fd29a50 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMGIT-6.4-mmc-meson-gx-remove-meson_mmc_get_cd.patch @@ -0,0 +1,51 @@ +From 90b6d6340680523ec3b0390d182f058fe4cfd272 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 + +MMC core only checks whether return value of .get_cd() equals zero. +Therefore -ENOSYS and 1 are effectively the same and the function +can be removed. + +Signed-off-by: Heiner Kallweit +--- + drivers/mmc/host/meson-gx-mmc.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c +index 5c94ad4661ce..a1051a853f91 100644 +--- a/drivers/mmc/host/meson-gx-mmc.c ++++ b/drivers/mmc/host/meson-gx-mmc.c +@@ -1083,20 +1083,6 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) + return IRQ_HANDLED; + } + +-/* +- * NOTE: we only need this until the GPIO/pinctrl driver can handle +- * interrupts. For now, the MMC core will use this for polling. +- */ +-static int meson_mmc_get_cd(struct mmc_host *mmc) +-{ +- int status = mmc_gpio_get_cd(mmc); +- +- if (status == -ENOSYS) +- return 1; /* assume present */ +- +- return status; +-} +- + static void meson_mmc_cfg_init(struct meson_host *host) + { + u32 cfg = 0; +@@ -1165,7 +1151,7 @@ static void meson_mmc_ack_sdio_irq(struct mmc_host *mmc) + static const struct mmc_host_ops meson_mmc_ops = { + .request = meson_mmc_request, + .set_ios = meson_mmc_set_ios, +- .get_cd = meson_mmc_get_cd, ++ .get_cd = mmc_gpio_get_cd, + .pre_req = meson_mmc_pre_req, + .post_req = meson_mmc_post_req, + .execute_tuning = meson_mmc_resampling_tuning, +-- +2.34.1 + diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch similarity index 82% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch index 3c32f0dd46..d707628951 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0041-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v1-mmc-meson-gx-fix-deferred-probing.patch @@ -1,7 +1,7 @@ -From 7562b64e26f1a0f87ad8540f471c09a3b89bebb0 Mon Sep 17 00:00:00 2001 +From ec6df411382a6b218aed3dc3f3247c88d6f533da Mon Sep 17 00:00:00 2001 From: Sergey Shtylyov Date: Fri, 24 Dec 2021 06:09:57 +0000 -Subject: [PATCH 041/111] FROMLIST(v1): mmc: meson-gx: fix deferred probing +Subject: [PATCH 042/119] 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 @@ -17,10 +17,10 @@ Reviewed-by: Martin Blumenstingl 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 6e5ea0213b47..03d313a27a7a 100644 +index a1051a853f91..ab504c938448 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c -@@ -1225,8 +1225,8 @@ static int meson_mmc_probe(struct platform_device *pdev) +@@ -1219,8 +1219,8 @@ static int meson_mmc_probe(struct platform_device *pdev) } host->irq = platform_get_irq(pdev, 0); diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch index 2e94e4ce69..4254f9ceb6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0042-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-vendor-prefixes-Add-Titan-Mi.patch @@ -1,7 +1,7 @@ -From d1c8a0dc1f678fd6c32ef6592604f28a51b35453 Mon Sep 17 00:00:00 2001 +From 76869c873dc2fc0bb999a7f078a981b3cca8d79b 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 042/111] FROMLIST(v5): dt-bindings: vendor-prefixes: Add Titan +Subject: [PATCH 043/119] 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-0043-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch index 8a0c0f402d..b244aa4f4e 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0043-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-dt-bindings-auxdisplay-Add-Titan-Micro-E.patch @@ -1,7 +1,7 @@ -From 83eb54f6693f4540d2bbba0faf1573cf6ca54f62 Mon Sep 17 00:00:00 2001 +From ea68b39d92eb6daeae900078a8d5fb884aa2aedb Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:24:47 +0000 -Subject: [PATCH 043/111] FROMLIST(v5): dt-bindings: auxdisplay: Add Titan +Subject: [PATCH 044/119] 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-0044-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch index 94678e1945..18a21689c2 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0044-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-docs-ABI-document-tm1628-attribute-displ.patch @@ -1,7 +1,7 @@ -From 9b4992bc421b74d3d3b2452351f95dd159baa07f Mon Sep 17 00:00:00 2001 +From 9b520e8a8d6edbd7da36baed8a221f4abe110633 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Sun, 20 Feb 2022 08:26:27 +0000 -Subject: [PATCH 044/111] FROMLIST(v5): docs: ABI: document tm1628 attribute +Subject: [PATCH 045/119] 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-0045-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch index 423e5894d8..9de21f49c1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0045-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-auxdisplay-add-support-for-Titanmec-TM16.patch @@ -1,7 +1,7 @@ -From 46ce3710c69cd23dad35803f9ee51f92ef33a62a Mon Sep 17 00:00:00 2001 +From 1f2f8f35ca011bbc72ef1292b1927aa002a34811 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:51:20 +0000 -Subject: [PATCH 045/111] FROMLIST(v5): auxdisplay: add support for Titanmec +Subject: [PATCH 046/119] 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-0046-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch index 42c56d4326..b838f677b6 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0046-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-arm64-dts-meson-gxl-s905w-tx3-mini-add-s.patch @@ -1,7 +1,7 @@ -From f4ef754dbd28b2764f3eb2307ddc6db41ff7cde5 Mon Sep 17 00:00:00 2001 +From a8d66974c12c82d16e132e6bdbaf8bd309e2e8e0 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:52:34 +0000 -Subject: [PATCH 046/111] FROMLIST(v5): arm64: dts: meson-gxl-s905w-tx3-mini: +Subject: [PATCH 047/119] 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-0047-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch similarity index 83% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch index 3e5833d966..d41ab379bf 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0047-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v5-MAINTAINERS-Add-entry-for-tm1628-auxdisp.patch @@ -1,7 +1,7 @@ -From 6f65d3a38399d34407c53bfa3843e58de181bd5d Mon Sep 17 00:00:00 2001 +From 61450e18700a00f6fbf4194f2afa3238687c8044 Mon Sep 17 00:00:00 2001 From: Heiner Kallweit Date: Mon, 4 Apr 2022 18:53:32 +0000 -Subject: [PATCH 047/111] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 +Subject: [PATCH 048/119] FROMLIST(v5): MAINTAINERS: Add entry for tm1628 auxdisplay driver Signed-off-by: Heiner Kallweit @@ -10,7 +10,7 @@ Signed-off-by: Heiner Kallweit 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS -index d4822ae39e39..e4d13fc30cf6 100644 +index 350d7e3ba94f..93e294dc03c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20728,6 +20728,13 @@ W: http://sourceforge.net/projects/tlan/ diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch similarity index 98% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch index c6f32c9b5f..1fbe5b5f8c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0048-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-ASoC-hdmi-codec-reorder-channel-allocati.patch @@ -1,7 +1,7 @@ -From 0c0b16bdfe46c648965eef0ac97d06ffb7552c8e Mon Sep 17 00:00:00 2001 +From 24048a5997adb905190d42eb60c3b73118d860b1 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 23 Dec 2018 02:24:38 +0100 -Subject: [PATCH 048/111] FROMLIST(v1): ASoC: hdmi-codec: reorder channel +Subject: [PATCH 049/119] 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-0049-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch similarity index 90% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch index e43fc7a0f3..a19f5a050f 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0049-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-remove-redundant-if-sta.patch @@ -1,7 +1,7 @@ -From f8d0646502e7ed9c0748036a9dbd9f8b59934f08 Mon Sep 17 00:00:00 2001 +From c0fa86921daa596b83cd24ca6ee9d832d3f62f55 Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Thu, 15 Jul 2021 14:32:33 -0400 -Subject: [PATCH 049/111] FROMLIST(v1): media: meson: vdec: remove redundant if +Subject: [PATCH 050/119] FROMLIST(v1): 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-0050-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch similarity index 93% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch index 7837004cf3..c73b811bcb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0050-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v1-media-meson-vdec-esparser-check-parsing-.patch @@ -1,7 +1,7 @@ -From 75ff9a5f57cdc8bd007529832601204f987c731d Mon Sep 17 00:00:00 2001 +From 93eacecf63e1c2f0fe5abcaed4a78c2bebd24560 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 22 Nov 2021 09:15:21 +0000 -Subject: [PATCH 050/111] FROMLIST(v1): media: meson: vdec: esparser: check +Subject: [PATCH 051/119] 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-0051-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch index fcdabc5e54..46401fd8bb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0051-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-implement-10bit-bitstre.patch @@ -1,7 +1,7 @@ -From d8c0dea196a1c42845010a9364e6d58e572df2a2 Mon Sep 17 00:00:00 2001 +From 7c7cfd0c00e1037fc0226393ee509169893756f0 Mon Sep 17 00:00:00 2001 From: Benjamin Roszak Date: Mon, 23 Jan 2023 10:56:46 +0000 -Subject: [PATCH 051/111] FROMLIST(v2): media: meson: vdec: implement 10bit +Subject: [PATCH 052/119] 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-0052-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch similarity index 99% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch index 6b466fbd21..304c3b6e06 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0052-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-media-meson-vdec-add-HEVC-decode-codec.patch @@ -1,7 +1,7 @@ -From 7054d1b911a184c16dc6fec862e7c3f46fe2c601 Mon Sep 17 00:00:00 2001 +From 5033662952d289300d6ee76c17913abe3e5de47e Mon Sep 17 00:00:00 2001 From: Maxime Jourdan Date: Mon, 23 Jan 2023 11:07:04 +0000 -Subject: [PATCH 052/111] FROMLIST(v2): media: meson: vdec: add HEVC decode +Subject: [PATCH 053/119] 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-0053-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch index 7daef64397..fe57dbe615 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0053-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-dt-bindings-media-rc-add-rc-dreambox-bin.patch @@ -1,7 +1,7 @@ -From bdf45a337371af5b1a10fae377997fce17100356 Mon Sep 17 00:00:00 2001 +From a504e22a654a64c4920b96446f74c5d007140329 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 1 Feb 2023 08:53:39 +0000 -Subject: [PATCH 053/111] FROMLIST(v2): dt-bindings: media: rc: add rc-dreambox +Subject: [PATCH 054/119] FROMLIST(v2): 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-0054-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch similarity index 97% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch index 7facf588e1..ad134a3602 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0054-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-media-rc-add-common-keymap-for-Dreambox-.patch @@ -1,7 +1,7 @@ -From b4177ebf1b5659010688563561d678941183a53a Mon Sep 17 00:00:00 2001 +From d978b4f1de65c75d27f09e370054946b600eb091 Mon Sep 17 00:00:00 2001 From: Emanuel Strobel Date: Mon, 5 Apr 2021 17:57:57 +0000 -Subject: [PATCH 054/111] FROMLIST(v2): media: rc: add common keymap for +Subject: [PATCH 055/119] FROMLIST(v2): 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-0055-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch similarity index 86% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch index 32e89034d7..b6abab4e97 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0055-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-dt-bindings-media-rc-add-rc-beelink-mxii.patch @@ -1,7 +1,7 @@ -From 9a0008048a5647e0e530a9cb91d7aad6d15dcc1d Mon Sep 17 00:00:00 2001 +From 89bf0cf980d400a58d5fb12f0cb23af6c00e0415 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 4 Feb 2023 06:42:20 +0000 -Subject: [PATCH 055/111] FROMLIST(v2): dt-bindings: media: rc: add +Subject: [PATCH 056/119] FROMLIST(v2): 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-v1-net-phy-meson-gxl-use-MMD-access-dummy-s.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-net-phy-meson-gxl-use-MMD-access-dummy-s.patch deleted file mode 100644 index 5b450fd5b9..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v1-net-phy-meson-gxl-use-MMD-access-dummy-s.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a4e31b98108590466745bb7c5bd770fd504b82a8 Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Tue, 31 Jan 2023 22:03:21 +0100 -Subject: [PATCH 057/111] FROMLIST(v1): net: phy: meson-gxl: use MMD access - dummy stubs for GXL, internal PHY - -Jerome provided the information that also the GXL internal PHY doesn't -support MMD register access and EEE. MMD reads return 0xffff, what -results in e.g. completely wrong ethtool --show-eee output. -Therefore use the MMD dummy stubs. - -Note: The Fixes tag references the commit that added the MMD dummy -access stubs. - -Fixes: 5df7af85ecd8 ("net: phy: Add general dummy stubs for MMD register access") -Suggested-by: Jerome Brunet -Signed-off-by: Heiner Kallweit -Reviewed-by: Chris Healy ---- - drivers/net/phy/meson-gxl.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c -index 5e41658b1e2f..a6015cd03bff 100644 ---- a/drivers/net/phy/meson-gxl.c -+++ b/drivers/net/phy/meson-gxl.c -@@ -261,6 +261,8 @@ static struct phy_driver meson_gxl_phy[] = { - .handle_interrupt = meson_gxl_handle_interrupt, - .suspend = genphy_suspend, - .resume = genphy_resume, -+ .read_mmd = genphy_read_mmd_unsupported, -+ .write_mmd = genphy_write_mmd_unsupported, - }, { - PHY_ID_MATCH_EXACT(0x01803301), - .name = "Meson G12A Internal PHY", --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch similarity index 95% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch index 9de8f4b4ca..c887828deb 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0056-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0057-FROMLIST-v2-media-rc-add-Beelink-Mini-MXIII-keymap.patch @@ -1,7 +1,7 @@ -From a0fe1da807693e90c1ebb1f1eeeef40e85da3f4f Mon Sep 17 00:00:00 2001 +From 39794f188cf5778a6b84517d95c50e830d9d89ba Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:33:47 +0000 -Subject: [PATCH 056/111] FROMLIST(v2): media: rc: add Beelink Mini MXIII +Subject: [PATCH 057/119] FROMLIST(v2): 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-0058-FROMLIST-v1-arm64-dts-meson-axg-Make-mmc-host-contro.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-arm64-dts-meson-axg-Make-mmc-host-contro.patch deleted file mode 100644 index 0976bdbd9d..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v1-arm64-dts-meson-axg-Make-mmc-host-contro.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4ef9075d2d7f134c858be4e55452fdc237bac08d Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 9 Feb 2023 21:10:31 +0100 -Subject: [PATCH 058/111] FROMLIST(v1): arm64: dts: meson-axg: Make mmc host - controller interrupts level-sensitive - -The usage of edge-triggered interrupts lead to lost interrupts under load, -see [0]. This was confirmed to be fixed by using level-triggered -interrupts. -The report was about SDIO. However, as the host controller is the same -for SD and MMC, apply the change to all mmc controller instances. - -[0] https://www.spinics.net/lists/linux-mmc/msg73991.html - -Fixes: 221cf34bac54 ("ARM64: dts: meson-axg: enable the eMMC controller") -Reported-by: Peter Suti -Tested-by: Vyacheslav Bocharov -Tested-by: Peter Suti -Cc: stable@vger.kernel.org -Signed-off-by: Heiner Kallweit ---- - arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -index 04f797b5a012..73cd1791a13f 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -@@ -1885,7 +1885,7 @@ apb: bus@ffe00000 { - sd_emmc_b: sd@5000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0x5000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_B>, - <&clkc CLKID_SD_EMMC_B_CLK0>, -@@ -1897,7 +1897,7 @@ sd_emmc_b: sd@5000 { - sd_emmc_c: mmc@7000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0x7000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_C>, - <&clkc CLKID_SD_EMMC_C_CLK0>, --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-drm-meson-meson_venc-Relax-the-supported.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch similarity index 66% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-drm-meson-meson_venc-Relax-the-supported.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch index e8b50b795d..d443b7f661 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v1-drm-meson-meson_venc-Relax-the-supported.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0058-FROMLIST-v2-drm-meson-meson_venc-Relax-the-supported.patch @@ -1,11 +1,12 @@ -From 0e0cb2bd55ab48a127ecb221937543bb7b8a7896 Mon Sep 17 00:00:00 2001 +From ebc9244e10d017655e8df41d0f7f12da5a90fb9a Mon Sep 17 00:00:00 2001 From: Carlo Caione -Date: Fri, 10 Feb 2023 11:55:34 +0100 -Subject: [PATCH 061/111] FROMLIST(v1): drm/meson/meson_venc: Relax the +Date: Mon, 13 Feb 2023 10:32:09 +0100 +Subject: [PATCH 058/119] FROMLIST(v2): drm/meson/meson_venc: Relax the supported mode checks -Relax a bit the supported modes list by including also 480x1920. This -was actually tested on real hardware and it works correctly. +Relax a bit the supported modes list by including also 480x1920 and +400x1280. This was actually tested on real hardware and it works +correctly. Signed-off-by: Carlo Caione --- @@ -13,7 +14,7 @@ Signed-off-by: Carlo Caione 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c -index 3c55ed003359..5b3621589a9f 100644 +index 3c55ed003359..fcd532db19c1 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -866,10 +866,10 @@ meson_venc_hdmi_supported_mode(const struct drm_display_mode *mode) @@ -21,7 +22,7 @@ index 3c55ed003359..5b3621589a9f 100644 return MODE_BAD; - if (mode->hdisplay < 640 || mode->hdisplay > 1920) -+ if (mode->hdisplay < 480 || mode->hdisplay > 1920) ++ if (mode->hdisplay < 400 || mode->hdisplay > 1920) return MODE_BAD_HVALUE; - if (mode->vdisplay < 480 || mode->vdisplay > 1200) diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v1-arm64-dts-meson-g12-common-Make-mmc-host.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v1-arm64-dts-meson-g12-common-Make-mmc-host.patch deleted file mode 100644 index 9a9739047a..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v1-arm64-dts-meson-g12-common-Make-mmc-host.patch +++ /dev/null @@ -1,58 +0,0 @@ -From ea7ed9bb24f2f21b7cbe477987ef3594a2c9f03a Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 9 Feb 2023 21:11:10 +0100 -Subject: [PATCH 059/111] FROMLIST(v1): arm64: dts: meson-g12-common: Make mmc - host controller interrupts level-sensitive - -The usage of edge-triggered interrupts lead to lost interrupts under load, -see [0]. This was confirmed to be fixed by using level-triggered -interrupts. -The report was about SDIO. However, as the host controller is the same -for SD and MMC, apply the change to all mmc controller instances. - -[0] https://www.spinics.net/lists/linux-mmc/msg73991.html - -Fixes: 4759fd87b928 ("arm64: dts: meson: g12a: add mmc nodes") -Tested-by: FUKAUMI Naoki -Tested-by: Martin Blumenstingl -Tested-by: Jerome Brunet -Cc: stable@vger.kernel.org -Signed-off-by: Heiner Kallweit ---- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 6841e1909250..749d5b3e3554 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -2318,7 +2318,7 @@ uart_A: serial@24000 { - sd_emmc_a: sd@ffe03000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe03000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_A>, - <&clkc CLKID_SD_EMMC_A_CLK0>, -@@ -2330,7 +2330,7 @@ sd_emmc_a: sd@ffe03000 { - sd_emmc_b: sd@ffe05000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe05000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_B>, - <&clkc CLKID_SD_EMMC_B_CLK0>, -@@ -2342,7 +2342,7 @@ sd_emmc_b: sd@ffe05000 { - sd_emmc_c: mmc@ffe07000 { - compatible = "amlogic,meson-axg-mmc"; - reg = <0x0 0xffe07000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - clocks = <&clkc CLKID_SD_EMMC_C>, - <&clkc CLKID_SD_EMMC_C_CLK0>, --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch index 0071ca9d7f..68348724b4 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0059-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-sort-and-ti.patch @@ -1,7 +1,7 @@ -From 65e2378a8aeb278caa69582245cbeead137787e3 Mon Sep 17 00:00:00 2001 +From 5ecde6b3e72b51715d366c5f2a63b4161aab4ac8 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:16:12 +0000 -Subject: [PATCH 062/111] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: sort +Subject: [PATCH 059/119] FROMLIST(v2): 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-v1-arm64-dts-meson-gx-Make-mmc-host-control.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v1-arm64-dts-meson-gx-Make-mmc-host-control.patch deleted file mode 100644 index 6b7ffded46..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v1-arm64-dts-meson-gx-Make-mmc-host-control.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 67322e7c3e95cc2ff9d90cc446b2d9364e60fdad Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit -Date: Thu, 9 Feb 2023 21:11:47 +0100 -Subject: [PATCH 060/111] FROMLIST(v1): arm64: dts: meson-gx: Make mmc host - controller interrupts level-sensitive - -The usage of edge-triggered interrupts lead to lost interrupts under load, -see [0]. This was confirmed to be fixed by using level-triggered -interrupts. -The report was about SDIO. However, as the host controller is the same -for SD and MMC, apply the change to all mmc controller instances. - -[0] https://www.spinics.net/lists/linux-mmc/msg73991.html - -Fixes: ef8d2ffedf18 ("ARM64: dts: meson-gxbb: add MMC support") -Cc: stable@vger.kernel.org -Signed-off-by: Heiner Kallweit ---- - arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index b278a8380f8a..b8e43b406cec 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -611,21 +611,21 @@ apb: apb@d0000000 { - sd_emmc_a: mmc@70000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x70000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - sd_emmc_b: mmc@72000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x72000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - - sd_emmc_c: mmc@74000 { - compatible = "amlogic,meson-gx-mmc", "amlogic,meson-gxbb-mmc"; - reg = <0x0 0x74000 0x0 0x800>; -- interrupts = ; -+ interrupts = ; - status = "disabled"; - }; - }; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch similarity index 89% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch index 7ae0cdd804..d8fbda54a8 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0060-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-complete-th.patch @@ -1,7 +1,7 @@ -From 234a08e2ea0f891bd5db2afa2cc608eb868f3995 Mon Sep 17 00:00:00 2001 +From 8e6a3584cedb7b625d698b08781ab96f7f515a9d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:21:08 +0000 -Subject: [PATCH 063/111] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: +Subject: [PATCH 060/119] FROMLIST(v2): 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-0064-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch similarity index 94% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch index ef2a70236c..ed55affc7c 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0061-FROMLIST-v2-arm64-dts-meson-gxbb-kii-pro-add-initial.patch @@ -1,7 +1,7 @@ -From a1b4579c41ff75c11a4a904500a8cacdff11549f Mon Sep 17 00:00:00 2001 +From 26e09e684c37965401d31cacdc5f03912b84121b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:29:00 +0000 -Subject: [PATCH 064/111] FROMLIST(v2): arm64: dts: meson: gxbb-kii-pro: add +Subject: [PATCH 061/119] FROMLIST(v2): 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-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch new file mode 100644 index 0000000000..4434345693 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0062-FROMLIST-v2-dt-bindings-serial-amlogic-meson-uart-Ad.patch @@ -0,0 +1,65 @@ +From 4df952eb87fb849535fa3ce7b9b8c86e9c3d7e1a 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: + amlogic,meson-uart: Add compatible string for G12A + +Amlogic G12A SoCs gained a new "divide XTAL by 2" bit. Everything else +(we know about) is identical to the UART IP on GX (GXBB/GXL/GXM) SoCs. +Add a new compatible string for this SoC so this new bit can be managed +accordingly while keeping "amlogic,meson-gx-uart" as fallback compatible +string. + +Signed-off-by: Martin Blumenstingl +--- + .../bindings/serial/amlogic,meson-uart.yaml | 28 +++++++++++++------ + 1 file changed, 19 insertions(+), 9 deletions(-) + +diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml +index 7822705ad16c..644d52859497 100644 +--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml ++++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml +@@ -23,21 +23,31 @@ properties: + compatible: + oneOf: + - description: Always-on power domain UART controller +- items: ++ oneOf: ++ - items: ++ - enum: ++ - amlogic,meson6-uart ++ - amlogic,meson8-uart ++ - amlogic,meson8b-uart ++ - amlogic,meson-gx-uart ++ - amlogic,meson-s4-uart ++ - const: amlogic,meson-ao-uart ++ - items: ++ - const: amlogic,meson-g12a-uart ++ - const: amlogic,meson-gx-uart ++ - const: amlogic,meson-ao-uart ++ - description: Everything-Else power domain UART controller ++ oneOf: + - enum: + - amlogic,meson6-uart + - amlogic,meson8-uart + - amlogic,meson8b-uart + - amlogic,meson-gx-uart ++ - amlogic,meson-g12a-uart + - amlogic,meson-s4-uart +- - const: amlogic,meson-ao-uart +- - description: Everything-Else power domain UART controller +- enum: +- - amlogic,meson6-uart +- - amlogic,meson8-uart +- - amlogic,meson8b-uart +- - amlogic,meson-gx-uart +- - amlogic,meson-s4-uart ++ - items: ++ - const: amlogic,meson-g12a-uart ++ - const: amlogic,meson-gx-uart + + reg: + maxItems: 1 +-- +2.34.1 + 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-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch new file mode 100644 index 0000000000..5d629e989f --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0063-FROMLIST-v2-tty-serial-meson-Add-a-new-compatible-st.patch @@ -0,0 +1,47 @@ +From a795fe52d97a8792a94d8c1109f68984c89ed527 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 + compatible string for the G12A SoC + +Amlogic Meson G12A (and later) SoCs also have the "divide XTAL by 2" bit +as the S4 UART controllers. Add a new compatible string for these SoCs +and enable the has_xtal_div2 flag for them. + +Tested-by: Christian Hewitt +Signed-off-by: Martin Blumenstingl +--- + drivers/tty/serial/meson_uart.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c +index 056243c12836..931965d2fecc 100644 +--- a/drivers/tty/serial/meson_uart.c ++++ b/drivers/tty/serial/meson_uart.c +@@ -780,7 +780,7 @@ static int meson_uart_remove(struct platform_device *pdev) + return 0; + } + +-static struct meson_uart_data s4_uart_data = { ++static struct meson_uart_data meson_g12a_uart_data = { + .has_xtal_div2 = true, + }; + +@@ -789,9 +789,13 @@ static const struct of_device_id meson_uart_dt_match[] = { + { .compatible = "amlogic,meson8-uart" }, + { .compatible = "amlogic,meson8b-uart" }, + { .compatible = "amlogic,meson-gx-uart" }, ++ { ++ .compatible = "amlogic,meson-g12a-uart", ++ .data = (void *)&meson_g12a_uart_data, ++ }, + { + .compatible = "amlogic,meson-s4-uart", +- .data = (void *)&s4_uart_data, ++ .data = (void *)&meson_g12a_uart_data, + }, + { /* sentinel */ }, + }; +-- +2.34.1 + 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-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch new file mode 100644 index 0000000000..9b5e43ada0 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0064-FROMLIST-v2-arm64-dts-meson-g12-common-Use-the-G12A-.patch @@ -0,0 +1,76 @@ +From 0e9c49a97b49745c4de3ec41bd9f3eaf6755d71a 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 + G12A UART compatible string + +Switch meson-12-common.dtsi to use the Meson G12A specific UART +compatible string. This enables the "divide XTAL by 2" divider which +improves support for UART attached Bluetooth modules (for example +RTL8822CS) running at a baud rate of 1500000. Without dividing XTAL +(24MHz) by 2 a baud rate of 1500000 cannot be generated cleanly and the +resulting jitter breaks communication with the module. + +Tested-by: Christian Hewitt +Signed-off-by: Martin Blumenstingl +--- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 15 ++++++++++----- + 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 +--- 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 { + }; + + uart_AO: serial@3000 { +- compatible = "amlogic,meson-gx-uart", ++ compatible = "amlogic,meson-g12a-uart", ++ "amlogic,meson-gx-uart", + "amlogic,meson-ao-uart"; + reg = <0x0 0x3000 0x0 0x18>; + interrupts = ; +@@ -2050,7 +2051,8 @@ uart_AO: serial@3000 { + }; + + uart_AO_B: serial@4000 { +- compatible = "amlogic,meson-gx-uart", ++ compatible = "amlogic,meson-g12a-uart", ++ "amlogic,meson-gx-uart", + "amlogic,meson-ao-uart"; + reg = <0x0 0x4000 0x0 0x18>; + interrupts = ; +@@ -2287,7 +2289,8 @@ clk_msr: clock-measure@18000 { + }; + + uart_C: serial@22000 { +- compatible = "amlogic,meson-gx-uart"; ++ compatible = "amlogic,meson-g12a-uart", ++ "amlogic,meson-gx-uart"; + reg = <0x0 0x22000 0x0 0x18>; + interrupts = ; + clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; +@@ -2296,7 +2299,8 @@ uart_C: serial@22000 { + }; + + uart_B: serial@23000 { +- compatible = "amlogic,meson-gx-uart"; ++ compatible = "amlogic,meson-g12a-uart", ++ "amlogic,meson-gx-uart"; + reg = <0x0 0x23000 0x0 0x18>; + interrupts = ; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; +@@ -2305,7 +2309,8 @@ uart_B: serial@23000 { + }; + + uart_A: serial@24000 { +- compatible = "amlogic,meson-gx-uart"; ++ compatible = "amlogic,meson-g12a-uart", ++ "amlogic,meson-gx-uart"; + reg = <0x0 0x24000 0x0 0x18>; + interrupts = ; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; +-- +2.34.1 + 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-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch index 5593a500ef..9afb11be22 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-0065-WIP-media-meson-vdec-disable-MPEG1-MPEG2-hardware-de.patch @@ -1,7 +1,7 @@ -From 43ec52b9d17ab542bef9b3192a5512221068209f Mon Sep 17 00:00:00 2001 +From f589d7cc58e31e96f58b80e516945e5f701b62a1 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 5 Jan 2023 15:16:46 +0000 -Subject: [PATCH 065/111] WIP: media: meson: vdec: disable MPEG1/MPEG2 hardware +Subject: [PATCH 065/119] 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-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch index aebcc1bf5e..95d3de2bd5 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-0066-WIP-arm64-dts-meson-set-p212-p23x-q20x-SDIO-to-100MH.patch @@ -1,7 +1,7 @@ -From 97cc891c6c0b572437523ad6eb253340be4a4ddb Mon Sep 17 00:00:00 2001 +From 76d5200e280b14a0f50556b7b50371c13455dddc Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:09:12 +0000 -Subject: [PATCH 066/111] WIP: arm64: dts: meson: set p212/p23x/q20x SDIO to +Subject: [PATCH 066/119] 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-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch index 39bcbd79f0..c866bac829 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-0067-WIP-arm64-dts-meson-add-UHS-SDIO-capabilities-to-p21.patch @@ -1,7 +1,7 @@ -From b9788f09d5ccb7e4ec6d157d1fc61ad6020a5d80 Mon Sep 17 00:00:00 2001 +From f1eb8cf980881ab603ec1fd257e5801d3b412032 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 06:45:06 +0000 -Subject: [PATCH 067/111] WIP: arm64: dts: meson: add UHS SDIO capabilities to +Subject: [PATCH 067/119] 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-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch index 530b8ae21e..2fb631850a 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-0068-WIP-arm64-dts-meson-remove-SDIO-node-from-Khadas-VIM.patch @@ -1,7 +1,7 @@ -From d12a805ed4d64c4ea05f61a24cb33dcd2d389a4a Mon Sep 17 00:00:00 2001 +From bebad1696209039640521ca5649548d106d32eeb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 18 Jan 2022 15:18:32 +0000 -Subject: [PATCH 068/111] WIP: arm64: dts: meson: remove SDIO node from Khadas +Subject: [PATCH 068/119] 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-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch index 089c2106c6..81a2eac702 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-0069-WIP-arm64-dts-meson-add-audio-playback-to-p201.patch @@ -1,7 +1,7 @@ -From 03c36c6fa06ada1585e41cf58f96915795eb6389 Mon Sep 17 00:00:00 2001 +From 855a21c63c2b82230248a9bab6ba2865518a7bd5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:52:47 +0000 -Subject: [PATCH 069/111] WIP: arm64: dts: meson: add audio playback to p201 +Subject: [PATCH 069/119] 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-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch index 285ef4c4cf..4e85de3848 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-0070-WIP-arm64-dts-meson-add-audio-playback-to-p200.patch @@ -1,7 +1,7 @@ -From 8b691fc20b8c4a4b1fc9ab820300ff442f1ac60c Mon Sep 17 00:00:00 2001 +From c6e8181b98c57349768ad232ee3557ce9b606c06 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 15 May 2020 07:56:15 +0000 -Subject: [PATCH 070/111] WIP: arm64: dts: meson: add audio playback to p200 +Subject: [PATCH 070/119] 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-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch index d52daf3c80..fc076d059c 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-0071-WIP-arm64-dts-meson-add-audio-playback-to-u200.patch @@ -1,7 +1,7 @@ -From f33d261b05bca837d107bd982eb1b2adc340fe10 Mon Sep 17 00:00:00 2001 +From fff41879355aba35bc6c674ca32a4f90408e7f98 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 17 May 2020 05:00:55 +0000 -Subject: [PATCH 071/111] WIP: arm64: dts: meson: add audio playback to u200 +Subject: [PATCH 071/119] 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-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch index 9caaaa409c..47805f64ac 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-0072-WIP-arm64-dts-meson-add-Headphone-output-to-Beelink-.patch @@ -1,7 +1,7 @@ -From 2766a02ccf4d6c74527dc9b8db52633b938bf1e4 Mon Sep 17 00:00:00 2001 +From 6e49e1d60237acf467191c490b5fecb8536f7536 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 27 Nov 2021 13:50:06 +0000 -Subject: [PATCH 072/111] WIP: arm64: dts: meson: add Headphone output to +Subject: [PATCH 072/119] 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-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch index 5e7ce3a1fe..54431d96c3 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-0073-WIP-dt-bindings-arm-amlogic-add-support-for-the-Tani.patch @@ -1,7 +1,7 @@ -From 266a3495aa60d1b60baf5d0d9a7ff9172897d9b5 Mon Sep 17 00:00:00 2001 +From 959c3000813126592068fc508428b3dd8a2f7445 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 29 Feb 2020 15:13:02 +0000 -Subject: [PATCH 073/111] WIP: dt-bindings: arm: amlogic: add support for the +Subject: [PATCH 073/119] 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-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch index d0c6c94fbc..3016540fdd 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-0074-WIP-arm64-dts-meson-add-support-for-the-Tanix-TX5-Ma.patch @@ -1,7 +1,7 @@ -From 7117e6d0e474ec77a6f23b2a541b3f8f083f6881 Mon Sep 17 00:00:00 2001 +From 616ee1bf2dd2072b2a52f04917f32e2ad4b75d66 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 20 Oct 2019 04:06:59 +0000 -Subject: [PATCH 074/111] WIP: arm64: dts: meson: add support for the Tanix TX5 +Subject: [PATCH 074/119] 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-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch index 2998ee4abc..ebcc7fcc33 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-0075-WIP-arm64-dts-meson-add-multiple-MeCool-device-trees.patch @@ -1,7 +1,7 @@ -From 408001e0cb0a593d827a0fbc662cab4a51b02437 Mon Sep 17 00:00:00 2001 +From 986b38291ffc617c93f8fa37cb88cc7ccdc91957 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 21 Oct 2019 03:58:06 +0000 -Subject: [PATCH 075/111] WIP: arm64: dts: meson: add multiple MeCool device +Subject: [PATCH 075/119] 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-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch index 01c28f5b53..08c3d02cf9 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-0076-WIP-dt-bindings-arm-amlogic-add-support-for-Minix-NE.patch @@ -1,7 +1,7 @@ -From c6b189846236a70302987cd56e986d8b78026024 Mon Sep 17 00:00:00 2001 +From cb6409dbc874089f3e7a75013f999ec02f9f5be5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:50:13 +0000 -Subject: [PATCH 076/111] WIP: dt-bindings: arm: amlogic: add support for Minix +Subject: [PATCH 076/119] 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-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch index 3972795c34..6d7d1d5df2 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-0077-WIP-arm64-dts-meson-add-initial-device-tree-for-Mini.patch @@ -1,7 +1,7 @@ -From 101a607a87c7d46f6880990259c35e5610b3fc57 Mon Sep 17 00:00:00 2001 +From cc383de661125823c2bea1f074e897dc648d314a Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 11 Apr 2021 05:52:14 +0000 -Subject: [PATCH 077/111] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 077/119] 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-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch index cd2d2a483b..564b6d9530 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-0078-LOCAL-arm64-dts-meson-add-rtc-vrtc-aliases-to-Minix-.patch @@ -1,7 +1,7 @@ -From 6ee8e73b9be15ad7e88cc8588ec1802b3f7e9c94 Mon Sep 17 00:00:00 2001 +From 50050fbec8c02222eeb219ec3495caff13560297 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 19 Aug 2022 21:32:21 +0000 -Subject: [PATCH 078/111] LOCAL: arm64: dts: meson: add rtc/vrtc aliases to +Subject: [PATCH 078/119] 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-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch index 52d8ee8ea4..e1a8f12952 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-0079-WIP-dt-bindings-arm-amlogic-add-support-for-Beelink-.patch @@ -1,7 +1,7 @@ -From a480b81545e0eee9fc677f4723544939c30eb827 Mon Sep 17 00:00:00 2001 +From 54ce89d3f4d99631678c0a0819a9ce6b212dfba3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:28:50 +0000 -Subject: [PATCH 079/111] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 079/119] 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-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch index 570840a757..177ec6e3af 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-0080-WIP-arm64-dts-meson-add-support-for-Beelink-Mini-MXI.patch @@ -1,7 +1,7 @@ -From 73a08273ebb74b7df8d787fe8aa1eb049777659b Mon Sep 17 00:00:00 2001 +From d2ffa2383dec0ec5fd736258b910f68ae7e27a30 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 8 Dec 2021 15:26:00 +0000 -Subject: [PATCH 080/111] WIP: arm64: dts: meson: add support for Beelink Mini +Subject: [PATCH 080/119] 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-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch index 5a7186facb..a94058ec75 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-0081-WIP-media-rc-add-keymap-for-MeCool-M8S-Pro-W-remote.patch @@ -1,7 +1,7 @@ -From 015633ca12f7ddea34c5fabfdadc38941105d24e Mon Sep 17 00:00:00 2001 +From 3099de0850d5d012648f6addbd236341b43bf842 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:48:02 +0000 -Subject: [PATCH 081/111] WIP: media: rc: add keymap for MeCool M8S Pro W +Subject: [PATCH 081/119] 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-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch index b2a86d9a86..97f2ccbb3b 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-0082-WIP-dt-bindings-arm-amlogic-add-support-for-MeCool-M.patch @@ -1,7 +1,7 @@ -From 1710a44099635dcee1a8d2aaa58f74e2b6f305be Mon Sep 17 00:00:00 2001 +From 08d9f3f5a18a2b8ed87285ed50f298fff7634aa6 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:15:36 +0000 -Subject: [PATCH 082/111] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 082/119] 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-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch index 7500c1cb5b..88d95a00a1 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-0083-WIP-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-W.patch @@ -1,7 +1,7 @@ -From 3056b503ae67841eaac7c68419fe94a050b97faa Mon Sep 17 00:00:00 2001 +From c8111a7e93aee04ee7d1c7c87ef5b552f043f309 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 16 Jan 2022 08:17:41 +0000 -Subject: [PATCH 083/111] WIP: arm64: dts: meson: add support for MeCool M8S +Subject: [PATCH 083/119] 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-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch index 7b0994d205..4af6b029de 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-0084-WIP-dt-bindings-arm-amlogic-add-Vero-4K-binding.patch @@ -1,7 +1,7 @@ -From 7238ecad0f2cfe7d19f6e8ac355e6977f2ac0cb7 Mon Sep 17 00:00:00 2001 +From 04494107d4738b516d6a4302d9e7db7ae77e6d52 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 02:40:20 +0000 -Subject: [PATCH 084/111] WIP: dt-bindings: arm: amlogic: add Vero 4K binding +Subject: [PATCH 084/119] 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-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch index 798e203640..58731d5487 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-0085-WIP-arm64-dts-meson-add-support-for-OSMC-Vero-4K.patch @@ -1,7 +1,7 @@ -From 201fd9e277ca8e3516db3e9927681c045e09f9a5 Mon Sep 17 00:00:00 2001 +From 09a3ea93b7a533fbd8f5aabbeb78124958df968e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 19 Jan 2022 04:06:17 +0000 -Subject: [PATCH 085/111] WIP: arm64: dts: meson: add support for OSMC Vero 4K +Subject: [PATCH 085/119] 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-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 index 160ac31842..48d0f74cfb 100644 --- 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 @@ -1,7 +1,7 @@ -From 8b439fc90106044f14b34ba8175ae40d4e78d6dc Mon Sep 17 00:00:00 2001 +From 9447b13173e07289f13d43e48c63aa9ffe551a0d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 12 Apr 2022 11:21:21 +0000 -Subject: [PATCH 086/111] WIP: arm64: dts: meson: add RTL8822CS bluetooth to +Subject: [PATCH 086/119] WIP: arm64: dts: meson: add RTL8822CS bluetooth to X96-Air Add the uart_A/bluetooth node for the RTL8822CS chip. 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-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch index 0190f486f6..94370c2989 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-0087-WIP-media-rc-add-keymap-for-Venz-V10-remote.patch @@ -1,7 +1,7 @@ -From 06227367228dea9a08060434d0d18d799f9dd2cf Mon Sep 17 00:00:00 2001 +From ec3fd95f8147ceccc0da3647128f42caf5c7f8eb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 10 Apr 2022 11:51:38 +0000 -Subject: [PATCH 087/111] WIP: media: rc: add keymap for Venz V10 remote +Subject: [PATCH 087/119] 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-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch index e24a80308b..5294cc3e7e 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-0088-WIP-dt-bindings-arm-amlogic-add-S905L-and-Venz-V10-b.patch @@ -1,7 +1,7 @@ -From d02681cd939e0db512b3e86eaa008de8582684e7 Mon Sep 17 00:00:00 2001 +From 1d7ef8f872d93d1444ddc324830a7f0b895cc7f0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:27:50 +0000 -Subject: [PATCH 088/111] WIP: dt-bindings: arm: amlogic: add S905L and Venz +Subject: [PATCH 088/119] 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-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch index 792189aab6..12ef714a7f 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-0089-WIP-arm64-dts-meson-add-support-for-Venz-V10.patch @@ -1,7 +1,7 @@ -From 2e2930b2700ca7e070d8654add3d6d00a0f98478 Mon Sep 17 00:00:00 2001 +From c4efd114a22c073b877b7659322774fffabe49a2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sat, 9 Apr 2022 06:21:58 +0000 -Subject: [PATCH 089/111] WIP: arm64: dts: meson: add support for Venz V10 +Subject: [PATCH 089/119] 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-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch index fc6ea64621..d4df484173 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-0090-WIP-dt-bindings-vendor-prefixes-add-tbee-prefix.patch @@ -1,7 +1,7 @@ -From da5dc4bb14469ee3b99563ea97c5355d4677f4af Mon Sep 17 00:00:00 2001 +From a2dac2285a5381e7265efbe188c9ba4ba499dedf Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:15:41 +0000 -Subject: [PATCH 090/111] WIP: dt-bindings: vendor-prefixes: add tbee prefix +Subject: [PATCH 090/119] 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-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch index cff731bc41..e83afab5d0 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-0091-WIP-dt-bindings-arm-amlogic-add-TBee-Box-binding.patch @@ -1,7 +1,7 @@ -From 8489be633f6beb5f16b903ac686cfdd058b17057 Mon Sep 17 00:00:00 2001 +From 94dde8907583a3ea8c9de74c6f8ca5be8d9b81df Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:05:11 +0000 -Subject: [PATCH 091/111] WIP: dt-bindings: arm: amlogic: add TBee Box binding +Subject: [PATCH 091/119] 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-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch index 946b83e88e..687af9a940 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-0092-WIP-arm64-dts-meson-add-support-for-TBee-Box.patch @@ -1,7 +1,7 @@ -From 97337778184ffc8edff402afdae7b0da3a3c1dff Mon Sep 17 00:00:00 2001 +From 56aaccf3ceb9988ae456dd2212e701acad5f3f68 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 05:23:12 +0000 -Subject: [PATCH 092/111] WIP: arm64: dts: meson: add support for TBee Box +Subject: [PATCH 092/119] 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-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch index 1b90bee011..431d034537 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-0093-WIP-dt-bindings-arm-amlogic-add-Beelink-GT1-binding.patch @@ -1,7 +1,7 @@ -From c86407f59bebb958cc29d1621f1bd5f61b1e5419 Mon Sep 17 00:00:00 2001 +From b794a923fd9340a46ad7f537e3926449975014fb Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 24 Jul 2022 08:50:28 +0000 -Subject: [PATCH 093/111] WIP: dt-bindings: arm: amlogic: add Beelink GT1 +Subject: [PATCH 093/119] 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-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch index 116e235858..cec57c12a0 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-0094-WIP-arm64-dts-meson-add-support-for-Beelink-GT1.patch @@ -1,7 +1,7 @@ -From 9bba5b77db8019df089620bc8f8e87314f554229 Mon Sep 17 00:00:00 2001 +From 80b5d49ebfd2ab56d74441e7a22ce252fd4b686f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 6 Jul 2022 10:01:03 +0000 -Subject: [PATCH 094/111] WIP: arm64: dts: meson: add support for Beelink GT1 +Subject: [PATCH 094/119] 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: @@ -21,8 +21,8 @@ design with the following specifications: Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/amlogic/Makefile | 1 + - arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts | 121 ++++++++++++++++++ - 2 files changed, 122 insertions(+) + arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts | 126 ++++++++++++++++++ + 2 files changed, 127 insertions(+) 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 @@ -39,10 +39,10 @@ index 281a72ca8918..3fad85258de2 100644 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts new file mode 100644 -index 000000000000..08ed769512cb +index 000000000000..c7cdb15a4810 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-gt1.dts -@@ -0,0 +1,121 @@ +@@ -0,0 +1,126 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) Christian Hewitt @@ -93,21 +93,16 @@ index 000000000000..08ed769512cb +ðmac { + pinctrl-0 = <ð_pins>; + pinctrl-names = "default"; ++ + phy-handle = <&external_phy>; -+ amlogic,tx-delay-ns = <2>; + phy-mode = "rgmii"; ++ ++ amlogic,tx-delay-ns = <2>; +}; + +&external_mdio { -+ compatible = "snps,dwmac-mdio"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ snps,aal; -+ snps,txpbl = <0x8>; -+ snps,rxpbl = <0x8>; -+ + external_phy: ethernet-phy@0 { -+ /* Realtek RTL8211F (0x001cc916) */ ++ /* Realtek RTL8211F (0x2009087f) */ + reg = <0>; + max-speed = <1000>; + @@ -140,10 +135,20 @@ index 000000000000..08ed769512cb + }; +}; + ++&pinctrl_periphs { ++ /* Ensure the phy irq pin is properly configured as input */ ++ eth_phy_irq_pin: eth-phy-irq { ++ mux { ++ groups = "GPIOZ_15"; ++ function = "gpio_periphs"; ++ bias-disable; ++ output-disable; ++ }; ++ }; ++}; ++ +&sd_emmc_a { + /* QCA9377 WiFi */ -+ cap-sdio-irq; -+ + ath10k: wifi@1 { + reg = <1>; + compatible = "qcom,ath10k"; 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-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch index 7ba2b64165..d4ddee2f47 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-0095-WIP-arm64-dts-meson-add-vcc_5v-regulator-to-WeTek-dt.patch @@ -1,7 +1,7 @@ -From c08e71d91e272deaa371b45bd702855b30d4bc9b Mon Sep 17 00:00:00 2001 +From 312fbdaeaf73b1ebd300e550a3152a5713db2711 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 10:27:10 +0000 -Subject: [PATCH 095/111] WIP: arm64: dts: meson: add vcc_5v regulator to WeTek +Subject: [PATCH 095/119] 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-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch index dafa8d3910..54c6aab3c2 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-0096-WIP-arm64-dts-meson-add-audio-lineout-to-WeTek-Play2.patch @@ -1,7 +1,7 @@ -From be2dc4ef2cfe9251b425639a790523ae60faa3e1 Mon Sep 17 00:00:00 2001 +From 64b085618158efcc560162027a6773b89fdacfdd Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Wed, 27 Jul 2022 13:39:23 +0000 -Subject: [PATCH 096/111] WIP: arm64: dts: meson: add audio lineout to WeTek +Subject: [PATCH 096/119] 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-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch index e92ec04b21..09f69da405 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-0097-WIP-arm64-dts-amlogic-fix-cvbs-disable-on-WeTek-Hub.patch @@ -1,7 +1,7 @@ -From 3cd2bb5070e304f9159760b2de237db6fc165e86 Mon Sep 17 00:00:00 2001 +From a45aab44a99949e25796854294e41bf46b72dc7b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 29 Jul 2022 08:29:20 +0000 -Subject: [PATCH 097/111] WIP: arm64: dts: amlogic: fix cvbs disable on WeTek +Subject: [PATCH 097/119] 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-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch index e72493aee6..6f39ca75ee 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-0098-WIP-ASoC-dt-bindings-add-compatible-for-es8323-i2c.patch @@ -1,7 +1,7 @@ -From cc1feced9050a84e6129e8e53a8d931359525709 Mon Sep 17 00:00:00 2001 +From 563b593d2d94d5ede23ea0e70ed9987cb42f0d3b Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:21:16 +0000 -Subject: [PATCH 098/111] WIP: ASoC: dt-bindings: add compatible for es8323-i2c +Subject: [PATCH 098/119] 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-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch index 186b4857c2..3a4f85e9c3 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-0099-WIP-ASoC-codecs-add-support-for-ES8323.patch @@ -1,7 +1,7 @@ -From c798b049d8309bdd417466dcdfc2e6b7b496358f Mon Sep 17 00:00:00 2001 +From 480488c15b69618860e48b9c85905faa65e94360 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 14 Aug 2022 04:29:32 +0000 -Subject: [PATCH 099/111] WIP: ASoC: codecs: add support for ES8323 +Subject: [PATCH 099/119] 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-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch index 4fd0b8d7b5..100c685b9d 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-0100-WIP-dt-bindings-add-dream-vendor-prefix.patch @@ -1,7 +1,7 @@ -From 69672e48ac48c480df53b8f2abf22a2babab4720 Mon Sep 17 00:00:00 2001 +From 1368afbd892487bc554ef3e1480be404f393d28c Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:47:52 +0000 -Subject: [PATCH 100/111] WIP: dt-bindings: add dream vendor prefix +Subject: [PATCH 100/119] 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-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch index 1ff229704d..ebd86eeb19 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-0101-WIP-dt-bindings-arm-amlogic-add-support-for-Dreambox.patch @@ -1,7 +1,7 @@ -From 9c5b03828e3c690daa54108da81967cdf05c4f53 Mon Sep 17 00:00:00 2001 +From 782af7674db11452db57dc9eb06da4b88b85b1e4 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:48:34 +0000 -Subject: [PATCH 101/111] WIP: dt-bindings: arm: amlogic: add support for +Subject: [PATCH 101/119] 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-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch index 4b53d52dca..459027c0c4 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-0102-WIP-arm64-dts-meson-add-initial-device-trees-for-Dre.patch @@ -1,7 +1,7 @@ -From 5c7b621397257278ef61cad1d3fce1066c3c1019 Mon Sep 17 00:00:00 2001 +From dbbff2493c4e7bc8d5428eac685fad04f0aabba0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 5 Apr 2021 13:51:20 +0000 -Subject: [PATCH 102/111] WIP: arm64: dts: meson: add initial device-trees for +Subject: [PATCH 102/119] 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-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch index 7c71218e32..c71cc0254b 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-0103-WIP-dt-bindings-arm-amlogic-add-support-for-Ugoos-AM.patch @@ -1,7 +1,7 @@ -From da298d4a60853a644e3f5e47babf57ef78e66628 Mon Sep 17 00:00:00 2001 +From 5c3b005aaad70692a8ac2891b402a636ec3cc9e9 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 04:27:45 +0000 -Subject: [PATCH 103/111] WIP: dt-bindings: arm: amlogic: add support for Ugoos +Subject: [PATCH 103/119] 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-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch index a977e2f82f..638d2aa102 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-0104-WIP-arm64-dts-meson-add-support-for-Ugoos-AM6-Plus.patch @@ -1,7 +1,7 @@ -From 6d3f7bf8b0804ed10d973537630c5791fd0b00f2 Mon Sep 17 00:00:00 2001 +From 8abd9cdf2ae1a222828a031510ca49c103f336c5 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 15 Dec 2022 05:29:31 +0000 -Subject: [PATCH 104/111] WIP: arm64: dts: meson: add support for Ugoos AM6 +Subject: [PATCH 104/119] 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-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch index 714d2e153b..25fd737a56 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-0105-arm64-dts-meson-add-support-for-MeCool-M8S-Pro-Plus.patch @@ -1,7 +1,7 @@ -From 7f6c51ee9500028feaa2a91db7a61c1a0187d6e4 Mon Sep 17 00:00:00 2001 +From a2439693661c617b58d9d7934ac082bd42e8ddb2 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 24 Jan 2023 16:57:20 +0000 -Subject: [PATCH 105/111] arm64: dts: meson: add support for MeCool M8S Pro +Subject: [PATCH 105/119] 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-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch index 147ef88517..668efa3731 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-0106-WIP-arm64-dts-meson-radxa-zero2-add-pwm-fan-support.patch @@ -1,7 +1,7 @@ -From 9062cdb4dbeb80c7304afcad80e04ffda88d4171 Mon Sep 17 00:00:00 2001 +From 1a1fc49b6127ecf2d16be31ab83ec734da497b7e Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Mon, 30 Jan 2023 05:09:18 +0000 -Subject: [PATCH 106/111] WIP: arm64: dts: meson: radxa-zero2: add pwm-fan +Subject: [PATCH 106/119] 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-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch index 384adc2d49..6f776f587e 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-0107-WIP-dt-bindings-arm-amlogic-add-support-for-Tanix-TX.patch @@ -1,7 +1,7 @@ -From 22928a71e2d41bef51e80fdd67ec19cc16f8dfef Mon Sep 17 00:00:00 2001 +From e6e55db69f4283d40937256d93edfa837f905f33 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 09:59:58 +0000 -Subject: [PATCH 107/111] WIP: dt-bindings: arm: amlogic: add support for Tanix +Subject: [PATCH 107/119] 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-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch index d9491e729b..08c248d479 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-0108-WIP-arm64-dts-meson-add-initial-device-tree-for-Tani.patch @@ -1,7 +1,7 @@ -From 2620626ca55c1956615b9300d412feb85eb9d550 Mon Sep 17 00:00:00 2001 +From c8038bf4bbae704a49cd2844bc2e5648d99696b0 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:01:14 +0000 -Subject: [PATCH 108/111] WIP: arm64: dts: meson: add initial device-tree for +Subject: [PATCH 108/119] 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-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch index 5f38fc8e93..2f6f718b63 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-0109-WIP-arm64-dts-meson-add-7-segment-display-to-Tanix-T.patch @@ -1,7 +1,7 @@ -From b4d5c08601651db111c422e21d8c712fbc105704 Mon Sep 17 00:00:00 2001 +From ef5c2fa82e569cbcb8fb53b742343f4272f638ed Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Thu, 9 Feb 2023 10:11:39 +0000 -Subject: [PATCH 109/111] WIP: arm64: dts: meson: add 7-segment display to +Subject: [PATCH 109/119] 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-arm64-dts-meson-sml5442tw-add-cap-sdio-irq-to-pr.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-arm64-dts-meson-sml5442tw-add-cap-sdio-irq-to-pr.patch deleted file mode 100644 index 5234ba3378..0000000000 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-arm64-dts-meson-sml5442tw-add-cap-sdio-irq-to-pr.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a45e8f0730dd6f9db8571056ab44a0619aa2bb5c Mon Sep 17 00:00:00 2001 -From: Christian Hewitt -Date: Sun, 12 Feb 2023 02:07:28 +0000 -Subject: [PATCH 110/111] WIP: arm64: dts: meson: sml5442tw: add cap-sdio-irq - to prevent SDIO issues - -The SDIO interrupt changes in 066ecde6d826 ("mmc: meson-gx: add SDIO interrupt -support") and subsequent fix in 66e45351f7d6 ("arm64: dts: meson-gx: Make mmc -host controller interrupts level-sensitive") still result in the QCA9377 SDIO -module on the SML5442 board failing to initialise: - -SML5442TW:~ # dmesg | grep ath10k - -[ 11.529545] ath10k_sdio mmc2:0001:1: qca9377 hw1.1 sdio target 0x05020001 chip_id 0x00000000 sub 0000:0000 -[ 11.529579] ath10k_sdio mmc2:0001:1: kconfig debug 0 debugfs 0 tracing 0 dfs 0 testmode 0 -[ 11.530109] ath10k_sdio mmc2:0001:1: firmware ver WLAN.TF.1.1.1-00061-QCATFSWPZ-1 api 5 features ignore-otp crc32 7746e551 -[ 11.709471] ath10k_sdio mmc2:0001:1: failed to fetch board data for bus=sdio,vendor=0271,device=0701,subsystem-vendor=0000,subsystem-device=0000 from ath10k/QCA9377/hw1.0/board-2.bin -[ 11.713685] ath10k_sdio mmc2:0001:1: board_file api 1 bmi_id N/A crc32 544289f7 -[ 13.030691] ath10k_sdio mmc2:0001:1: ignoring unsolicited htc ep0 event -[ 13.145651] ath10k_sdio mmc2:0001:1: rx underflow interrupt error -[ 14.148946] ath10k_sdio mmc2:0001:1: failed to receive control response completion, polling.. -[ 15.172824] ath10k_sdio mmc2:0001:1: ctl_resp never came in (-110) -[ 15.172854] ath10k_sdio mmc2:0001:1: failed to connect to HTC: -110 -[ 15.175891] ath10k_sdio mmc2:0001:1: could not init core (-110) -[ 15.266333] ath10k_sdio mmc2:0001:1: could not probe fw (-110) - -Adding "cap-sdio-irq" to sd_emmc_a allows the card to function correctly: - -SML5442TW:~ # dmesg | grep mmc -[ 11.671410] ath10k_sdio mmc2:0001:1: qca9377 hw1.1 sdio target 0x05020001 chip_id 0x00000000 sub 0000:0000 -[ 11.671445] ath10k_sdio mmc2:0001:1: kconfig debug 0 debugfs 0 tracing 0 dfs 0 testmode 0 -[ 11.671882] ath10k_sdio mmc2:0001:1: firmware ver WLAN.TF.1.1.1-00061-QCATFSWPZ-1 api 5 features ignore-otp crc32 7746e551 -[ 11.852520] ath10k_sdio mmc2:0001:1: failed to fetch board data for bus=sdio,vendor=0271,device=0701,subsystem-vendor=0000,subsystem-device=0000 from ath10k/QCA9377/hw1.0/board-2.bin -[ 11.888378] ath10k_sdio mmc2:0001:1: board_file api 1 bmi_id N/A crc32 544289f7 -[ 13.460079] ath10k_sdio mmc2:0001:1: htt-ver 3.32 wmi-op 4 htt-op 3 cal otp max-sta 32 raw 0 hwcrypto 1 - -Fixes: 066ecde6d826 ("mmc: meson-gx: add SDIO interrupt support") -Suggested-by: Geraldo Nascimento -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts -index b331a013572f..30ac3852f83b 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts -@@ -67,6 +67,11 @@ &ir { - linux,rc-map-name = "rc-khamsin"; - }; - -+&sd_emmc_a { -+ /* QCA9377 */ -+ cap-sdio-irq; -+}; -+ - /* This is connected to the Bluetooth module: */ - &uart_A { - status = "okay"; --- -2.34.1 - diff --git a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch similarity index 80% rename from projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch rename to projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch index 817b215faf..1fa503d1e1 100644 --- a/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0110-WIP-net-phy-add-support-for-Maxio-MAE0621A.patch @@ -1,7 +1,7 @@ -From 2bde97fa0cbe4205874c0aa70cd5dc33fea63cb9 Mon Sep 17 00:00:00 2001 +From 4bf607534e312de06cfdc61cf3a5c2e2baa36a97 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Sun, 12 Feb 2023 10:45:54 +0000 -Subject: [PATCH 111/111] WIP: net: phy: add support for Maxio MAE0621A +Subject: [PATCH 110/119] 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. @@ -12,16 +12,16 @@ Signed-off-by: Christian Hewitt .../net/ethernet/stmicro/stmmac/stmmac_main.c | 7 + drivers/net/phy/Kconfig | 5 + drivers/net/phy/Makefile | 1 + - drivers/net/phy/maxio.c | 257 ++++++++++++++++++ + drivers/net/phy/maxio.c | 262 ++++++++++++++++++ drivers/net/phy/phy_device.c | 9 + - 5 files changed, 279 insertions(+) + 5 files changed, 284 insertions(+) create mode 100644 drivers/net/phy/maxio.c diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 4bba0444c764..f94e8fba3c94 100644 +index 84e1740b12f1..ed48b963653e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -7476,6 +7476,8 @@ static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue) +@@ -7477,6 +7477,8 @@ static void stmmac_reset_tx_queue(struct stmmac_priv *priv, u32 queue) netdev_tx_reset_queue(netdev_get_tx_queue(priv->dev, queue)); } @@ -30,12 +30,12 @@ index 4bba0444c764..f94e8fba3c94 100644 /** * stmmac_reset_queues_param - reset queue parameters * @priv: device pointer -@@ -7552,6 +7554,11 @@ int stmmac_resume(struct device *dev) +@@ -7553,6 +7555,11 @@ int stmmac_resume(struct device *dev) stmmac_free_tx_skbufs(priv); stmmac_clear_descriptors(priv, &priv->dma_conf); + if (ndev->phydev->drv->config_init) { -+ if (ndev->phydev->phy_id == MAXIO_PHY_MAE0621A_ID) ++ if (ndev->phydev->phy_id == MAXIO_PHY_MAE0621A_ID) + ndev->phydev->drv->config_init(ndev->phydev); + } + @@ -43,7 +43,7 @@ index 4bba0444c764..f94e8fba3c94 100644 stmmac_init_coalesce(priv); stmmac_set_rx_mode(ndev); diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index c57a0262fb64..e2a44d92f1d6 100644 +index c57a0262fb64..9262cf995743 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -287,6 +287,11 @@ config AT803X_PHY @@ -53,7 +53,7 @@ index c57a0262fb64..e2a44d92f1d6 100644 +config MAXIO_PHY + tristate "MAXIO PHYs" + help -+ Supports the Maxio MAExxxx PHY. ++ Supports the Maxio MAExxxx PHYs. + config QSEMI_PHY tristate "Quality Semiconductor PHYs" @@ -72,19 +72,19 @@ index f7138d3c896b..11fbac4e4b6d 100644 obj-$(CONFIG_MESON_GXL_PHY) += meson-gxl.o diff --git a/drivers/net/phy/maxio.c b/drivers/net/phy/maxio.c new file mode 100644 -index 000000000000..65cf2b1cc253 +index 000000000000..8d4db24b7ed1 --- /dev/null +++ b/drivers/net/phy/maxio.c -@@ -0,0 +1,257 @@ +@@ -0,0 +1,262 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later +/* -++ * drivers/net/phy/maxio.c -++ * -++ * Driver for maxio PHYs -++ * -++ * Author: Zhao Yang -++ * -++ * Copyright (c) 2004 maxio technology, Inc. -++ */ ++ * ^^ LICENSE TO BE CONFIRMED ^^ ++ * ++ * Driver for Maxio PHYs ++ * ++ * Copyright (c) 2004 maxio technology, Inc. ++ * ++ */ + +#include +#include @@ -98,20 +98,19 @@ index 000000000000..65cf2b1cc253 +#define MAXIO_MAE0621A_INER 0x12 +#define MAXIO_MAE0621A_INER_LINK_STATUS BIT(4) +#define MAXIO_MAE0621A_INSR 0x1d -+#define MAXIO_MAE0621A_TX_DELAY (BIT(6)|BIT(7)) -+#define MAXIO_MAE0621A_RX_DELAY (BIT(4)|BIT(5)) ++#define MAXIO_MAE0621A_TX_DELAY (BIT(6) | BIT(7)) ++#define MAXIO_MAE0621A_RX_DELAY (BIT(4) | BIT(5)) +#define MAXIO_MAE0621A_CLK_MODE_REG 0x02 +#define MAXIO_MAE0621A_WORK_STATUS_REG 0x1d + -+ +int maxio_read_paged(struct phy_device *phydev, int page, u32 regnum) +{ + int ret = 0, oldpage; + + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); + if (oldpage >= 0) { -+ phy_write(phydev, MAXIO_PAGE_SELECT, page); -+ ret = phy_read(phydev, regnum); ++ phy_write(phydev, MAXIO_PAGE_SELECT, page); ++ ret = phy_read(phydev, regnum); + } + phy_write(phydev, MAXIO_PAGE_SELECT, oldpage); + @@ -124,7 +123,7 @@ index 000000000000..65cf2b1cc253 + + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); + if (oldpage >= 0) { -+ phy_write(phydev, MAXIO_PAGE_SELECT, page); ++ phy_write(phydev, MAXIO_PAGE_SELECT, page); + ret = phy_write(phydev, regnum, val); + } + phy_write(phydev, MAXIO_PAGE_SELECT, oldpage); @@ -134,12 +133,11 @@ index 000000000000..65cf2b1cc253 + +static int maxio_mae0621a_clk_init(struct phy_device *phydev) +{ -+ u32 workmode,clkmode,oldpage; ++ u32 workmode, clkmode, oldpage; + + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); -+ if (oldpage == 0xFFFF) { ++ if (oldpage == 0xFFFF) + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); -+ } + + /* soft reset */ + phy_write(phydev, MAXIO_PAGE_SELECT, 0x0); @@ -150,21 +148,24 @@ index 000000000000..65cf2b1cc253 + workmode = phy_read(phydev, MAXIO_MAE0621A_WORK_STATUS_REG); + + /* get clkmode */ -+ phy_write( phydev, MAXIO_PAGE_SELECT, 0xd92 ); -+ clkmode = phy_read( phydev, MAXIO_MAE0621A_CLK_MODE_REG ); ++ phy_write(phydev, MAXIO_PAGE_SELECT, 0xd92); ++ clkmode = phy_read(phydev, MAXIO_MAE0621A_CLK_MODE_REG); + + /* abnormal */ -+ if (0 == (workmode&BIT(5))) { -+ if (0 == (clkmode&BIT(8))) { ++ if (0 == (workmode & BIT(5))) { ++ if (0 == (clkmode & BIT(8))) { + /* oscillator */ + phy_write(phydev, 0x02, clkmode | BIT(8)); -+ printk("****maxio_mae0621a_clk_init**clkmode**0x210a: 0x%x\n", phydev->phy_id); ++ pr_debug("maxio: mae0621a_clk_init clkmode 0x210a: 0x%x\n", ++ phydev->phy_id); + } else { + /* crystal */ -+ printk("****maxio_mae0621a_clk_init**clkmode**0x200a: 0x%x\n", phydev->phy_id); -+ phy_write(phydev, 0x02, clkmode &(~ BIT(8))); ++ pr_debug("maxio: mae0621a_clk_init clkmode 0x200a: 0x%x\n", ++ phydev->phy_id); ++ phy_write(phydev, 0x02, clkmode & (~BIT(8))); + } + } ++ + phy_write(phydev, MAXIO_PAGE_SELECT, 0x0); + phy_write(phydev, MAXIO_PAGE_SELECT, oldpage); + @@ -174,11 +175,12 @@ index 000000000000..65cf2b1cc253 +static int maxio_read_mmd(struct phy_device *phydev, int devnum, u16 regnum) +{ + int ret = 0, oldpage; ++ + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); + + if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) { + /* eee info */ -+ phy_write(phydev, MAXIO_PAGE_SELECT ,0); ++ phy_write(phydev, MAXIO_PAGE_SELECT, 0); + phy_write(phydev, 0xd, MDIO_MMD_AN); + phy_write(phydev, 0xe, MDIO_AN_EEE_ADV); + phy_write(phydev, 0xd, 0x4000 | MDIO_MMD_AN); @@ -194,11 +196,12 @@ index 000000000000..65cf2b1cc253 +static int maxio_write_mmd(struct phy_device *phydev, int devnum, u16 regnum, u16 val) +{ + int ret = 0, oldpage; ++ + oldpage = phy_read(phydev, MAXIO_PAGE_SELECT); + + if (devnum == MDIO_MMD_AN && regnum == MDIO_AN_EEE_ADV) { + /* eee info */ -+ phy_write(phydev, MAXIO_PAGE_SELECT ,0); ++ phy_write(phydev, MAXIO_PAGE_SELECT, 0); + ret |= phy_write(phydev, 0xd, MDIO_MMD_AN); + ret |= phy_write(phydev, 0xe, MDIO_AN_EEE_ADV); + ret |= phy_write(phydev, 0xd, 0x4000 | MDIO_MMD_AN); @@ -228,15 +231,15 @@ index 000000000000..65cf2b1cc253 + maxio_mae0621a_clk_init(phydev); + + /* disable eee */ -+ printk("eee value: 0x%x \n",maxio_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV)); ++ pr_debug("eee value: 0x%x\n", maxio_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV)); + maxio_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); -+ printk("eee value: 0x%x \n",maxio_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV)); ++ pr_debug("eee value: 0x%x\n", maxio_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV)); + broken |= MDIO_EEE_100TX; + broken |= MDIO_EEE_1000T; + phydev->eee_broken_modes = broken; + + /* enable auto_speed_down */ -+ ret = maxio_write_paged(phydev, 0xd8f, 0x0, 0x300 ); ++ ret = maxio_write_paged(phydev, 0xd8f, 0x0, 0x300); + + /* adjust tx/rx delay */ + switch (phydev->interface) { @@ -263,7 +266,7 @@ index 000000000000..65cf2b1cc253 + dev_err(dev, "Failed to update the TX delay register\n"); + return ret; + } -+ ret = maxio_write_paged(phydev, 0xd96, 0x0, val|ret ); ++ ret = maxio_write_paged(phydev, 0xd96, 0x0, val | ret); + + if (ret < 0) { + dev_err(dev, "Failed to update the TX delay register\n"); @@ -276,7 +279,7 @@ index 000000000000..65cf2b1cc253 +delay_skip: + + phy_write(phydev, MII_BMCR, BMCR_RESET | phy_read(phydev, MII_BMCR)); -+ msleep(1); ++ msleep(20); + phy_write(phydev, MAXIO_PAGE_SELECT, 0x0); + + return 0; @@ -296,7 +299,7 @@ index 000000000000..65cf2b1cc253 +int maxio_mae0621a_suspend(struct phy_device *phydev) +{ + genphy_suspend(phydev); -+ phy_write(phydev, MAXIO_PAGE_SELECT ,0); ++ phy_write(phydev, MAXIO_PAGE_SELECT, 0); + + return 0; +} @@ -309,7 +312,9 @@ index 000000000000..65cf2b1cc253 +static int maxio_mae0621a_probe(struct phy_device *phydev) +{ + int ret = maxio_mae0621a_clk_init(phydev); ++ + mdelay(100); ++ + return ret; +} + @@ -334,7 +339,7 @@ index 000000000000..65cf2b1cc253 +MODULE_AUTHOR("Zhao Yang "); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c -index 8cff61dbc4b5..1867591622b3 100644 +index 8cff61dbc4b5..d27a396b0905 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -844,6 +844,15 @@ static int get_phy_c22_id(struct mii_bus *bus, int addr, u32 *phy_id) @@ -342,12 +347,12 @@ index 8cff61dbc4b5..1867591622b3 100644 int phy_reg; +#ifdef CONFIG_MAXIO_PHY -+ /* ++ /** + * An MDIO connects to multiple PHYs requiring write before read. + * This operation does not affect one MDIO connected to a single PHY -+ * MII_PHYSID2 is a read-only register and writine to it has no effect ++ * MII_PHYSID2 is a read-only register and writing to it has no effect + */ -+ mdiobus_write(bus,addr,MII_PHYSID2,0); ++ mdiobus_write(bus, addr, MII_PHYSID2, 0); +#endif + /* Grab the bits from PHYIR1, and put them in the upper half */ 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-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch new file mode 100644 index 0000000000..64c021ad46 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0111-WIP-dt-bindings-add-sunvell-vendor-prefix.patch @@ -0,0 +1,28 @@ +From f24ebb12d59f441e4061046fcd85befb9b07ff23 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 + +Add vendor prefix for Shenzhen Sunvell Electronics Co., Ltd + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml +index a585da02832e..290bc7b7bc5f 100644 +--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml ++++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml +@@ -1250,6 +1250,8 @@ patternProperties: + description: Sundance DSP Inc. + "^sunplus,.*": + description: Sunplus Technology Co., Ltd. ++ "^sunvell,.*": ++ description: Shenzhen Sunvell Electronics Co., Ltd + "^SUNW,.*": + description: Sun Microsystems, Inc + "^supermicro,.*": +-- +2.34.1 + 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-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch new file mode 100644 index 0000000000..fa0d4f30ef --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0112-WIP-dt-bindings-media-rc-add-rc-sunvell-t95z-plus.patch @@ -0,0 +1,27 @@ +From 175c7bc4e08922b3be0b2940efe07f877ddcf03e 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 + +Add a binding for the rc-sunvell-t95z-plus remote keymap + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/media/rc.yaml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/devicetree/bindings/media/rc.yaml b/Documentation/devicetree/bindings/media/rc.yaml +index f390a5d2c82d..98946af589a0 100644 +--- a/Documentation/devicetree/bindings/media/rc.yaml ++++ b/Documentation/devicetree/bindings/media/rc.yaml +@@ -128,6 +128,7 @@ properties: + - rc-reddo + - rc-snapstream-firefly + - rc-streamzap ++ - rc-sunvell-t95z-plus + - rc-su3000 + - rc-tanix-tx3mini + - rc-tanix-tx5max +-- +2.34.1 + 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-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch new file mode 100644 index 0000000000..76d0c57865 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0113-WIP-media-rc-add-keymap-for-Sunvell-T95Z-Plus.patch @@ -0,0 +1,121 @@ +From dfed8817abde00a9877d53d02b21871a05da1054 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 + +Signed-off-by: Christian Hewitt +--- + drivers/media/rc/keymaps/Makefile | 1 + + .../media/rc/keymaps/rc-sunvell-t95z-plus.c | 75 +++++++++++++++++++ + include/media/rc-map.h | 1 + + 3 files changed, 77 insertions(+) + create mode 100644 drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c + +diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile +index 03bc9a8d355e..17547c0bcbde 100644 +--- a/drivers/media/rc/keymaps/Makefile ++++ b/drivers/media/rc/keymaps/Makefile +@@ -109,6 +109,7 @@ obj-$(CONFIG_RC_MAP) += \ + rc-reddo.o \ + rc-snapstream-firefly.o \ + rc-streamzap.o \ ++ rc-sunvell-t95z-plus.o \ + rc-su3000.o \ + rc-tanix-tx3mini.o \ + rc-tanix-tx5max.o \ +diff --git a/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c +new file mode 100644 +index 000000000000..aaaf6b1c0045 +--- /dev/null ++++ b/drivers/media/rc/keymaps/rc-sunvell-t95z-plus.c +@@ -0,0 +1,75 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ * Copyright (c) 2023 Christian Hewitt ++#include ++ ++/* ++ * Keytable for Sunvell T95Z Plus remote control ++ * ++ */ ++ ++static struct rc_map_table sunvell_t95z_plus[] = { ++ { 0xdf1c, KEY_POWER }, ++ // TV CONTROLS ++ ++ { 0xdf4b, KEY_PREVIOUS }, ++ { 0xdf01, KEY_SCREEN }, // TV ++ { 0xdf5d, KEY_VOLUMEUP }, ++ ++ { 0xdf4f, KEY_NEXT }, ++ { 0xdf5f, KEY_FAVORITES }, // KODI ++ { 0xdf5c, KEY_VOLUMEDOWN }, ++ ++ { 0xdf42, KEY_HOME }, ++ { 0xdf0a, KEY_BACK }, ++ ++ { 0xdf1a, KEY_UP }, ++ { 0xdf47, KEY_LEFT }, ++ { 0xdf06, KEY_ENTER }, ++ { 0xdf07, KEY_RIGHT }, ++ { 0xdf48, KEY_DOWN }, ++ ++ { 0xdf03, KEY_INFO }, // MOUSE ++ { 0xdf18, KEY_MENU }, ++ ++ { 0xdf54, KEY_1 }, ++ { 0xdf16, KEY_2 }, ++ { 0xdf15, KEY_3 }, ++ { 0xdf50, KEY_4 }, ++ { 0xdf12, KEY_5 }, ++ { 0xdf11, KEY_6 }, ++ { 0xdf4c, KEY_7 }, ++ { 0xdf0e, KEY_8 }, ++ { 0xdf0d, KEY_9 }, ++ { 0xdf41, KEY_WWW }, // WORLD ++ { 0xdf0c, KEY_0 }, ++ { 0xdf10, KEY_DELETE }, ++}; ++ ++static struct rc_map_list sunvell_t95z_plus_map = { ++ .map = { ++ .scan = sunvell_t95z_plus, ++ .size = ARRAY_SIZE(sunvell_t95z_plus), ++ .rc_proto = RC_PROTO_NEC, ++ .name = RC_MAP_SUNVELL_T95Z_PLUS, ++ } ++}; ++ ++static int __init init_rc_map_sunvell_t95z_plus(void) ++{ ++ return rc_map_register(&sunvell_t95z_plus_map); ++} ++ ++static void __exit exit_rc_map_sunvell_t95z_plus(void) ++{ ++ rc_map_unregister(&sunvell_t95z_plus_map); ++} ++ ++module_init(init_rc_map_sunvell_t95z_plus) ++module_exit(exit_rc_map_sunvell_t95z_plus) ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Christian Hewitt "); +diff --git a/include/media/rc-map.h b/include/media/rc-map.h +index dadd4d27a760..b561b122e498 100644 +--- a/include/media/rc-map.h ++++ b/include/media/rc-map.h +@@ -315,6 +315,7 @@ struct rc_map *rc_map_get(const char *name); + #define RC_MAP_REDDO "rc-reddo" + #define RC_MAP_SNAPSTREAM_FIREFLY "rc-snapstream-firefly" + #define RC_MAP_STREAMZAP "rc-streamzap" ++#define RC_MAP_SUNVELL_T95Z_PLUS "rc-sunvell-t95z-plus" + #define RC_MAP_SU3000 "rc-su3000" + #define RC_MAP_TANIX_TX3MINI "rc-tanix-tx3mini" + #define RC_MAP_TANIX_TX5MAX "rc-tanix-tx5max" +-- +2.34.1 + 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-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch new file mode 100644 index 0000000000..a9b95d5f35 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0114-WIP-dt-bindings-arm-amlogic-add-support-for-Sunvell-.patch @@ -0,0 +1,29 @@ +From 5ba3816e2167b21386eb376d5aa283a754cc62b2 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 + Sunvell T95Z Plus + +Sunvell T95Z Plus is an Android STB based on the Amlogic Q200 reference +board with S912 chip. + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index e76691082298..e7d2624cbbb6 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -140,6 +140,7 @@ properties: + - minix,neo-u9h + - nexbox,a1 + - oranth,tx9-pro ++ - sunvell,t95z-plus + - tronsmart,vega-s96 + - videostrong,gxm-kiii-pro + - wetek,core2 +-- +2.34.1 + 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-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch new file mode 100644 index 0000000000..ca69473a09 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0115-WIP-arm64-dts-meson-add-support-for-Sunvell-T95Z-Plu.patch @@ -0,0 +1,140 @@ +From d4d794feea10af19360d8781aeaf6996d52e2978 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 + Plus + +Sunvell T95Z Pluz is based on the Amlogic Q200 reference design with +an S912 chip and the following specifications: + +- 2GB DDR3 RAM +- 16GB eMMC +- 10/100/1000 Base-T Ethernet +- AP6255 Wireless (802.11 b/g/n/ac, BT 4.1) +- HDMI 2.0a video +- FTD628 VFD for clock/status +- 2x USB 2.0 ports +- IR receiver +- 1x Power LED (white) +- 1x Update/Reset button (underside) +- 1x micro SD card slot + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 91 +++++++++++++++++++ + 2 files changed, 92 insertions(+) + 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 +--- 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 + 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 ++dtb-$(CONFIG_ARCH_MESON) += meson-gxm-t95z-plus.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-s4-s805x2-aq222.dtb +diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts +new file mode 100644 +index 000000000000..30ed5b6d325f +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-gxm-t95z-plus.dts +@@ -0,0 +1,91 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-gxm.dtsi" ++#include "meson-gx-p23x-q20x.dtsi" ++#include ++#include ++ ++/ { ++ compatible = "sunvell,t95z-plus", "amlogic,s912", "amlogic,meson-gxm"; ++ model = "Sunvell T95Z Plus"; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-white { ++ color = ; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio_ao GPIOAO_9 GPIO_ACTIVE_HIGH>; ++ default-state = "on"; ++ panic-indicator; ++ }; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 0>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1710000>; ++ ++ button-function { ++ label = "update"; ++ linux,code = ; ++ press-threshold-microvolt = <10000>; ++ }; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>; ++ pinctrl-names = "default"; ++ ++ phy-handle = <&external_phy>; ++ phy-mode = "rgmii"; ++ ++ amlogic,tx-delay-ns = <2>; ++}; ++ ++&external_mdio { ++ external_phy: ethernet-phy@1 { ++ /* ZTE ZX2AA500 */ ++ compatible = "ethernet-phy-id0381.5c11", ++ "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_14 GPIO_ACTIVE_LOW>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_15 */ ++ interrupts = <25 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&sd_emmc_a { ++ brcmf: wifi@1 { ++ reg = <1>; ++ compatible = "brcm,bcm4329-fmac"; ++ }; ++}; ++ ++&uart_A { ++ status = "okay"; ++ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; ++ pinctrl-names = "default"; ++ uart-has-rtscts; ++ ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; ++ max-speed = <2000000>; ++ clocks = <&wifi32k>; ++ clock-names = "lpo"; ++ }; ++}; +-- +2.34.1 + 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-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch new file mode 100644 index 0000000000..192b8f0970 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0116-WIP-arm64-dts-meson-add-SPI-VFD-to-Sunvell-T95Z-Plus.patch @@ -0,0 +1,94 @@ +From 776e7979362127c2fcc55fe178da02192f852ae5 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 + Plus + +making guesses at the config.. + +Signed-off-by: Christian Hewitt +--- + .../boot/dts/amlogic/meson-gxm-t95z-plus.dts | 67 +++++++++++++++++++ + 1 file changed, 67 insertions(+) + +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 +--- 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 { + press-threshold-microvolt = <10000>; + }; + }; ++ ++ spi { ++ compatible = "spi-gpio"; ++ ++ /* T95Z v1 (enabled) */ ++ sck-gpios = <&gpio GPIODV_22 GPIO_ACTIVE_HIGH>; ++ mosi-gpios = <&gpio GPIODV_23 GPIO_ACTIVE_HIGH>; ++ cs-gpios = <&gpio GPIODV_21 GPIO_ACTIVE_LOW>; ++ ++ /* T95Z v2 (disabled) ++ sck-gpios = <&gpio GPIODV_19 GPIO_ACTIVE_HIGH>; ++ mosi-gpios = <&gpio GPIODV_18 GPIO_ACTIVE_HIGH>; ++ cs-gpios = <&gpio GPIODV_20 GPIO_ACTIVE_LOW>; ++ */ ++ ++ num-chipselects = <1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ tm1628: led-controller@0 { ++ compatible = "titanmec,tm1628"; ++ reg = <0>; ++ spi-3wire; ++ spi-lsb-first; ++ spi-rx-delay-us = <1>; ++ spi-max-frequency = <500000>; ++ #address-cells = <2>; ++ #size-cells = <0>; ++ ++ titanmec,segment-mapping = /bits/ 8 <4 5 6 1 2 3 7>; ++ titanmec,grid = /bits/ 8 <4 3 2 1>; ++ ++ alarm@5,1 { ++ reg = <5 1>; ++ function = LED_FUNCTION_ALARM; ++ }; ++ ++ usb@5,2 { ++ reg = <5 2>; ++ function = LED_FUNCTION_USB; ++ }; ++ play@5,3 { ++ reg = <5 3>; ++ function = "play"; ++ }; ++ ++ pause@5,4 { ++ reg = <5 4>; ++ function = "pause"; ++ }; ++ ++ colon@5,5 { ++ reg = <5 5>; ++ function = "colon"; ++ }; ++ ++ lan@5,6 { ++ reg = <5 6>; ++ function = LED_FUNCTION_LAN; ++ }; ++ ++ wlan@5,7 { ++ reg = <5 7>; ++ function = LED_FUNCTION_WLAN; ++ }; ++ }; ++ }; + }; + + ðmac { +-- +2.34.1 + 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-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch new file mode 100644 index 0000000000..fab85e2447 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0117-WIP-arm64-dts-meson-p23x-q20x-fix-usb-init-don-t-for.patch @@ -0,0 +1,41 @@ +From d1e24180eafd58f9d4fb07bfeb92ac4d7e506f34 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 - + don't force otg + +Forcing OTG in the p23x-q20x dtsi causes USB problems on some 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: + +[ 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. + +Signed-off-by: Christian Hewitt +--- + arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- + 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 +--- 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 { + + &usb { + status = "okay"; +- dr_mode = "otg"; ++ dr_mode = "peripheral"; + }; +-- +2.34.1 + 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-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch new file mode 100644 index 0000000000..65c56feb1c --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0118-WIP-dt-bindings-arm-amlogic-add-support-for-BananaPi.patch @@ -0,0 +1,39 @@ +From 526525ab3720040b9982cabbc8ba9d1cc9c6538f 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 + BananaPi M2S variants + +BananaPi M2S ships in two variants with Amlogic S922X or A311D chips + +Signed-off-by: Christian Hewitt +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 +++ + 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 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -169,6 +169,7 @@ properties: + - description: Boards with the Amlogic Meson G12B A311D SoC + items: + - enum: ++ - bananapi,bpi-m2s + - khadas,vim3 + - radxa,zero2 + - const: amlogic,a311d +@@ -180,8 +181,10 @@ properties: + - azw,gsking-x + - azw,gtking + - azw,gtking-pro ++ - bananapi,bpi-m2s + - dream,dreambox-one + - dream,dreambox-two ++ - hardkernel,odroid-go-ultra + - hardkernel,odroid-n2 + - hardkernel,odroid-n2-plus + - khadas,vim3 +-- +2.34.1 + 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-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch new file mode 100644 index 0000000000..264fcb00c9 --- /dev/null +++ b/projects/Amlogic/devices/AMLGX/patches/linux/amlogic-0119-WIP-arm64-dts-meson-add-support-for-BananaPi-M2S-var.patch @@ -0,0 +1,671 @@ +From d0680b65d58938cc23d9b3a38de228444904fe32 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 + variants + +BananaPi M2S ships in Amlogic S922X and A311D variants with the +following common specifications: + +- 16GB eMMC +- HDMI 2.1a video +- 2x 10/100/1000 Base-T Ethernet (1x RTL8211F, 1x RTL811H) +- 2x USB 2.0 ports +- 2x Status LED's (green/blue) +- 1x Power/Reset button +- 1x micro SD card slot +- 40-pin GPIO header +- PWM fan header +- UART header + +The S992X variant has: +- 2GB LPDDR4 RAM + +The A311D variant has: + +- 4GB LPDDR4 RAM +- NPU (5.0 TOPS) +- MIPI DSI header +- MIPI CSI header + +An optional RTL8822CS SDIO WiFi/BT mezzanine is available for +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-s922x-bananapi-m2s.dts | 14 + + 4 files changed, 588 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 +--- 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-tanix-tx5max.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-bananapi-m2s.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.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 + 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 ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-bananapi-m2s.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-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 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts +@@ -0,0 +1,18 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-a311d.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; ++ ++&npu { ++ status = "okay"; ++}; +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 +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +@@ -0,0 +1,554 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS ++ * Author: Neil Armstrong ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++#include ++#include ++#include ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ serial2 = &uart_A; ++ ethernet0 = ðmac; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; /* 2 GiB or 4 GiB */ ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ ++ button-function { ++ label = "RST"; ++ linux,code = ; ++ press-threshold-microvolt = <40000>; ++ }; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan0: pwm-fan { ++ compatible = "pwm-fan"; ++ #cooling-cells = <2>; ++ cooling-min-state = <0>; ++ cooling-max-state = <3>; ++ cooling-levels = <0 120 170 220>; ++ pwms = <&pwm_cd 1 40000 0>; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ 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"; ++ }; ++ }; ++ ++ 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 */ ++ }; ++ ++ dc_in: regulator-dc_in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vcc_5v: regulator-vcc_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&dc_in>; ++ ++ gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ }; ++ ++ vcc_3v3: regulator-vcc_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vcc_1v8: regulator-vcc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_1v8: regulator-vddao_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ 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 { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ pwm-supply = <&vsys_3v3>; ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vsys_3v3: regulator-vsys_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VSYS_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ usb_pwr: regulator-usb_pwr { ++ compatible = "regulator-fixed"; ++ regulator-name = "USB_PWR"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_5v>; ++ ++ gpio = <&gpio GPIOA_6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ 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"; ++ ++ 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>; ++ }; ++ ++ 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-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_A>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-7 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ status = "disabled"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&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>; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii"; ++ phy-handle = <&external_phy>; ++ amlogic,tx-delay-ns = <2>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&vcc_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&pcie { ++ status = "okay"; ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ status = "okay"; ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++}; ++ ++&pwm_cd { ++ status = "okay"; ++ pinctrl-0 = <&pwm_d_x6_pins>; ++ pinctrl-names = "default"; ++ pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>; ++}; ++ ++&pwm_ef { ++ status = "okay"; ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* 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 = <&vsys_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vsys_3v3>; ++ vqmmc-supply = <&vsys_3v3>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vcc_3v3>; ++ vqmmc-supply = <&emmc_1v8>; ++}; ++ ++&tdmif_a { ++ status = "okay"; ++}; ++ ++&tdmin_a { ++ status = "okay"; ++}; ++ ++&tdmout_a { ++ status = "okay"; ++}; ++ ++&toddr_a { ++ status = "okay"; ++}; ++ ++&toddr_b { ++ status = "okay"; ++}; ++ ++&toddr_c { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ 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>; ++ }; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb2_phy0 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb2_phy1 { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb3_pcie_phy { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb { ++ status = "okay"; ++ dr_mode = "peripheral"; ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts +new file mode 100644 +index 000000000000..7f66f263a2ce +--- /dev/null ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-s922x-bananapi-m2s.dts +@@ -0,0 +1,14 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-s922x.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; +-- +2.34.1 + diff --git a/projects/Amlogic/linux/linux.aarch64.conf b/projects/Amlogic/linux/linux.aarch64.conf index 7480d417b2..b9759631e0 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.11 Kernel Configuration +# Linux/arm64 6.1.14 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-none-elf-gcc-12.2.0 (GCC) 12.2.0" CONFIG_CC_IS_GCC=y @@ -1297,7 +1297,7 @@ CONFIG_BT_MTK=m CONFIG_BT_HCIBTUSB=m # CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set CONFIG_BT_HCIBTUSB_BCM=y -# CONFIG_BT_HCIBTUSB_MTK is not set +CONFIG_BT_HCIBTUSB_MTK=y CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIBTSDIO=m CONFIG_BT_HCIUART=m @@ -1721,7 +1721,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 # # EEPROM support # -# CONFIG_EEPROM_AT24 is not set +CONFIG_EEPROM_AT24=m # CONFIG_EEPROM_AT25 is not set # CONFIG_EEPROM_LEGACY is not set # CONFIG_EEPROM_MAX6875 is not set @@ -2039,7 +2039,7 @@ CONFIG_NET_VENDOR_ASIX=y CONFIG_NET_VENDOR_REALTEK=y # CONFIG_8139CP is not set # CONFIG_8139TOO is not set -# CONFIG_R8169 is not set +CONFIG_R8169=y # CONFIG_NET_VENDOR_RENESAS is not set # CONFIG_NET_VENDOR_ROCKER is not set # CONFIG_NET_VENDOR_SAMSUNG is not set @@ -2093,14 +2093,13 @@ CONFIG_AX88796B_PHY=m # CONFIG_CICADA_PHY is not set # CONFIG_CORTINA_PHY is not set # CONFIG_DAVICOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set +CONFIG_ICPLUS_PHY=y # CONFIG_LXT_PHY is not set # CONFIG_INTEL_XWAY_PHY is not set # CONFIG_LSI_ET1011C_PHY is not set CONFIG_MARVELL_PHY=y # CONFIG_MARVELL_10G_PHY is not set # CONFIG_MARVELL_88X2222_PHY is not set -CONFIG_MAXIO_PHY=y # CONFIG_MAXLINEAR_GPHY is not set # CONFIG_MEDIATEK_GE_PHY is not set CONFIG_MICREL_PHY=y @@ -2112,6 +2111,7 @@ CONFIG_MICROSEMI_PHY=y # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set # CONFIG_AT803X_PHY is not set +CONFIG_MAXIO_PHY=y # CONFIG_QSEMI_PHY is not set CONFIG_REALTEK_PHY=y # CONFIG_RENESAS_PHY is not set @@ -2201,7 +2201,7 @@ CONFIG_USB_NET_RNDIS_HOST=m CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_NET_CX82310_ETH is not set # CONFIG_USB_NET_KALMIA is not set -# CONFIG_USB_NET_QMI_WWAN is not set +CONFIG_USB_NET_QMI_WWAN=m CONFIG_USB_HSO=m # CONFIG_USB_NET_INT51X1 is not set CONFIG_USB_IPHETH=m @@ -4248,7 +4248,6 @@ CONFIG_DVB_DUMMY_FE=m CONFIG_APERTURE_HELPERS=y CONFIG_DRM=y # CONFIG_DRM_DEBUG_MM is not set -CONFIG_DRM_USE_DYNAMIC_DEBUG=y CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set CONFIG_DRM_DEBUG_MODESET_LOCK=y @@ -5009,7 +5008,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_ACM=m # CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set +CONFIG_USB_WDM=m # CONFIG_USB_TMC is not set # diff --git a/projects/Amlogic/options b/projects/Amlogic/options index b456ff6536..3cd89e6d95 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -75,7 +75,7 @@ DRIVER_ADDONS="crazycat dvb-latest" # additional packages to install: - ADDITIONAL_PACKAGES+=" dtc ethmactool emmctool flashrom" + ADDITIONAL_PACKAGES+=" dtc ethmactool emmctool flashrom pciutils" # use the kernel CEC framework for libcec (yes / no) CEC_FRAMEWORK_SUPPORT="yes" 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 23dcb8dd1c..a5bdb26d5d 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/15] LOCAL: configs: meson64: prevent stdout/stderr on +Subject: [PATCH 01/22] LOCAL: configs: meson64: prevent stdout/stderr on videoconsole Several devices have CONFIG_DM_VIDEO enabled which causes stdout/stderr @@ -27,5 +27,5 @@ index 40803ee9da..05b1fcb9fd 100644 #define STDOUT_CFG "serial" #endif -- -2.17.1 +2.34.1 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 c55aa2636c..8b93165b7c 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/15] LOCAL: configs: meson64: remove /amlogic so fdtdir +Subject: [PATCH 02/22] LOCAL: configs: meson64: remove /amlogic so fdtdir finds LE boot files --- @@ -22,5 +22,5 @@ index 05b1fcb9fd..c4af944382 100644 #endif -- -2.17.1 +2.34.1 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 89bafafc0a..bcebc030c5 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/15] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ +Subject: [PATCH 03/22] LOCAL: board: amlogic: odroid-n2: remove /amlogic/ prefix for dtb path Remove the /amlogic/ prefix to align with current LE dtb locations. @@ -25,5 +25,5 @@ index 2135457edd..ec1f4efc11 100644 } -- -2.17.1 +2.34.1 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 902b95070a..c94e8c8e84 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/15] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset +Subject: [PATCH 04/22] BACKPORT: arm64: dts: meson: nanopi-k2: readd PHY reset properties The sync of device-tree/bindings in 11a48a5a18c6 ("Linux 5.6-rc2") causes @@ -34,5 +34,5 @@ index c35158d7e9..2a245bbe7f 100644 +}; + -- -2.17.1 +2.34.1 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 1184a1d628..cb830c8ede 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/15] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux +Subject: [PATCH 05/22] WIP: ARM: dts: import WeTek Hub/Play2 DTs from Linux 5.19 Import the WeTek common dtsi and Hub/Play2 device-trees. @@ -550,5 +550,5 @@ index 0000000000..3c3eeb148e + status = "okay"; +}; -- -2.17.1 +2.34.1 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 1079cec788..c29d217a9b 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/15] WIP: ARM: dts: use snps,reset on WeTek devices to fix +Subject: [PATCH 06/22] 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 @@ -48,5 +48,5 @@ index c35158d7e9..2a245bbe7f 100644 +}; + -- -2.17.1 +2.34.1 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 d6a6fc9132..9f9800b6dd 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/15] WIP: boards: amlogic: add board files for wetek-gxbb +Subject: [PATCH 07/22] WIP: boards: amlogic: add board files for wetek-gxbb devices These support the WeTek Hub and Play2 devices. @@ -99,5 +99,5 @@ index 0000000000..fb07eefa53 + return 0; +} -- -2.17.1 +2.34.1 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 6daf511186..0dce3407b3 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/15] WIP: boards: amlogic: add WeTek Hub defconfig +Subject: [PATCH 08/22] WIP: boards: amlogic: add WeTek Hub defconfig Signed-of-by: Christian Hewitt --- @@ -87,5 +87,5 @@ index 0000000000..9ad263ca2c +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 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 2a2fec8476..41b94fd28a 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/15] WIP: boards: amlogic: add WeTek Play2 defconfig +Subject: [PATCH 09/22] WIP: boards: amlogic: add WeTek Play2 defconfig Signed-off-by: Christian Hewittt --- @@ -87,5 +87,5 @@ index 0000000000..624679f90c +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 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 19fa0ce744..3c3b36f534 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/15] WIP: ARM: dts: add support for Radxa Zero2 +Subject: [PATCH 10/22] WIP: ARM: dts: add support for Radxa Zero2 Import the initial dts (WIP) from chewitt/amlogic-5.16.y @@ -539,5 +539,5 @@ index 0000000000..f0c9ef8592 + status = "okay"; +}; -- -2.17.1 +2.34.1 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 b3a36ba97d..547babb8a7 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/15] WIP: boards: amlogic: add Radxa Zero2 defconfig +Subject: [PATCH 11/22] WIP: boards: amlogic: add Radxa Zero2 defconfig Add a defconfig for the Radxa Zero2 SBC, using an Amlogic A311D chip. @@ -106,5 +106,5 @@ index 0000000000..3ef3c9c143 +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 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 a974cdce54..e1d7cead98 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/15] WIP: doc: boards: amlogic: update for Radxa Zero2 +Subject: [PATCH 12/22] WIP: doc: boards: amlogic: update for Radxa Zero2 Add documentation bits for the Radxa Zero2 @@ -119,5 +119,5 @@ index f5611f52ec..95a42a05d0 100644 This will generate: -- -2.17.1 +2.34.1 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 dfb16223f6..786a26d81c 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/15] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 +Subject: [PATCH 13/22] WIP: ARM: dts: import Beelink GT1 DT from Linux 5.21 Import the Beelink GT1 device-tree. @@ -124,5 +124,5 @@ index 0000000000..2c267884cc + }; +}; -- -2.17.1 +2.34.1 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 60429c72be..24bdcda648 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/15] WIP: boards: amlogic: add Beelink GT1 defconfig +Subject: [PATCH 14/22] WIP: boards: amlogic: add Beelink GT1 defconfig Add a board config for Beelink GT1 devices @@ -89,5 +89,5 @@ index 0000000000..77ffc9aa49 +CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_OF_LIBFDT_OVERLAY=y -- -2.17.1 +2.34.1 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 7e836e397c..5b3f11a276 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/15] WIP: doc: boards: amlogic: update for Beelink GT1 +Subject: [PATCH 15/22] WIP: doc: boards: amlogic: update for Beelink GT1 Add documentation bits for the Beelink GT1 and GT1-Ultimate @@ -161,5 +161,5 @@ index f0b92e4209..b8b6f9b98a 100644 jethub-j80 khadas-vim2 -- -2.17.1 +2.34.1 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 new file mode 100644 index 0000000000..eef144642c --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0016-WIP-ARM-dts-convert-bananapi-m5-to-dtsi.patch @@ -0,0 +1,936 @@ +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 + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/meson-sm1-bananapi-m5.dts | 426 +----------------------- + arch/arm/dts/meson-sm1-bananapi.dtsi | 435 +++++++++++++++++++++++++ + 2 files changed, 436 insertions(+), 425 deletions(-) + create mode 100644 arch/arm/dts/meson-sm1-bananapi.dtsi + +diff --git a/arch/arm/dts/meson-sm1-bananapi-m5.dts b/arch/arm/dts/meson-sm1-bananapi-m5.dts +index effaa138b5..34b3238ee0 100644 +--- a/arch/arm/dts/meson-sm1-bananapi-m5.dts ++++ b/arch/arm/dts/meson-sm1-bananapi-m5.dts +@@ -6,10 +6,7 @@ + + /dts-v1/; + +-#include "meson-sm1.dtsi" +-#include +-#include +-#include ++#include "meson-sm1-bananapi.dtsi" + #include + #include + +@@ -17,28 +14,6 @@ + compatible = "bananapi,bpi-m5", "amlogic,sm1"; + model = "Banana Pi BPI-M5"; + +- adc_keys { +- compatible = "adc-keys"; +- io-channels = <&saradc 2>; +- io-channel-names = "buttons"; +- keyup-threshold-microvolt = <1800000>; +- +- key { +- label = "SW3"; +- linux,code = ; +- press-threshold-microvolt = <1700000>; +- }; +- }; +- +- aliases { +- serial0 = &uart_AO; +- ethernet0 = ðmac; +- }; +- +- chosen { +- stdout-path = "serial0:115200n8"; +- }; +- + /* TOFIX: handle CVBS_DET on SARADC channel 0 */ + cvbs-connector { + compatible = "composite-video-connector"; +@@ -50,150 +25,6 @@ + }; + }; + +- emmc_pwrseq: emmc-pwrseq { +- compatible = "mmc-pwrseq-emmc"; +- reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; +- }; +- +- gpio-keys { +- compatible = "gpio-keys"; +- +- key { +- label = "SW1"; +- linux,code = ; +- gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; +- interrupt-parent = <&gpio_intc>; +- interrupts = <3 IRQ_TYPE_EDGE_BOTH>; +- }; +- }; +- +- hdmi-connector { +- compatible = "hdmi-connector"; +- type = "a"; +- +- port { +- hdmi_connector_in: endpoint { +- remote-endpoint = <&hdmi_tx_tmds_out>; +- }; +- }; +- }; +- +- 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_11 GPIO_ACTIVE_LOW>; +- linux,default-trigger = "heartbeat"; +- }; +- }; +- +- memory@0 { +- device_type = "memory"; +- reg = <0x0 0x0 0x0 0x40000000>; +- }; +- +- 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 GPIOE_2 GPIO_ACTIVE_HIGH>; +- enable-active-high; +- regulator-always-on; +- +- gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_DRAIN>; +- gpios-states = <1>; +- +- states = <1800000 0>, +- <3300000 1>; +- }; +- +- tflash_vdd: regulator-tflash_vdd { +- compatible = "regulator-fixed"; +- regulator-name = "TFLASH_VDD"; +- regulator-min-microvolt = <3300000>; +- regulator-max-microvolt = <3300000>; +- vin-supply = <&dc_in>; +- gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; +- enable-active-high; +- regulator-always-on; +- }; +- +- 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: regulator-vddcpu { +- /* +- * SY8120B1ABC DC/DC Regulator. +- */ +- compatible = "pwm-regulator"; +- +- regulator-name = "VDDCPU"; +- regulator-min-microvolt = <690000>; +- regulator-max-microvolt = <1050000>; +- +- vin-supply = <&dc_in>; +- +- pwms = <&pwm_AO_cd 1 1250 0>; +- pwm-dutycycle-range = <100 0>; +- +- regulator-boot-on; +- regulator-always-on; +- }; +- +- /* USB Hub Power Enable */ +- vl_pwr_en: regulator-vl_pwr_en { +- compatible = "regulator-fixed"; +- regulator-name = "VL_PWR_EN"; +- regulator-min-microvolt = <5000000>; +- regulator-max-microvolt = <5000000>; +- vin-supply = <&dc_in>; +- +- gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; +- enable-active-high; +- }; +- + sound { + compatible = "amlogic,axg-sound-card"; + model = "BPI-M5"; +@@ -319,68 +150,17 @@ + status = "okay"; + }; + +-&arb { +- status = "okay"; +-}; + + &clkc_audio { + status = "okay"; + }; + +-&cpu0 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu1 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU1_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu2 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU2_CLK>; +- clock-latency = <50000>; +-}; +- +-&cpu3 { +- cpu-supply = <&vddcpu>; +- operating-points-v2 = <&cpu_opp_table>; +- clocks = <&clkc CLKID_CPU3_CLK>; +- clock-latency = <50000>; +-}; +- + &cvbs_vdac_port { + cvbs_vdac_out: endpoint { + remote-endpoint = <&cvbs_connector_in>; + }; + }; + +-&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>; +- }; +-}; +- +-ðmac { +- pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; +- pinctrl-names = "default"; +- status = "okay"; +- phy-mode = "rgmii-txid"; +- phy-handle = <&external_phy>; +-}; +- + &frddr_a { + status = "okay"; + }; +@@ -393,191 +173,6 @@ + status = "okay"; + }; + +-&gpio { +- gpio-line-names = +- /* GPIOZ */ +- "ETH_MDIO", /* GPIOZ_0 */ +- "ETH_MDC", /* GPIOZ_1 */ +- "ETH_RXCLK", /* GPIOZ_2 */ +- "ETH_RX_DV", /* GPIOZ_3 */ +- "ETH_RXD0", /* GPIOZ_4 */ +- "ETH_RXD1", /* GPIOZ_5 */ +- "ETH_RXD2", /* GPIOZ_6 */ +- "ETH_RXD3", /* GPIOZ_7 */ +- "ETH_TXCLK", /* GPIOZ_8 */ +- "ETH_TXEN", /* GPIOZ_9 */ +- "ETH_TXD0", /* GPIOZ_10 */ +- "ETH_TXD1", /* GPIOZ_11 */ +- "ETH_TXD2", /* GPIOZ_12 */ +- "ETH_TXD3", /* GPIOZ_13 */ +- "ETH_INTR", /* GPIOZ_14 */ +- "ETH_NRST", /* GPIOZ_15 */ +- /* GPIOH */ +- "HDMI_SDA", /* GPIOH_0 */ +- "HDMI_SCL", /* GPIOH_1 */ +- "HDMI_HPD", /* GPIOH_2 */ +- "HDMI_CEC", /* GPIOH_3 */ +- "VL-RST_N", /* GPIOH_4 */ +- "CON1-P36", /* GPIOH_5 */ +- "VL-PWREN", /* GPIOH_6 */ +- "WiFi_3V3_1V8", /* GPIOH_7 */ +- "TFLASH_VDD_EN", /* GPIOH_8 */ +- /* BOOT */ +- "eMMC_D0", /* BOOT_0 */ +- "eMMC_D1", /* BOOT_1 */ +- "eMMC_D2", /* BOOT_2 */ +- "eMMC_D3", /* BOOT_3 */ +- "eMMC_D4", /* BOOT_4 */ +- "eMMC_D5", /* BOOT_5 */ +- "eMMC_D6", /* BOOT_6 */ +- "eMMC_D7", /* BOOT_7 */ +- "eMMC_CLK", /* BOOT_8 */ +- "", +- "eMMC_CMD", /* BOOT_10 */ +- "", +- "eMMC_RST#", /* BOOT_12 */ +- "eMMC_DS", /* BOOT_13 */ +- /* GPIOC */ +- "SD_D0_B", /* GPIOC_0 */ +- "SD_D1_B", /* GPIOC_1 */ +- "SD_D2_B", /* GPIOC_2 */ +- "SD_D3_B", /* GPIOC_3 */ +- "SD_CLK_B", /* GPIOC_4 */ +- "SD_CMD_B", /* GPIOC_5 */ +- "CARD_EN_DET", /* GPIOC_6 */ +- "", +- /* GPIOA */ +- "", "", "", "", "", "", "", "", +- "", "", "", "", "", "", +- "CON1-P27", /* GPIOA_14 */ +- "CON1-P28", /* GPIOA_15 */ +- /* GPIOX */ +- "CON1-P16", /* GPIOX_0 */ +- "CON1-P18", /* GPIOX_1 */ +- "CON1-P22", /* GPIOX_2 */ +- "CON1-P11", /* GPIOX_3 */ +- "CON1-P13", /* GPIOX_4 */ +- "CON1-P07", /* GPIOX_5 */ +- "CON1-P33", /* GPIOX_6 */ +- "CON1-P15", /* GPIOX_7 */ +- "CON1-P19", /* GPIOX_8 */ +- "CON1-P21", /* GPIOX_9 */ +- "CON1-P24", /* GPIOX_10 */ +- "CON1-P23", /* GPIOX_11 */ +- "CON1-P08", /* GPIOX_12 */ +- "CON1-P10", /* GPIOX_13 */ +- "CON1-P29", /* GPIOX_14 */ +- "CON1-P31", /* GPIOX_15 */ +- "CON1-P26", /* GPIOX_16 */ +- "CON1-P03", /* GPIOX_17 */ +- "CON1-P05", /* GPIOX_18 */ +- "CON1-P32"; /* GPIOX_19 */ +- +- /* +- * WARNING: The USB Hub on the BPI-M5 needs a reset signal +- * to be turned high in order to be detected by the USB Controller +- * This signal should be handled by a USB specific power sequence +- * in order to reset the Hub when USB bus is powered down. +- */ +- usb-hub { +- gpio-hog; +- gpios = ; +- output-high; +- line-name = "usb-hub-reset"; +- }; +-}; +- +-&gpio_ao { +- gpio-line-names = +- /* GPIOAO */ +- "DEBUG TX", /* GPIOAO_0 */ +- "DEBUG RX", /* GPIOAO_1 */ +- "SYS_LED2", /* GPIOAO_2 */ +- "UPDATE_KEY", /* GPIOAO_3 */ +- "CON1-P40", /* GPIOAO_4 */ +- "IR_IN", /* GPIOAO_5 */ +- "TF_3V3N_1V8_EN", /* GPIOAO_6 */ +- "CON1-P35", /* GPIOAO_7 */ +- "CON1-P12", /* GPIOAO_8 */ +- "CON1-P37", /* GPIOAO_9 */ +- "CON1-P38", /* GPIOAO_10 */ +- "SYS_LED", /* GPIOAO_11 */ +- /* GPIOE */ +- "VDDEE_PWM", /* GPIOE_0 */ +- "VDDCPU_PWM", /* GPIOE_1 */ +- "TF_PWR_EN"; /* GPIOE_2 */ +-}; +- +-&hdmi_tx { +- status = "okay"; +- pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; +- pinctrl-names = "default"; +- hdmi-supply = <&dc_in>; +-}; +- +-&hdmi_tx_tmds_port { +- hdmi_tx_tmds_out: endpoint { +- remote-endpoint = <&hdmi_connector_in>; +- }; +-}; +- +-&ir { +- status = "okay"; +- pinctrl-0 = <&remote_input_ao_pins>; +- pinctrl-names = "default"; +-}; +- +-&pwm_AO_cd { +- pinctrl-0 = <&pwm_ao_d_e_pins>; +- pinctrl-names = "default"; +- clocks = <&xtal>; +- clock-names = "clkin1"; +- status = "okay"; +-}; +- +-&saradc { +- status = "okay"; +- vref-supply = <&vddao_1v8>; +-}; +- +-/* SD card */ +-&sd_emmc_b { +- status = "okay"; +- pinctrl-0 = <&sdcard_c_pins>; +- pinctrl-1 = <&sdcard_clk_gate_c_pins>; +- pinctrl-names = "default", "clk-gate"; +- +- bus-width = <4>; +- cap-sd-highspeed; +- max-frequency = <50000000>; +- disable-wp; +- +- /* TOFIX: SD card is barely usable in SDR modes */ +- +- cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; +- vmmc-supply = <&tflash_vdd>; +- vqmmc-supply = <&vddio_c>; +-}; +- +-/* eMMC */ +-&sd_emmc_c { +- status = "okay"; +- pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; +- pinctrl-1 = <&emmc_clk_gate_pins>; +- pinctrl-names = "default", "clk-gate"; +- +- bus-width = <8>; +- cap-mmc-highspeed; +- mmc-ddr-1_8v; +- mmc-hs200-1_8v; +- max-frequency = <200000000>; +- disable-wp; +- +- mmc-pwrseq = <&emmc_pwrseq>; +- vmmc-supply = <&vddao_3v3>; +- vqmmc-supply = <&emmc_1v8>; +-}; +- + &tdmif_b { + status = "okay"; + }; +@@ -625,22 +220,3 @@ + &toddr_c { + status = "okay"; + }; +- +-&uart_AO { +- status = "okay"; +- pinctrl-0 = <&uart_ao_a_pins>; +- pinctrl-names = "default"; +-}; +- +-&usb { +- status = "okay"; +-}; +- +-&usb2_phy0 { +- phy-supply = <&dc_in>; +-}; +- +-&usb2_phy1 { +- /* Enable the hub which is connected to this port */ +- phy-supply = <&vl_pwr_en>; +-}; +diff --git a/arch/arm/dts/meson-sm1-bananapi.dtsi b/arch/arm/dts/meson-sm1-bananapi.dtsi +new file mode 100644 +index 0000000000..c914f11481 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi.dtsi +@@ -0,0 +1,435 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-sm1.dtsi" ++#include ++#include ++#include ++ ++/ { ++ adc_keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ ++ key { ++ label = "SW3"; ++ linux,code = ; ++ press-threshold-microvolt = <1700000>; ++ }; ++ }; ++ ++ aliases { ++ serial0 = &uart_AO; ++ ethernet0 = ðmac; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ gpio-keys { ++ compatible = "gpio-keys"; ++ ++ key { ++ label = "SW1"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_LOW>; ++ interrupt-parent = <&gpio_intc>; ++ interrupts = <3 IRQ_TYPE_EDGE_BOTH>; ++ }; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++ ++ 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 GPIOE_2 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ ++ gpios = <&gpio_ao GPIOAO_6 GPIO_OPEN_DRAIN>; ++ gpios-states = <1>; ++ ++ states = <1800000 0>, ++ <3300000 1>; ++ }; ++ ++ tflash_vdd: regulator-tflash_vdd { ++ compatible = "regulator-fixed"; ++ regulator-name = "TFLASH_VDD"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ regulator-always-on; ++ }; ++ ++ 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: regulator-vddcpu { ++ /* ++ * SY8120B1ABC DC/DC Regulator. ++ */ ++ compatible = "pwm-regulator"; ++ ++ regulator-name = "VDDCPU"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ ++ pwm-supply = <&dc_in>; ++ ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ /* USB Hub Power Enable */ ++ vl_pwr_en: regulator-vl_pwr_en { ++ compatible = "regulator-fixed"; ++ regulator-name = "VL_PWR_EN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&dc_in>; ++ ++ gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&cpu0 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu1 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU1_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu2 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU2_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&cpu3 { ++ cpu-supply = <&vddcpu>; ++ operating-points-v2 = <&cpu_opp_table>; ++ clocks = <&clkc CLKID_CPU3_CLK>; ++ clock-latency = <50000>; ++}; ++ ++&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>; ++ }; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii-txid"; ++ phy-handle = <&external_phy>; ++}; ++ ++&gpio { ++ gpio-line-names = ++ /* GPIOZ */ ++ "ETH_MDIO", /* GPIOZ_0 */ ++ "ETH_MDC", /* GPIOZ_1 */ ++ "ETH_RXCLK", /* GPIOZ_2 */ ++ "ETH_RX_DV", /* GPIOZ_3 */ ++ "ETH_RXD0", /* GPIOZ_4 */ ++ "ETH_RXD1", /* GPIOZ_5 */ ++ "ETH_RXD2", /* GPIOZ_6 */ ++ "ETH_RXD3", /* GPIOZ_7 */ ++ "ETH_TXCLK", /* GPIOZ_8 */ ++ "ETH_TXEN", /* GPIOZ_9 */ ++ "ETH_TXD0", /* GPIOZ_10 */ ++ "ETH_TXD1", /* GPIOZ_11 */ ++ "ETH_TXD2", /* GPIOZ_12 */ ++ "ETH_TXD3", /* GPIOZ_13 */ ++ "ETH_INTR", /* GPIOZ_14 */ ++ "ETH_NRST", /* GPIOZ_15 */ ++ /* GPIOH */ ++ "HDMI_SDA", /* GPIOH_0 */ ++ "HDMI_SCL", /* GPIOH_1 */ ++ "HDMI_HPD", /* GPIOH_2 */ ++ "HDMI_CEC", /* GPIOH_3 */ ++ "VL-RST_N", /* GPIOH_4 */ ++ "CON1-P36", /* GPIOH_5 */ ++ "VL-PWREN", /* GPIOH_6 */ ++ "WiFi_3V3_1V8", /* GPIOH_7 */ ++ "TFLASH_VDD_EN", /* GPIOH_8 */ ++ /* BOOT */ ++ "eMMC_D0", /* BOOT_0 */ ++ "eMMC_D1", /* BOOT_1 */ ++ "eMMC_D2", /* BOOT_2 */ ++ "eMMC_D3", /* BOOT_3 */ ++ "eMMC_D4", /* BOOT_4 */ ++ "eMMC_D5", /* BOOT_5 */ ++ "eMMC_D6", /* BOOT_6 */ ++ "eMMC_D7", /* BOOT_7 */ ++ "eMMC_CLK", /* BOOT_8 */ ++ "", ++ "eMMC_CMD", /* BOOT_10 */ ++ "", ++ "eMMC_RST#", /* BOOT_12 */ ++ "eMMC_DS", /* BOOT_13 */ ++ "", "", ++ /* GPIOC */ ++ "SD_D0_B", /* GPIOC_0 */ ++ "SD_D1_B", /* GPIOC_1 */ ++ "SD_D2_B", /* GPIOC_2 */ ++ "SD_D3_B", /* GPIOC_3 */ ++ "SD_CLK_B", /* GPIOC_4 */ ++ "SD_CMD_B", /* GPIOC_5 */ ++ "CARD_EN_DET", /* GPIOC_6 */ ++ "", ++ /* GPIOA */ ++ "", "", "", "", "", "", "", "", ++ "", "", "", "", "", "", ++ "CON1-P27", /* GPIOA_14 */ ++ "CON1-P28", /* GPIOA_15 */ ++ /* GPIOX */ ++ "CON1-P16", /* GPIOX_0 */ ++ "CON1-P18", /* GPIOX_1 */ ++ "CON1-P22", /* GPIOX_2 */ ++ "CON1-P11", /* GPIOX_3 */ ++ "CON1-P13", /* GPIOX_4 */ ++ "CON1-P07", /* GPIOX_5 */ ++ "CON1-P33", /* GPIOX_6 */ ++ "CON1-P15", /* GPIOX_7 */ ++ "CON1-P19", /* GPIOX_8 */ ++ "CON1-P21", /* GPIOX_9 */ ++ "CON1-P24", /* GPIOX_10 */ ++ "CON1-P23", /* GPIOX_11 */ ++ "CON1-P08", /* GPIOX_12 */ ++ "CON1-P10", /* GPIOX_13 */ ++ "CON1-P29", /* GPIOX_14 */ ++ "CON1-P31", /* GPIOX_15 */ ++ "CON1-P26", /* GPIOX_16 */ ++ "CON1-P03", /* GPIOX_17 */ ++ "CON1-P05", /* GPIOX_18 */ ++ "CON1-P32"; /* GPIOX_19 */ ++ ++ /* ++ * WARNING: The USB Hub needs a reset signal to be turned high in ++ * order to be detected by the USB Controller. This signal should ++ * be handled by a USB specific power sequence to reset the Hub ++ * when the USB bus is powered down. ++ */ ++ usb-hub { ++ gpio-hog; ++ gpios = ; ++ output-high; ++ line-name = "usb-hub-reset"; ++ }; ++}; ++ ++&gpio_ao { ++ gpio-line-names = ++ /* GPIOAO */ ++ "DEBUG TX", /* GPIOAO_0 */ ++ "DEBUG RX", /* GPIOAO_1 */ ++ "SYS_LED2", /* GPIOAO_2 */ ++ "UPDATE_KEY", /* GPIOAO_3 */ ++ "CON1-P40", /* GPIOAO_4 */ ++ "IR_IN", /* GPIOAO_5 */ ++ "TF_3V3N_1V8_EN", /* GPIOAO_6 */ ++ "CON1-P35", /* GPIOAO_7 */ ++ "CON1-P12", /* GPIOAO_8 */ ++ "CON1-P37", /* GPIOAO_9 */ ++ "CON1-P38", /* GPIOAO_10 */ ++ "SYS_LED", /* GPIOAO_11 */ ++ /* GPIOE */ ++ "VDDEE_PWM", /* GPIOE_0 */ ++ "VDDCPU_PWM", /* GPIOE_1 */ ++ "TF_PWR_EN"; /* GPIOE_2 */ ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&dc_in>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&ir { ++ status = "okay"; ++ pinctrl-0 = <&remote_input_ao_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ /* TOFIX: SD card is barely usable in SDR modes */ ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&tflash_vdd>; ++ vqmmc-supply = <&vddio_c>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&emmc_1v8>; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb { ++ status = "okay"; ++}; ++ ++&usb2_phy0 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb2_phy1 { ++ /* Enable the hub which is connected to this port */ ++ phy-supply = <&vl_pwr_en>; ++}; +-- +2.34.1 + 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 new file mode 100644 index 0000000000..aa2db89932 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0017-WIP-ARM-dts-add-support-for-BananaPi-M2-Pro.patch @@ -0,0 +1,152 @@ +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 + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/Makefile | 1 + + .../dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi | 13 +++ + arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 98 +++++++++++++++++++ + 3 files changed, 112 insertions(+) + create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-sm1-bananapi-m2-pro.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 926ae0aae4..4e9fa81e18 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -203,6 +203,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ + meson-g12b-odroid-n2.dtb \ + meson-g12b-odroid-n2-plus.dtb \ + meson-g12b-radxa-zero2.dtb \ ++ meson-sm1-bananapi-m2-pro.dtb \ + meson-sm1-bananapi-m5.dtb \ + meson-sm1-khadas-vim3l.dtb \ + meson-sm1-odroid-c4.dtb \ +diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi +new file mode 100644 +index 0000000000..a86fdb5668 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro-u-boot.dtsi +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre, SAS ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-sm1-u-boot.dtsi" ++ ++ðmac { ++ snps,reset-gpio = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ snps,reset-delays-us = <0 10000 1000000>; ++ snps,reset-active-low; ++}; +diff --git a/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts +new file mode 100644 +index 0000000000..4890d5d9a4 +--- /dev/null ++++ b/arch/arm/dts/meson-sm1-bananapi-m2-pro.dts +@@ -0,0 +1,98 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2021 BayLibre SAS ++ * Author: Neil Armstrong ++ */ ++ ++/dts-v1/; ++ ++#include "meson-sm1-bananapi.dtsi" ++#include ++ ++/ { ++ compatible = "bananapi,bpi-m2-pro", "amlogic,sm1"; ++ model = "Banana Pi BPI-M2-PRO"; ++ ++ sound { ++ compatible = "amlogic,axg-sound-card"; ++ model = "BPI-M2-PRO"; ++ audio-aux-devs = <&tdmout_b>; ++ audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", ++ "TDMOUT_B IN 1", "FRDDR_B OUT 1", ++ "TDMOUT_B IN 2", "FRDDR_C OUT 1", ++ "TDM_B Playback", "TDMOUT_B OUT"; ++ ++ assigned-clocks = <&clkc CLKID_MPLL2>, ++ <&clkc CLKID_MPLL0>, ++ <&clkc CLKID_MPLL1>; ++ assigned-clock-parents = <0>, <0>, <0>; ++ assigned-clock-rates = <294912000>, ++ <270950400>, ++ <393216000>; ++ status = "okay"; ++ ++ dai-link-0 { ++ sound-dai = <&frddr_a>; ++ }; ++ ++ dai-link-1 { ++ sound-dai = <&frddr_b>; ++ }; ++ ++ dai-link-2 { ++ sound-dai = <&frddr_c>; ++ }; ++ ++ /* 8ch hdmi interface */ ++ dai-link-3 { ++ sound-dai = <&tdmif_b>; ++ dai-format = "i2s"; ++ dai-tdm-slot-tx-mask-0 = <1 1>; ++ dai-tdm-slot-tx-mask-1 = <1 1>; ++ dai-tdm-slot-tx-mask-2 = <1 1>; ++ dai-tdm-slot-tx-mask-3 = <1 1>; ++ mclk-fs = <256>; ++ ++ codec { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-4 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&tdmif_b { ++ status = "okay"; ++}; ++ ++&tdmout_b { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; +-- +2.34.1 + 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 new file mode 100644 index 0000000000..e17be8f0c5 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0018-WIP-boards-add-BananaPi-M2-Pro-defconfig.patch @@ -0,0 +1,96 @@ +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 + +Signed-off-by: Christian Hewitt +--- + configs/bananapi-m2-pro_defconfig | 76 +++++++++++++++++++++++++++++++ + 1 file changed, 76 insertions(+) + create mode 100644 configs/bananapi-m2-pro_defconfig + +diff --git a/configs/bananapi-m2-pro_defconfig b/configs/bananapi-m2-pro_defconfig +new file mode 100644 +index 0000000000..1c2b8ab95e +--- /dev/null ++++ b/configs/bananapi-m2-pro_defconfig +@@ -0,0 +1,76 @@ ++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-sm1-bananapi-m2-pro" ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING="bpi-m2-pro" ++CONFIG_SYS_LOAD_ADDR=0x1000000 ++CONFIG_DEBUG_UART=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_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_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_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_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-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 new file mode 100644 index 0000000000..03ad4f5c60 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0019-WIP-docs-boards-amlogic-update-for-BananaPi-M2-Pro.patch @@ -0,0 +1,49 @@ +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 + +Signed-off-by: Christian Hewitt +--- + board/amlogic/u200/MAINTAINERS | 1 + + doc/board/amlogic/index.rst | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS +index 47cec234a1..2a2d9d4c49 100644 +--- a/board/amlogic/u200/MAINTAINERS ++++ b/board/amlogic/u200/MAINTAINERS +@@ -4,6 +4,7 @@ S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/u200/ + F: configs/u200_defconfig ++F: configs/bananapi-m2-pro_defconfig + F: configs/bananapi-m5_defconfig + F: configs/radxa-zero_defconfig + F: doc/board/amlogic/u200.rst +diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst +index b8b6f9b98a..629284fca9 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -19,7 +19,8 @@ This matrix concerns the actual source code version. + | | Nanopi-K2 | Khadas-VIM | Khadas VIM2 | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | + | | 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 | BananaPi-M5 | ++| | | JetHub J80 | | | | Radxa Zero2 | BPi-M2-Pro | ++| | | | | | | Radxa Zero2 | BPi-M5 | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +@@ -37,7 +38,7 @@ This matrix concerns the actual source code version. + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | Multi-core | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-| Fuse access | **Yes** | **Yes** |**Yes** |**Yes** |**Yes** |**Yes** | **Yes** | ++| Fuse access | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | SPI (FC) | **Yes** | **Yes** | **Yes** | **Yes** |**Yes** | **Yes** | No | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-- +2.34.1 + 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 new file mode 100644 index 0000000000..82df4f88b2 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0020-WIP-boards-add-BananaPi-M2S-defconfig.patch @@ -0,0 +1,102 @@ +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 + +Signed-off-by: Christian Hewitt +--- + configs/bananapi-m2s_defconfig | 82 ++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 configs/bananapi-m2s_defconfig + +diff --git a/configs/bananapi-m2s_defconfig b/configs/bananapi-m2s_defconfig +new file mode 100644 +index 0000000000..7a35ea623d +--- /dev/null ++++ b/configs/bananapi-m2s_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-a311d-bananapi-m2s" ++CONFIG_MESON_G12A=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING=" bpi-m2s" ++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-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 new file mode 100644 index 0000000000..68e1d2aa95 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0021-WIP-docs-boards-amlogic-update-for-BananaPi-M2S.patch @@ -0,0 +1,40 @@ +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 + +Signed-off-by: Christian Hewitt +--- + board/amlogic/w400/MAINTAINERS | 2 ++ + doc/board/amlogic/index.rst | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS +index 6e1ef9b8b8..d4b4d4f91d 100644 +--- a/board/amlogic/w400/MAINTAINERS ++++ b/board/amlogic/w400/MAINTAINERS +@@ -3,6 +3,8 @@ M: Neil Armstrong + S: Maintained + L: u-boot-amlogic@groups.io + F: board/amlogic/w400/ ++F: configs/bananapi-m2s_defconfig + F: configs/radxa-zero2_defconfig + F: doc/board/amlogic/w400.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 629284fca9..fd8d4185f8 100644 +--- a/doc/board/amlogic/index.rst ++++ b/doc/board/amlogic/index.rst +@@ -20,7 +20,7 @@ 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 | +-| | | | | | | Radxa Zero2 | BPi-M5 | ++| | | | | | | BPI-M2S | BPi-M5 | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ + | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | + +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ +-- +2.34.1 + 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 new file mode 100644 index 0000000000..fe9a7d6e12 --- /dev/null +++ b/projects/Amlogic/patches/u-boot/u-boot-0022-WIP-ARM-dts-add-support-for-BananaPi-M2S.patch @@ -0,0 +1,651 @@ +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 + +Import the device-tree from Linux 6.x + +Signed-off-by: Christian Hewitt +--- + arch/arm/dts/Makefile | 1 + + .../arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 14 + + arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi | 13 + + arch/arm/dts/meson-g12b-bananapi.dtsi | 551 ++++++++++++++++++ + .../arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 + + 5 files changed, 593 insertions(+) + create mode 100644 arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts + create mode 100644 arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi + create mode 100644 arch/arm/dts/meson-g12b-bananapi.dtsi + create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts + +diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile +index 4e9fa81e18..788fec93a3 100644 +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -196,6 +196,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ + meson-g12a-radxa-zero.dtb \ + meson-g12a-sei510.dtb \ + meson-g12a-u200.dtb \ ++ meson-g12b-a311d-bananapi-m2s.dtb \ + meson-g12b-a311d-khadas-vim3.dtb \ + meson-g12b-gtking.dtb \ + meson-g12b-gtking-pro.dtb \ +diff --git a/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts +new file mode 100644 +index 0000000000..f6c950919b +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts +@@ -0,0 +1,14 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-a311d.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,a311d", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; +diff --git a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi +new file mode 100644 +index 0000000000..a92f9e9ff1 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi +@@ -0,0 +1,13 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2019 BayLibre, SAS. ++ * Author: Neil Armstrong ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" ++ ++/* SARADC is needed for proper board variant detection */ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; +diff --git a/arch/arm/dts/meson-g12b-bananapi.dtsi b/arch/arm/dts/meson-g12b-bananapi.dtsi +new file mode 100644 +index 0000000000..3a9f36ad4e +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-bananapi.dtsi +@@ -0,0 +1,551 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++#include ++#include ++#include ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ serial2 = &uart_A; ++ ethernet0 = ðmac; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x80000000>; ++ }; ++ ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 2>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ ++ button-function { ++ label = "RST"; ++ linux,code = ; ++ press-threshold-microvolt = <40000>; ++ }; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ fan0: pwm-fan { ++ compatible = "pwm-fan"; ++ #cooling-cells = <2>; ++ cooling-min-state = <0>; ++ cooling-max-state = <3>; ++ cooling-levels = <0 120 170 220>; ++ pwms = <&pwm_cd 1 40000 0>; ++ }; ++ ++ hdmi-connector { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi_connector_in: endpoint { ++ remote-endpoint = <&hdmi_tx_tmds_out>; ++ }; ++ }; ++ }; ++ ++ 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"; ++ }; ++ }; ++ ++ 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 */ ++ }; ++ ++ dc_in: regulator-dc_in { ++ compatible = "regulator-fixed"; ++ regulator-name = "DC_IN"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vcc_5v: regulator-vcc_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&dc_in>; ++ ++ gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; ++ enable-active-high; ++ }; ++ ++ vcc_3v3: regulator-vcc_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vcc_1v8: regulator-vcc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddao_1v8: regulator-vddao_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vsys_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddcpu_a: regulator-vddcpu-a { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_A"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ 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 { ++ compatible = "pwm-regulator"; ++ regulator-name = "VDDCPU_B"; ++ regulator-min-microvolt = <690000>; ++ regulator-max-microvolt = <1050000>; ++ pwm-supply = <&vsys_3v3>; ++ pwms = <&pwm_AO_cd 1 1250 0>; ++ pwm-dutycycle-range = <100 0>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ vsys_3v3: regulator-vsys_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VSYS_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&dc_in>; ++ regulator-always-on; ++ }; ++ ++ emmc_1v8: regulator-emmc_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "EMMC_AO1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc_3v3>; ++ regulator-always-on; ++ }; ++ ++ usb_pwr: regulator-usb_pwr { ++ compatible = "regulator-fixed"; ++ regulator-name = "USB_PWR"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_5v>; ++ ++ gpio = <&gpio GPIOA_6 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ 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"; ++ ++ 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>; ++ }; ++ ++ 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-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_A>; ++ }; ++ }; ++ ++ /* hdmi glue */ ++ dai-link-7 { ++ sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; ++ ++ codec { ++ sound-dai = <&hdmi_tx>; ++ }; ++ }; ++ }; ++}; ++ ++&arb { ++ status = "okay"; ++}; ++ ++&clkc_audio { ++ status = "okay"; ++}; ++ ++&cec_AO { ++ pinctrl-0 = <&cec_ao_a_h_pins>; ++ pinctrl-names = "default"; ++ status = "disabled"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&cecb_AO { ++ pinctrl-0 = <&cec_ao_b_h_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ hdmi-phandle = <&hdmi_tx>; ++}; ++ ++&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>; ++}; ++ ++ðmac { ++ pinctrl-0 = <ð_pins>, <ð_rgmii_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ phy-mode = "rgmii"; ++ phy-handle = <&external_phy>; ++ amlogic,tx-delay-ns = <2>; ++}; ++ ++&ext_mdio { ++ external_phy: ethernet-phy@0 { ++ /* Realtek RTL8211F (0x001cc916) */ ++ reg = <0>; ++ max-speed = <1000>; ++ ++ reset-assert-us = <10000>; ++ reset-deassert-us = <80000>; ++ reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; ++ ++ interrupt-parent = <&gpio_intc>; ++ /* MAC_INTR on GPIOZ_14 */ ++ interrupts = <26 IRQ_TYPE_LEVEL_LOW>; ++ }; ++}; ++ ++&frddr_a { ++ status = "okay"; ++}; ++ ++&frddr_b { ++ status = "okay"; ++}; ++ ++&frddr_c { ++ status = "okay"; ++}; ++ ++&hdmi_tx { ++ status = "okay"; ++ pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; ++ pinctrl-names = "default"; ++ hdmi-supply = <&vcc_5v>; ++}; ++ ++&hdmi_tx_tmds_port { ++ hdmi_tx_tmds_out: endpoint { ++ remote-endpoint = <&hdmi_connector_in>; ++ }; ++}; ++ ++&pcie { ++ status = "okay"; ++ reset-gpios = <&gpio GPIOA_8 GPIO_ACTIVE_LOW>; ++}; ++ ++&pwm_ab { ++ status = "okay"; ++ pinctrl-0 = <&pwm_a_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin0"; ++}; ++ ++&pwm_cd { ++ status = "okay"; ++ pinctrl-0 = <&pwm_d_x6_pins>; ++ pinctrl-names = "default"; ++ pwm-gpios = <&gpio GPIOAO_10 GPIO_ACTIVE_HIGH>; ++}; ++ ++&pwm_ef { ++ status = "okay"; ++ pinctrl-0 = <&pwm_e_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_AO_cd { ++ pinctrl-0 = <&pwm_ao_d_e_pins>; ++ pinctrl-names = "default"; ++ clocks = <&xtal>; ++ clock-names = "clkin1"; ++ status = "okay"; ++}; ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddao_1v8>; ++}; ++ ++/* SDIO */ ++&sd_emmc_a { ++ status = "okay"; ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ bus-width = <4>; ++ sd-uhs-sdr104; ++ max-frequency = <50000000>; ++ ++ non-removable; ++ disable-wp; ++ ++ /* WiFi firmware requires power to be kept while in suspend */ ++ keep-power-in-suspend; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vsys_3v3>; ++ vqmmc-supply = <&vddao_1v8>; ++ ++ rtl8822cs: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++/* SD card */ ++&sd_emmc_b { ++ status = "okay"; ++ pinctrl-0 = <&sdcard_c_pins>; ++ pinctrl-1 = <&sdcard_clk_gate_c_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ ++ cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; ++ vmmc-supply = <&vsys_3v3>; ++ vqmmc-supply = <&vsys_3v3>; ++}; ++ ++/* eMMC */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ max-frequency = <200000000>; ++ disable-wp; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ vmmc-supply = <&vcc_3v3>; ++ vqmmc-supply = <&emmc_1v8>; ++}; ++ ++&tdmif_a { ++ status = "okay"; ++}; ++ ++&tdmin_a { ++ status = "okay"; ++}; ++ ++&tdmout_a { ++ status = "okay"; ++}; ++ ++&toddr_a { ++ status = "okay"; ++}; ++ ++&toddr_b { ++ status = "okay"; ++}; ++ ++&toddr_c { ++ status = "okay"; ++}; ++ ++&tohdmitx { ++ status = "okay"; ++}; ++ ++&uart_A { ++ 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>; ++ max-speed = <2000000>; ++ }; ++}; ++ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&usb2_phy0 { ++ phy-supply = <&dc_in>; ++}; ++ ++&usb2_phy1 { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb3_pcie_phy { ++ phy-supply = <&usb_pwr>; ++}; ++ ++&usb { ++ status = "okay"; ++ dr_mode = "peripheral"; ++ phys = <&usb2_phy0>, <&usb2_phy1>; ++ phy-names = "usb2-phy0", "usb2-phy1"; ++}; +diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts +new file mode 100644 +index 0000000000..7f66f263a2 +--- /dev/null ++++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts +@@ -0,0 +1,14 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2023 Christian Hewitt ++ */ ++ ++/dts-v1/; ++ ++#include "meson-g12b-s922x.dtsi" ++#include "meson-g12b-bananapi.dtsi" ++ ++/ { ++ compatible = "bananapi,bpi-m2s", "amlogic,s922x", "amlogic,g12b"; ++ model = "BananaPi M2S"; ++}; +-- +2.34.1 + diff --git a/scripts/uboot_helper b/scripts/uboot_helper index 4cf6e4ca11..cd2c75fc90 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -164,6 +164,14 @@ devices = \ 'dtb': '', 'config': 'p212_defconfig' }, + 'bananapi-m2s': { + 'dtb': 'meson-g12b-a311d-bananapi-m2s.dtb', + 'config': 'bananapi-m2s_defconfig' + }, + 'bananapi-m2-pro': { + 'dtb': 'meson-sm1-bananapi-m2-pro.dtb', + 'config': 'bananapi-m2-pro_defconfig' + }, 'bananapi-m5': { 'dtb': 'meson-sm1-bananapi-m5.dtb', 'config': 'bananapi-m5_defconfig'