From 8c9b594cd3b46bb9753f90e352fa9047393fafca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferass=20El=C2=A0Hafidi?= Date: Sat, 1 Apr 2023 15:29:41 +0200 Subject: [PATCH] linux-postmarketos-amlogic: upgrade to 6.2.9 (MR 3987) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also update the patches with new, rebased ones straight from the linux-amlogic mailing list, and rename them. Signed-off-by: Ferass El Hafidi [ci:skip-build] already built successfully in CI --- ...-gxbb-kii-pro-sort-and-tidy-the-dts.patch} | 37 +++++++++---------- ...kii-pro-complete-the-bluetooth-node.patch} | 12 +++--- ...b-kii-pro-add-initial-audio-support.patch} | 21 +++++------ .../linux-postmarketos-amlogic/APKBUILD | 18 ++++----- 4 files changed, 42 insertions(+), 46 deletions(-) rename device/testing/linux-postmarketos-amlogic/{0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch => 0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch} (75%) rename device/testing/linux-postmarketos-amlogic/{0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch => 0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch} (72%) rename device/testing/linux-postmarketos-amlogic/{0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch => 0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch} (81%) diff --git a/device/testing/linux-postmarketos-amlogic/0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch b/device/testing/linux-postmarketos-amlogic/0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch similarity index 75% rename from device/testing/linux-postmarketos-amlogic/0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch rename to device/testing/linux-postmarketos-amlogic/0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch index 6dd56052e..848753a68 100644 --- a/device/testing/linux-postmarketos-amlogic/0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch +++ b/device/testing/linux-postmarketos-amlogic/0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch @@ -1,22 +1,24 @@ -From b278353bcfc3c123b5b728134925432dc5d138b7 Mon Sep 17 00:00:00 2001 +From 2409687a1abadb458db01a0ddb74626daf41c4e3 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:16:12 +0000 -Subject: [PATCH 1/3] WIP: arm64: dts: meson: gxbb-kii-pro: sort and tidy the - dts +Subject: [PATCH] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: sort and tidy + the dts Alpha-sort the nodes, move the default line in the LED node to where it's normally found, and remove excess spacing. No functional changes. Signed-off-by: Christian Hewitt +Tested-by: Ferass El Hafidi +Reviewed-by: Neil Armstrong --- - .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 32 ++++++++----------- - 1 file changed, 14 insertions(+), 18 deletions(-) + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 31 ++++++++----------- + 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 6d8cc00fe..9bfdb54d9 100644 +index 5f2d4317ecfbf1..73ad0f5110f376 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -6,21 +6,22 @@ +@@ -6,10 +6,10 @@ /dts-v1/; #include "meson-gxbb-p20x.dtsi" @@ -28,11 +30,9 @@ index 6d8cc00fe..9bfdb54d9 100644 / { compatible = "videostrong,kii-pro", "amlogic,meson-gxbb"; model = "Videostrong KII Pro"; - - leds { +@@ -18,9 +18,9 @@ compatible = "gpio-leds"; -+ - status { + led { gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>; - default-state = "off"; color = ; @@ -41,13 +41,13 @@ index 6d8cc00fe..9bfdb54d9 100644 }; }; -@@ -34,24 +35,8 @@ button-reset { +@@ -34,24 +34,8 @@ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; - --}; -- + }; + - - -&uart_A { @@ -59,14 +59,14 @@ index 6d8cc00fe..9bfdb54d9 100644 - bluetooth { - compatible = "brcm,bcm4335a0"; - }; - }; - +-}; +- - - ðmac { status = "okay"; pinctrl-0 = <ð_rmii_pins>; -@@ -78,3 +63,14 @@ eth_phy0: ethernet-phy@0 { +@@ -78,3 +62,14 @@ &ir { linux,rc-map-name = "rc-videostrong-kii-pro"; }; @@ -81,6 +81,3 @@ index 6d8cc00fe..9bfdb54d9 100644 + compatible = "brcm,bcm4335a0"; + }; +}; --- -2.39.1 - diff --git a/device/testing/linux-postmarketos-amlogic/0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch b/device/testing/linux-postmarketos-amlogic/0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch similarity index 72% rename from device/testing/linux-postmarketos-amlogic/0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch rename to device/testing/linux-postmarketos-amlogic/0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch index 78975da1d..87001b802 100644 --- a/device/testing/linux-postmarketos-amlogic/0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch +++ b/device/testing/linux-postmarketos-amlogic/0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch @@ -1,22 +1,24 @@ -From d77965a9ff66c119ec3cd702adeb99b799fed1b0 Mon Sep 17 00:00:00 2001 +From 4d8ba0f9f5d9146b2f4d8522ff1b565aaeb7ec1b Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:21:08 +0000 -Subject: [PATCH 2/3] WIP: arm64: dts: meson: gxbb-kii-pro: complete the +Subject: [PATCH] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: complete the bluetooth node Add missing content to the bluetooth node to align it with the content used in (all) other GXBB dts files. Signed-off-by: Christian Hewitt +Tested-by: Ferass El Hafidi +Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 9bfdb54d9..435ae2aa4 100644 +index 73ad0f5110f376..a800e8955c4a3e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -@@ -72,5 +72,10 @@ &uart_A { +@@ -71,5 +71,10 @@ bluetooth { compatible = "brcm,bcm4335a0"; @@ -27,6 +29,4 @@ index 9bfdb54d9..435ae2aa4 100644 + clock-names = "lpo"; }; }; --- -2.39.1 diff --git a/device/testing/linux-postmarketos-amlogic/0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch b/device/testing/linux-postmarketos-amlogic/0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch similarity index 81% rename from device/testing/linux-postmarketos-amlogic/0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch rename to device/testing/linux-postmarketos-amlogic/0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch index 9c4f30cc2..33378897e 100644 --- a/device/testing/linux-postmarketos-amlogic/0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch +++ b/device/testing/linux-postmarketos-amlogic/0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch @@ -1,18 +1,20 @@ -From b56967450d3aa37a7b0fc296de8a1a64801ae09f Mon Sep 17 00:00:00 2001 +From a2fc22db011ab46d8485ca831bb4c4e723e11225 Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Fri, 10 Feb 2023 02:29:00 +0000 -Subject: [PATCH 3/3] WIP: arm64: dts: meson: gxbb-kii-pro: add initial audio - support +Subject: [PATCH] FROMGIT(6.4): arm64: dts: meson: gxbb-kii-pro: add initial + audio support Add initial support for HDMI and S/PDIF audio output. Signed-off-by: Christian Hewitt +Tested-by: Ferass El Hafidi +Reviewed-by: Neil Armstrong --- - .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 61 +++++++++++++++++++ - 1 file changed, 61 insertions(+) + .../boot/dts/amlogic/meson-gxbb-kii-pro.dts | 60 +++++++++++++++++++ + 1 file changed, 60 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts -index 435ae2aa4..b6ee76011 100644 +index a800e8955c4a3e..e238f1f1012419 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts @@ -9,11 +9,19 @@ @@ -34,8 +36,8 @@ index 435ae2aa4..b6ee76011 100644 + leds { compatible = "gpio-leds"; - -@@ -35,6 +43,59 @@ button-reset { + led { +@@ -34,6 +42,58 @@ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; }; }; @@ -50,7 +52,6 @@ index 435ae2aa4..b6ee76011 100644 + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; -+ status = "okay"; + + dai-link-0 { + sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>; @@ -95,6 +96,4 @@ index 435ae2aa4..b6ee76011 100644 }; ðmac { --- -2.39.1 diff --git a/device/testing/linux-postmarketos-amlogic/APKBUILD b/device/testing/linux-postmarketos-amlogic/APKBUILD index 37bb6dfe4..73e3c62c1 100644 --- a/device/testing/linux-postmarketos-amlogic/APKBUILD +++ b/device/testing/linux-postmarketos-amlogic/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Ferass El Hafidi # Co-Maintainer: exkc pkgname=linux-postmarketos-amlogic -pkgver=6.1.10 -pkgrel=4 +pkgver=6.2.9 +pkgrel=0 pkgdesc="Mainline kernel for Amlogic devices" arch="aarch64" _carch="arm64" @@ -34,9 +34,9 @@ _config="config-$_flavor.$arch" source=" $pkgname-$pkgver.tar.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$pkgver.tar.xz $_config - 0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch - 0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch - 0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch + 0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch + 0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch + 0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch 0004-add-xiaomi-once-support.patch 0005-add-x96-mini-support.patch " @@ -69,11 +69,11 @@ package() { } sha512sums=" -7bec1d76ecafd89fdb13bc7c9c69b4f378e41b29aed33c302b235540f40f1d5e6b3c653d2dea83c2d03408e324ffa73ff3dcc7c47c685572719d62bc66a06a1d linux-postmarketos-amlogic-6.1.10.tar.xz +1ea62ac96dec4a11c18b2a2e8bd5ac42b10c63a861f515b8441550fe93702122d73020fec84c5538656e6aea2fbed7966bbb07055f489f4b865ff4c3be806c9f linux-postmarketos-amlogic-6.2.9.tar.xz 10c6fa8668ff125f377738f6921f1862cd289a4c92a122fd8067201c8c23832efb7c218b44179f00b75a1c0e3118db65945b7ce5a49ca59e38bee0e719bdc95a config-postmarketos-amlogic.aarch64 -182d779a91acd47dcd865eba919b404db24840493f54775dcf4508237edf65ff8aae9f84d8aa673d7aa2414934325ea972491cbf6d590434a6a5aad33eb8e20c 0001-WIP-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-d.patch -2a772de080dda5100a653a9806ee60130228dd2e232055362fa330ee42644374161aa032b1838f12555e952214ac29eb4ef664c587af2363796ba9f70d95dee3 0002-WIP-arm64-dts-meson-gxbb-kii-pro-complete-the-blueto.patch -a497d042112e1f6bf4b4793992907b25b99b9b6d5f77b051261b80ed90ef70022c647ef2db2385bb9dccf31e94b23fa9f3d9bc42b4d1ff1049bcf8cafb7a6b6d 0003-WIP-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-s.patch +3525e0baf74bdab925c2c3b2ce3086effbe463d303f324ac2bafaae5d56422404480ecd8762a9598b9a67fcf6163c872e9ed4c7ba555b927edfb23a8f64ceb0c 0001-arm64-dts-meson-gxbb-kii-pro-sort-and-tidy-the-dts.patch +c8d1aae798623e72248052f0fd07444bf52ee4910326c1de9b8b41a2aefd018636a292d76d7248248bad97730349a8facd32a96b00547cfa3d4ebe0125d4f2ce 0002-arm64-dts-meson-gxbb-kii-pro-complete-the-bluetooth-node.patch +e708b6a14f0ff80c3f25e0323ce3ad8139573de988e72f2f5886ad1bcb40827c4b072188278d14229d468c8a0124f4889fb894ff1fe1e2b3d6db66c3ea7067d4 0003-arm64-dts-meson-gxbb-kii-pro-add-initial-audio-support.patch 9d664c9cc6168a7aa4804662886941744e92c0748e7b7b4fad2472740a4931c89a60cbc4a519913b58933718d02f33f48ff72ea182d912bcd50014ca8d7ff110 0004-add-xiaomi-once-support.patch 3ea569b69297fdb196006b1e1bd82a9dec8d89362ec3ef17918018b6c573143f299a968b8227119660442f6a6e0b795aa4c8a272f6bc23e9622f3fd41ddc97eb 0005-add-x96-mini-support.patch "