linux-postmarketos-amlogic: upgrade to 6.4 (MR 4209)
Remove all KII Pro patches as they got merged into 6.4. Also remove V=1 as it's now unnecessary. Signed-off-by: Ferass El Hafidi <vitali64pmemail@protonmail.com> [ci:skip-build]: already built successfully in CI
This commit is contained in:
Ferass El Hafidi
Pablo Correa Gómez
parent
6eec0b0503
commit
ed29e90653
6 changed files with 9 additions and 231 deletions
|
|
@ -1,83 +0,0 @@
|
|||
From 2409687a1abadb458db01a0ddb74626daf41c4e3 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 10 Feb 2023 02:16:12 +0000
|
||||
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 <christianshewitt@gmail.com>
|
||||
Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
||||
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
|
||||
---
|
||||
.../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 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,10 +6,10 @@
|
||||
/dts-v1/;
|
||||
|
||||
#include "meson-gxbb-p20x.dtsi"
|
||||
-
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
+
|
||||
/ {
|
||||
compatible = "videostrong,kii-pro", "amlogic,meson-gxbb";
|
||||
model = "Videostrong KII Pro";
|
||||
@@ -18,9 +18,9 @@
|
||||
compatible = "gpio-leds";
|
||||
led {
|
||||
gpios = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_LOW>;
|
||||
- default-state = "off";
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_STATUS;
|
||||
+ default-state = "off";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -34,24 +34,8 @@
|
||||
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
-
|
||||
};
|
||||
|
||||
-
|
||||
-
|
||||
-&uart_A {
|
||||
- status = "okay";
|
||||
- pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
|
||||
- pinctrl-names = "default";
|
||||
- uart-has-rtscts;
|
||||
-
|
||||
- bluetooth {
|
||||
- compatible = "brcm,bcm4335a0";
|
||||
- };
|
||||
-};
|
||||
-
|
||||
-
|
||||
-
|
||||
ðmac {
|
||||
status = "okay";
|
||||
pinctrl-0 = <ð_rmii_pins>;
|
||||
@@ -78,3 +62,14 @@
|
||||
&ir {
|
||||
linux,rc-map-name = "rc-videostrong-kii-pro";
|
||||
};
|
||||
+
|
||||
+&uart_A {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;
|
||||
+ pinctrl-names = "default";
|
||||
+ uart-has-rtscts;
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm4335a0";
|
||||
+ };
|
||||
+};
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
From 4d8ba0f9f5d9146b2f4d8522ff1b565aaeb7ec1b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 10 Feb 2023 02:21:08 +0000
|
||||
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 <christianshewitt@gmail.com>
|
||||
Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
||||
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
|
||||
---
|
||||
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 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
|
||||
@@ -71,5 +71,10 @@
|
||||
|
||||
bluetooth {
|
||||
compatible = "brcm,bcm4335a0";
|
||||
+ shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
|
||||
+ host-wakeup-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>;
|
||||
+ max-speed = <2000000>;
|
||||
+ clocks = <&wifi32k>;
|
||||
+ clock-names = "lpo";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
From a2fc22db011ab46d8485ca831bb4c4e723e11225 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
||||
Date: Fri, 10 Feb 2023 02:29:00 +0000
|
||||
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 <christianshewitt@gmail.com>
|
||||
Tested-by: Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
||||
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
|
||||
---
|
||||
.../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 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 @@
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
+#include <dt-bindings/sound/meson-aiu.h>
|
||||
|
||||
/ {
|
||||
compatible = "videostrong,kii-pro", "amlogic,meson-gxbb";
|
||||
model = "Videostrong KII Pro";
|
||||
|
||||
+ spdif_dit: audio-codec-0 {
|
||||
+ #sound-dai-cells = <0>;
|
||||
+ compatible = "linux,spdif-dit";
|
||||
+ status = "okay";
|
||||
+ sound-name-prefix = "DIT";
|
||||
+ };
|
||||
+
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
led {
|
||||
@@ -34,6 +42,58 @@
|
||||
gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ sound {
|
||||
+ compatible = "amlogic,gx-sound-card";
|
||||
+ model = "KII-PRO";
|
||||
+ assigned-clocks = <&clkc CLKID_MPLL0>,
|
||||
+ <&clkc CLKID_MPLL1>,
|
||||
+ <&clkc CLKID_MPLL2>;
|
||||
+ assigned-clock-parents = <0>, <0>, <0>;
|
||||
+ assigned-clock-rates = <294912000>,
|
||||
+ <270950400>,
|
||||
+ <393216000>;
|
||||
+
|
||||
+ dai-link-0 {
|
||||
+ sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;
|
||||
+ };
|
||||
+
|
||||
+ dai-link-1 {
|
||||
+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;
|
||||
+ };
|
||||
+
|
||||
+ dai-link-2 {
|
||||
+ sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;
|
||||
+ dai-format = "i2s";
|
||||
+ mclk-fs = <256>;
|
||||
+
|
||||
+ codec-0 {
|
||||
+ sound-dai = <&aiu AIU_HDMI CTRL_I2S>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ dai-link-3 {
|
||||
+ sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;
|
||||
+
|
||||
+ codec-0 {
|
||||
+ sound-dai = <&spdif_dit>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ dai-link-4 {
|
||||
+ sound-dai = <&aiu AIU_HDMI CTRL_OUT>;
|
||||
+
|
||||
+ codec-0 {
|
||||
+ sound-dai = <&hdmi_tx>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&aiu {
|
||||
+ status = "okay";
|
||||
+ pinctrl-0 = <&spdif_out_y_pins>;
|
||||
+ pinctrl-names = "default";
|
||||
};
|
||||
|
||||
ðmac {
|
||||
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
# Maintainer: Ferass El Hafidi <vitali64pmemail@protonmail.com>
|
||||
# Co-Maintainer: exkc <exxxxkc@getgoogleoff.me>
|
||||
pkgname=linux-postmarketos-amlogic
|
||||
pkgver=6.3.3
|
||||
pkgrel=1
|
||||
pkgver=6.4
|
||||
pkgrel=0
|
||||
pkgdesc="Mainline kernel for Amlogic devices"
|
||||
arch="aarch64"
|
||||
_carch="arm64"
|
||||
|
|
@ -34,11 +34,8 @@ _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-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
|
||||
0001-add-xiaomi-once-support.patch
|
||||
0002-add-x96-mini-support.patch
|
||||
"
|
||||
builddir="$srcdir/linux-$pkgver"
|
||||
|
||||
|
|
@ -50,8 +47,7 @@ prepare() {
|
|||
build() {
|
||||
unset LDFLAGS
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
|
||||
V=1 # See pmaports#1990
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
|
|
@ -61,19 +57,15 @@ package() {
|
|||
INSTALL_MOD_STRIP=1 \
|
||||
INSTALL_PATH="$pkgdir"/boot \
|
||||
INSTALL_MOD_PATH="$pkgdir" \
|
||||
INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" \
|
||||
V=1 # See pmaports#1990
|
||||
INSTALL_DTBS_PATH="$pkgdir/boot/dtbs"
|
||||
|
||||
install -D "$builddir"/include/config/kernel.release \
|
||||
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
c9bccb0c225a49009b691009eed0f2261222068e916752583f4a8261ac278eba7a5b9a9f3614624f94d59b81dcc352d2f770fe27166a04f7dbff46229afc41c2 linux-postmarketos-amlogic-6.3.3.tar.xz
|
||||
11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928 linux-postmarketos-amlogic-6.4.tar.xz
|
||||
6268c09fcdba61a9800b1991fad1fe7ef855c0361f40a6d9e3bb20509664369bbcff19fddae322f30c4d08e29a149441b722c2caf9c19c9446d47ee3e95b711a config-postmarketos-amlogic.aarch64
|
||||
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
|
||||
9d664c9cc6168a7aa4804662886941744e92c0748e7b7b4fad2472740a4931c89a60cbc4a519913b58933718d02f33f48ff72ea182d912bcd50014ca8d7ff110 0001-add-xiaomi-once-support.patch
|
||||
3ea569b69297fdb196006b1e1bd82a9dec8d89362ec3ef17918018b6c573143f299a968b8227119660442f6a6e0b795aa4c8a272f6bc23e9622f3fd41ddc97eb 0002-add-x96-mini-support.patch
|
||||
"
|
||||
|
|
|
|||
Loading…
Reference in a new issue