linux-postmarketos-amlogic: add support for cottonwood boards (MR 4467)

This includes the "Alta" and "Solitude" boards, the latter of which I
also introduce a device package for in a later patch. It should be easy
to introduce support for the former, but I don't have the hardware to
test that on.

The two new patches have been merged and will be included in Linux 6.7
as I understand.

device/testing/linux-postmarketos-amlogic/0001-add-xiaomi-once-support.patch → device/testing/linux-postmarketos-amlogic/0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch

-From efd1039ff812f1d6bb58d57ea84802a428b58ccd Mon Sep 17 00:00:00 2001
-From: "@exkc" <exkc@exkc.moe>
+From bc868a43030b823b4318ce098f6975358b0b028a Mon Sep 17 00:00:00 2001
+From: "@exkc" <@exkc>
 Date: Tue, 14 Mar 2023 23:08:03 +0800
-Subject: [PATCH]  ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box 3
+Subject: [PATCH 1/4] ARM64: dts: meson-gxl: add support for the Xiaomi Mi Box
+ 3
 
 The Xiaomi Mi Box 3 is a TV box based on the Amlogic S905X chipset.
 There are two variants:
@@ -22,10 +23,10 @@ boards, which is why it includes meson-gxl-s905x-p212.dtsi:
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index e213aeebb..904bb1e19 100644
+index 6f61798a109f..8b9b9a6a8c7e 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
+@@ -52,6 +52,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
@@ -35,7 +36,7 @@ index e213aeebb..904bb1e19 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxm-mecool-kiii-pro.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
 new file mode 100644
-index 000000000..6169c0dc0
+index 000000000000..120cdf001297
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-xiaomi-once.dts
 @@ -0,0 +1,142 @@
@@ -182,5 +183,5 @@ index 000000000..6169c0dc0
 +	status = "okay";
 +};
 -- 
-2.39.2
+2.41.0
 

device/testing/linux-postmarketos-amlogic/0002-add-x96-mini-support.patch

-From e9138e8584286fdc5fe1f9c0c5bb1bc37a6de8b1 Mon Sep 17 00:00:00 2001
-From: "@exkc" <exkc@exkc.moe>
+From e6ba4e61b5545439b8a59c99a119ec3a7a3edb61 Mon Sep 17 00:00:00 2001
+From: "@exkc" <@exkc>
 Date: Thu, 30 Mar 2023 21:11:41 +0800
-Subject: [PATCH] add x96-mini support
+Subject: [PATCH 2/4] add x96-mini support
 
 ---
  arch/arm64/boot/dts/amlogic/Makefile          |  1 +
@@ -10,10 +10,10 @@ Subject: [PATCH] add x96-mini support
  create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts
 
 diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
-index e213aeebb..857bb7c00 100644
+index 8b9b9a6a8c7e..fb7aa1a7d966 100644
 --- a/arch/arm64/boot/dts/amlogic/Makefile
 +++ b/arch/arm64/boot/dts/amlogic/Makefile
-@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb
+@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-vero4k-plus.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-jethome-jethub-j80.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb
@@ -23,7 +23,7 @@ index e213aeebb..857bb7c00 100644
  dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc-v2.dtb
 diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts
 new file mode 100644
-index 000000000..bd69f8897
+index 000000000000..26b364de3191
 --- /dev/null
 +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905w-x96-mini.dts
 @@ -0,0 +1,38 @@
@@ -66,5 +66,5 @@ index 000000000..bd69f8897
 +	dr_mode = "host";
 +};
 -- 
-2.39.2
+2.41.0
 

device/testing/linux-postmarketos-amlogic/0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch

+From 8e22ad11c8d0c2a5b1ae70d439a57782d3b8d775 Mon Sep 17 00:00:00 2001
+From: Jerome Brunet <jbrunet@baylibre.com>
+Date: Fri, 6 Oct 2023 12:34:59 +0200
+Subject: [PATCH 3/4] dt-bindings: arm: amlogic: add libretech cottonwood
+ support
+
+Add compatibles for the Libretech cottonwood board family
+
+Co-developed-by: Da Xue <da.xue@libretech.co>
+Signed-off-by: Da Xue <da.xue@libretech.co>
+Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
+Acked-by: Conor Dooley <conor.dooley@microchip.com>
+Link: https://lore.kernel.org/r/20231006103500.2015183-2-jbrunet@baylibre.com
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+---
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml
+index 08d59842655c..067e0d6d9aaa 100644
+--- a/Documentation/devicetree/bindings/arm/amlogic.yaml
++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml
+@@ -155,6 +155,7 @@ properties:
+           - enum:
+               - bananapi,bpi-m2s
+               - khadas,vim3
++              - libretech,aml-a311d-cc
+               - radxa,zero2
+           - const: amlogic,a311d
+           - const: amlogic,g12b
+@@ -196,6 +197,7 @@ properties:
+               - hardkernel,odroid-hc4
+               - haochuangyi,h96-max
+               - khadas,vim3l
++              - libretech,aml-s905d3-cc
+               - seirobotics,sei610
+           - const: amlogic,sm1
+ 
+-- 
+2.41.0
+

device/testing/linux-postmarketos-amlogic/APKBUILD

@@ -4,7 +4,7 @@
 # Co-Maintainer: exkc <exxxxkc@getgoogleoff.me>
 pkgname=linux-postmarketos-amlogic
 pkgver=6.5.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel for Amlogic devices"
 arch="aarch64"
 _carch="arm64"
@@ -34,9 +34,11 @@ _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-add-xiaomi-once-support.patch
+	0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch
 	0002-add-x96-mini-support.patch
-"
+	0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch
+	0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch
+	"
 builddir="$srcdir/linux-$pkgver"
 
 prepare() {
@@ -66,6 +68,8 @@ package() {
 sha512sums="
 c95ad978847915e044146f254c9cec7d3d32e4afc28a5cbbeec2f0591aef28f584f0a273f7bb5bd8706cd7cc849dfd0cdb764fbc2c84e8b3c1b0f30fb6bfd306  linux-postmarketos-amlogic-6.5.5.tar.xz
 d2a663bbd6842b612b4bcba8a00035e5f1ab20d62fd1f94c0cd57095c2c2e3095b69faddff5f16b4d7f73228cfbcb59000dcbe00276888c2279dbc2a0f513a24  config-postmarketos-amlogic.aarch64
-9d664c9cc6168a7aa4804662886941744e92c0748e7b7b4fad2472740a4931c89a60cbc4a519913b58933718d02f33f48ff72ea182d912bcd50014ca8d7ff110  0001-add-xiaomi-once-support.patch
-3ea569b69297fdb196006b1e1bd82a9dec8d89362ec3ef17918018b6c573143f299a968b8227119660442f6a6e0b795aa4c8a272f6bc23e9622f3fd41ddc97eb  0002-add-x96-mini-support.patch
+2c40c1c32eec37c33034f7c11a0423ce6a752cfb98bab38198a64c20f24545436c3a53f0d50c60236518585d42489314123636395242b3d013d51d65f1977a51  0001-ARM64-dts-meson-gxl-add-support-for-the-Xiaomi-Mi-Bo.patch
+4538994c7d3bbb0c4740e8ce108b6838618be239a549e407ca239f3ceca8eed29b5a9ca75d162567dbc06b13ac7caacc61ebf55b247ce6fe122fecc7e5b275d5  0002-add-x96-mini-support.patch
+141f0cd494dc915ad4bc6bec02b830f351d497b3e4f8bbbcd83240d72aaabcf0ad5fad81f91bea538e301aa483cd482b06405f64f522d5c8cc8c915f0e7f0b63  0003-dt-bindings-arm-amlogic-add-libretech-cottonwood-sup.patch
+a0ff579a9bd82baa5c0d1592fb3d0a0c2998fd79374b07a25f9401095a230cc22f24ecd701e154baf95310a5dd55d1fc882c97b340098171ea07f8fe0b982b98  0004-arm64-dts-amlogic-add-libretech-cottonwood-support.patch
 "