device-lenovo-21bx: move to community

[ci:skip-build]: Already built successfully in CI.

CODEOWNERS

@@ -1,7 +1,7 @@
 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
 device/*/*-htc-golfu/				@Newbyte
-device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
+device/*/*-pine64-pinephone/			@craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper @Arnavion
 device/*/*-htc-m8qlul/				@Newbyte
 device/*/*-purism-librem5/			@craftyguy @bshah
 device/*/device-lg-judyln/			@Newbyte
@@ -44,11 +44,14 @@ device/*/device-huawei-plank/			@gtrxAC
 device/*/linux-huawei-plank/			@gtrxAC
 device/*/device-samsung-coreprimevelte/		@legolivesmatter @balejk
 device/*/linux-samsung-coreprimevelte/		@legolivesmatter @balejk
+device/*/linux-postmarketos-allwinner/		@Arnavion
+device/*/u-boot-pinephone/			@Arnavion
 
 main/postmarketos-update-depthcharge-kernel/	@jenneron
 main/osk-sdl/					@craftyguy
 main/postmarketos-ui-plasma-mobile/		@bshah
 main/ttyescape/					@calebccff
+main/shutdown-clear-rtc-wakealarm/		@Arnavion
 device/*/u-boot-librem5/			@craftyguy @bshah
 device/*/alsa-ucm-conf-google-kukui/		@jenneron @binarycraft
 device/*/alsa-ucm-conf-google-gru/		@jenneron

device/.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -0,0 +1,12 @@
+diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
+index d2f2cedf..7e2cbc74 100644
+--- a/arch/arm64/mm/proc.S
++++ b/arch/arm64/mm/proc.S
+@@ -171,7 +171,6 @@ ENTRY(cpu_do_switch_mm)
+ 	ret
+ ENDPROC(cpu_do_switch_mm)
+ 
+-	.section ".text.init", #alloc, #execinstr
+ 
+ /*
+  *	__cpu_setup

device/community/device-lenovo-21bx/APKBUILD

@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -38,11 +38,13 @@ nonfree_firmware() {
 	depends="
 		bootmac
 		firmware-lenovo-21bx
+		libmbim-tools
 		linux-firmware-ath11k
 		linux-firmware-qca
 		linux-firmware-qcom
 		pd-mapper
 		pd-mapper-openrc
+		qmi-utils
 		"
 	install="$subpkgname.post-install"
 

device/community/device-nvidia-tegra-armv7/APKBUILD

@@ -6,8 +6,8 @@
 
 pkgname=device-nvidia-tegra-armv7
 pkgdesc="NVIDIA Tegra ARMv7"
-pkgver=1.1
-pkgrel=1
+pkgver=1.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -45,6 +45,6 @@ x11() {
 }
 
 sha512sums="
-e8d7c637130642a5ee5438e7f401c1870ecd1dcdca0305ab73fabf3d8548db5f054aeeacaf48abc46189bc1efdcbb5549e8afed263880e07b4932aee418041fc  deviceinfo
+b5f81887b9d78906a880d89b862dbe445129e8444fa7e41b17deaa0ff494e25455bf47f5864a219ae394b660f63061c01c00ef370e88086367a3efcbf12a4f91  deviceinfo
 8ea2030fb0c1ae181778b86dc36ed71a904dd51e1fb08114c2a124a693fc7b464cfbb14efa8422db716fb9a647afa367df094abcc14f1ccc51af8b9063de8847  modules-initfs
 "

device/community/device-nvidia-tegra-armv7/deviceinfo

@@ -16,8 +16,6 @@ deviceinfo_chassis="tablet"
 deviceinfo_external_storage="true"
 
 # Bootloader related
-deviceinfo_flash_method="fastboot-bootpart"
-deviceinfo_flash_fastboot_partition_kernel="system"
-deviceinfo_flash_fastboot_partition_system="userdata"
+deviceinfo_flash_method="none"
 deviceinfo_generate_extlinux_config="true"
 deviceinfo_kernel_cmdline="console=ttyS0,115200n8 rw gpt"

device/community/device-xiaomi-daisy/APKBUILD

@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=8
+pkgver=9
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -46,5 +46,5 @@ nonfree_firmware() {
 
 sha512sums="
 8c5980c1da9e5bc91f11bb8056ac9a225cb84a90a42a964dc0dc2966220c105683081055fdcb1caa8c198019d8373d8c5fe27155429c17814d34075d5f961aa4  deviceinfo
-fd74576998cbfb970a1ac997206504797cba07ede87c94f4d77245f8105cd23cf64bce144483c76372998a1750786fd4b693f092888863390b0736906f1b16a4  modules-initfs
+7202f0a55dfe43348940412fc38e59c855594b070db8742419feadb2299086d5810107201a228b7137b7cc7a97c94afac95d81c0cd65c52f31dbcb619b0a4279  modules-initfs
 "

device/community/device-xiaomi-daisy/modules-initfs

@@ -1,4 +1,5 @@
 edt_ft5x06
+goodix_ts
 msm
 panel_himax_hx8399c_fhdplus
 panel_mdss_ili7807_fhdplus

device/community/firmware-nvidia-tegra-armv7/APKBUILD

@@ -4,7 +4,7 @@
 # Co-Maintainer: Maxim Schwalm <maxim.schwalm@gmail.com>
 
 pkgname=firmware-nvidia-tegra-armv7
-pkgver=3
+pkgver=4
 pkgrel=0
 pkgdesc="Firmware files for Tegra devices supported by GRATE project"
 url="https://gitlab.com/grate-driver/firmware"
@@ -14,7 +14,7 @@ makedepends="coreutils"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 
 # source
-_commit="b1a06c42ff16a814a3c8044143151f3df48a7df2"
+_commit="1ce8924c74afc7f3bb37151d9d16295049063788"
 _repo="firmware"
 source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$_repo-$_commit.tar.gz"
 
@@ -25,5 +25,5 @@ package() {
 }
 
 sha512sums="
-e20b40a290faf54ddfe9502f91cc6108b79a19a322696c7460e6b455319bcfe4583933fa43a5e5e82e968562666404e40d6ca5a6bd401e09d0fdcc30707e6786  firmware-nvidia-tegra-armv7-b1a06c42ff16a814a3c8044143151f3df48a7df2.tar.gz
+14c3eedd90f7ce22bd2efba124a57bd673b449cdd889eb4009aa4d7f64d950bccd176acf2c05694a7ebd12ad979f4a37f12ada72331a2e142330e4b95024750c  firmware-nvidia-tegra-armv7-1ce8924c74afc7f3bb37151d9d16295049063788.tar.gz
 "

device/community/linux-postmarketos-qcom-msm8953/APKBUILD

@@ -5,7 +5,7 @@
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
 pkgver=6.6.10
-pkgrel=0
+pkgrel=1
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon MSM8953"
 arch="aarch64"
 _carch="arm64"
@@ -61,5 +61,5 @@ package() {
 
 sha512sums="
 5114a563f14b391503b392ad7b72faefbe964c2530d75197fbe4d7c6f6acfcb606b511eda338923a297e4e0c84407edbe129c59988a094c449b37d1f5cac0120  linux-postmarketos-qcom-msm8953-v6.6.10-r0.tar.gz
-76351c35b7c39cbd37bbc675c32432ad53b8580593003d04a1b486b6bd911803b24da78ec6c995766a20806588806548b213a0be902166de1514b7004afed02b  config-postmarketos-qcom-msm8953.aarch64
+8612cf9d411d48fc69057f945a9e3ab666175ab2224e851a639314afb137f10ff0dec4f423f2c7f9edd0ec82050fa152c572010d761c5988a7bb291d15ef36e7  config-postmarketos-qcom-msm8953.aarch64
 "

device/community/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64

@@ -3715,6 +3715,8 @@ CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
 CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
 CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
@@ -3748,7 +3750,9 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_6FIRE is not set

device/main/device-qemu-aarch64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-aarch64
-pkgver=3
-pkgrel=5
+pkgver=4
+pkgrel=0
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -16,14 +16,12 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
-	$pkgname-weston
 	"
 
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
-	weston.ini
 	"
 options="!check !archcheck"
 
@@ -48,12 +46,6 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname=$pkgver-r$pkgrel weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 kernel_virt() {
 	pkgdesc="Alpine Virt kernel (minimal, no audio)"
 	depends="linux-virt"
@@ -76,5 +68,4 @@ sha512sums="
 806e06840e026af6d6da506faaa2617b560eaa27d33c29da2151ebee39fadd783cfe0d30998d64b82a166a1d13830862f32eadf22a1b45465a5951bc05209904  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "

device/main/device-qemu-aarch64/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/main/device-qemu-amd64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-amd64
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
@@ -17,13 +17,11 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
-	$pkgname-weston
 	"
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
-	weston.ini
 	"
 options="!check !archcheck"
 
@@ -48,12 +46,6 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname=$pkgver-r$pkgrel weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 kernel_none() {
 	pkgdesc="No kernel (does not boot! can be used during pmbootstrap testing to save time)"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
@@ -81,5 +73,4 @@ sha512sums="
 94f8f9ad44ba6ffe55a07a5bce11351f89a7d97e0c52931c573ea21ff7416cc3ede800da94611e04ebfed6914f8d5edb9614f8c0847b53b09ae168a8607f6195  deviceinfo
 29766094e64a7ce881c8e96433203ea538057b8fd1d577fc69b9add6bc1217af04ddf60cbcf82333811c627897eda7537b0b1f862899e1fdfd93403b3f6425d7  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "

device/main/device-qemu-amd64/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/main/device-qemu-riscv64/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Minecrell <minecrell@minecrell.net>
 # Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-qemu-riscv64
-pkgver=1
-pkgrel=3
+pkgver=2
+pkgrel=0
 pkgdesc="Simulated device in QEMU (riscv64)"
 url="https://postmarketos.org"
 arch="riscv64"
@@ -14,14 +14,12 @@ subpackages="
 	$pkgname-kernel-edge:kernel_edge
 	$pkgname-mce
 	$pkgname-sway
-	$pkgname-weston
 	"
 
 source="
 	deviceinfo
 	modules-initfs
 	mce-display-blanking.conf
-	weston.ini
 	"
 options="!check !archcheck"
 
@@ -46,12 +44,6 @@ sway() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname=$pkgver-r$pkgrel weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 kernel_edge() {
 	pkgdesc="Alpine Edge kernel"
 	depends="linux-edge linux-firmware-none"
@@ -62,5 +54,4 @@ sha512sums="
 85763f167819f8b53101e2d5de2eb9a9162f0f88a51e57f2faf7aae62c70350c5618d2d0e1bc045b0ff4b411df16cbaa6e097cc65094c446f302adb17ce51957  deviceinfo
 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992  modules-initfs
 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad  mce-display-blanking.conf
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "

device/main/device-qemu-riscv64/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch

@@ -1,4 +1,4 @@
-From c0e6e18c3d4acc79f34af16d76e8af39c275f5bb Mon Sep 17 00:00:00 2001
+From 04a2ff0c2ee51393f00bc34e07fdac190eb6978b Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -10,11 +10,11 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 6740e6a97161..bd9d8fa9738f 100644
+index df6eaa6f60..15e3339c90 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
-@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
+@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
+ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2b.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-early-adopter.dtb
 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-dev.dtb
@@ -23,7 +23,7 @@ index 6740e6a97161..bd9d8fa9738f 100644
  dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a100-allwinner-perf1.dtb
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 new file mode 100644
-index 000000000000..1e287f2fb9f3
+index 0000000000..1e287f2fb9
 --- /dev/null
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 @@ -0,0 +1,29 @@
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-bma223-ohci1.patch

@@ -1,4 +1,4 @@
-From a76ae09d570406690bde1436aa910e76ae179716 Mon Sep 17 00:00:00 2001
+From 3806b6eec5badaf3aee06460ac578b19124048ce Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
@@ -13,10 +13,10 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 91d27bc93a3e..c33c5690a87b 100644
+index 5d8081a093..26ca14a664 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -225,7 +225,15 @@ &i2c0_pins {
+@@ -237,7 +237,15 @@ &i2c0_pins {
  &i2c1 {
  	status = "okay";
  
@@ -33,7 +33,7 @@ index 91d27bc93a3e..c33c5690a87b 100644
  };
  
  &lradc {
-@@ -291,6 +299,10 @@ &ohci0 {
+@@ -303,6 +311,10 @@ &ohci0 {
  	status = "okay";
  };
  
@@ -45,5 +45,5 @@ index 91d27bc93a3e..c33c5690a87b 100644
  	status = "okay";
  };
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch

@@ -1,4 +1,4 @@
-From bf487dec17b09c377e8661c18af8b1b746e02142 Mon Sep 17 00:00:00 2001
+From 4886da94b7d5fec7029ea27df107715c13c4ac10 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 16:12:08 +0200
 Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
@@ -8,10 +8,10 @@ Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
  1 file changed, 13 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index c33c5690a87b..ac66fd12f59f 100644
+index 26ca14a664..ffb36f69f5 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -487,6 +487,19 @@ &uart0 {
+@@ -514,6 +514,19 @@ &uart0 {
  	status = "okay";
  };
  
@@ -32,5 +32,5 @@ index c33c5690a87b..ac66fd12f59f 100644
  	dr_mode = "otg";
  	status = "okay";
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch

@@ -1,4 +1,4 @@
-From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
+From db2418dca1b2daadafe6e55dca4e81da959f1ca1 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
@@ -8,10 +8,10 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index ac66fd12f59f..1923c6d0debe 100644
+index ffb36f69f5..faa0eb2e57 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -460,19 +460,20 @@ &reg_rtc_ldo {
+@@ -487,19 +487,20 @@ hdmi_out_con: endpoint {
  
  &sound {
  	status = "okay";
@@ -38,5 +38,5 @@ index ac66fd12f59f..1923c6d0debe 100644
  			"ADCR", "Right ADC",
  			"Internal Microphone Left", "MBIAS",
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0006-dts-pinephone-drop-modem-power-node.patch

@@ -1,4 +1,4 @@
-From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
+From 999793e3f4f3e807ba478c4585650a1277a7dd16 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -11,10 +11,10 @@ Subject: [PATCH] dts: pinephone: drop modem-power node
  4 files changed, 24 insertions(+), 68 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-index a21c6d78a0ef..7f0cfdafed15 100644
+index 0530881d84..144f1eca9f 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-@@ -86,28 +86,6 @@ &reg_drivevbus {
+@@ -87,28 +87,6 @@ &reg_drivevbus {
  	status = "okay";
  };
  
@@ -43,8 +43,8 @@ index a21c6d78a0ef..7f0cfdafed15 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
- 	};
+@@ -123,6 +101,10 @@ &codec_analog {
+ 	allwinner,internal-bias-resistor;
  };
  
 +&ring_indicator {
@@ -55,10 +55,10 @@ index a21c6d78a0ef..7f0cfdafed15 100644
  	enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  	flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-index d67f31ef529e..e7b636299d15 100644
+index 053e4add99..78982fe051 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-@@ -114,29 +114,6 @@ &sgm3140 {
+@@ -101,29 +101,6 @@ &sgm3140 {
  	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  };
  
@@ -88,19 +88,19 @@ index d67f31ef529e..e7b636299d15 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
- 		};
- 	};
+@@ -137,3 +114,7 @@ usb0_drd_sw: endpoint {
+ &hdmi {
+ 	extcon = <&anx7688 0>;
  };
 +
 +&ring_indicator {
 +	gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-index 9b33186c7e7d..44b3d6555ff7 100644
+index ec4927dfe9..57b651d695 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-@@ -107,29 +107,6 @@ &sgm3140 {
+@@ -93,29 +93,6 @@ &sgm3140 {
  	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  };
  
@@ -130,19 +130,19 @@ index 9b33186c7e7d..44b3d6555ff7 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
- 		};
- 	};
+@@ -129,3 +106,7 @@ usb0_drd_sw: endpoint {
+ &hdmi {
+ 	extcon = <&anx7688 0>;
  };
 +
 +&ring_indicator {
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index d3d4f1a53c8d..3cf2f3e6a41a 100644
+index 1886a1f9a4..5b0b5a5f97 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
+@@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
  		sound-name-prefix = "Modem";
  	};
  
@@ -160,7 +160,7 @@ index d3d4f1a53c8d..3cf2f3e6a41a 100644
  	i2c_csi: i2c-csi {
  		compatible = "i2c-gpio";
  		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
+@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
  	reg_vbat_bb: vbat-bb {
  		compatible = "regulator-fixed";
  		regulator-name = "vbat-bb";
@@ -169,5 +169,5 @@ index d3d4f1a53c8d..3cf2f3e6a41a 100644
  		regulator-max-microvolt = <3500000>;
  		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch

@@ -1,4 +1,4 @@
-From 49edde139be2fee279e4b1f3eeba67912d551601 Mon Sep 17 00:00:00 2001
+From 8d8f5964710e12d906c56a703ff565038029f73c Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 4e2dad314c79..cd507bf895f5 100644
+index 9367a4572d..62cdd63859 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2179,6 +2179,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
+@@ -2213,6 +2213,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
  	.connector_type = DRM_MODE_CONNECTOR_LVDS,
  };
  
@@ -42,7 +42,7 @@ index 4e2dad314c79..cd507bf895f5 100644
  static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4265,6 +4289,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4364,6 +4388,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "hit,tx23d38vm0caa",
  		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 4e2dad314c79..cd507bf895f5 100644
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch

@@ -1,19 +1,19 @@
-From cd06dec28f2c6a61cb3c2ef00c2a68efe4c26db6 Mon Sep 17 00:00:00 2001
+From c6699422d09b6a70bbbf8a64558d456f1b6584e1 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
 
 ---
- arch/arm/boot/dts/allwinner/Makefile                    |   1 +
- .../boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts | 103 ++++++++++++++++++
+ arch/arm/boot/dts/allwinner/Makefile          |   1 +
+ .../sun6i-a31s-goclever-gcta741l.dts          | 103 ++++++++++++++++++
  2 files changed, 104 insertions(+)
  create mode 100644 arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 127a10cb590d..ba31b42f1e18 100644
+index 7c7fb94d21..097614b95f 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -1136,6 +1136,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -110,6 +110,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
  	sun6i-a31-mele-a1000g-quad.dtb \
  	sun6i-a31s-colorfly-e708-q1.dtb \
  	sun6i-a31s-cs908.dtb \
@@ -23,7 +23,7 @@ index 127a10cb590d..ba31b42f1e18 100644
  	sun6i-a31s-sina31s.dtb \
 diff --git a/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts b/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 new file mode 100644
-index 000000000000..7fb95aef4c74
+index 0000000000..4fcba20ffe
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 @@ -0,0 +1,103 @@
@@ -38,7 +38,7 @@ index 000000000000..7fb95aef4c74
 +/ {
 +	model = "GoClever Orion 70L";
 +	compatible = "goclever,gcta741l", "allwinner,sun6i-a31s";
-+	
++
 +	panel {
 +		compatible = "hannstar,tqtm070cb501";
 +		power-supply = <&reg_dc1sw>;
@@ -50,7 +50,7 @@ index 000000000000..7fb95aef4c74
 +			};
 +		};
 +	};
-+	
++
 +	// PWM not supported by sun6i at the moment
 +	//backlight {
 +	//	compatible = "pwm-backlight";
@@ -131,5 +131,5 @@ index 000000000000..7fb95aef4c74
 +	status = "okay";
 +};
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch

@@ -1,4 +1,4 @@
-From 8e2f5f4d514b94cfac85f3dce3d39e042b3ade69 Mon Sep 17 00:00:00 2001
+From 30a5649685f78c69a3d68daa53a89feb1050e268 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index cd507bf895f5..ac8cfb3ce163 100644
+index 62cdd63859..a11265c813 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2124,6 +2124,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2133,6 +2133,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
  	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
  };
  
@@ -37,12 +37,12 @@ index cd507bf895f5..ac8cfb3ce163 100644
 +	},
 +	.bus_format = MEDIA_BUS_FMT_RGB666_1X18,
 +	.connector_type = DRM_MODE_CONNECTOR_DPI,
-+}; 
++};
 +
  static const struct display_timing hannstar_hsd070pww1_timing = {
  	.pixelclock = { 64300000, 71100000, 82000000 },
  	.hactive = { 1280, 1280, 1280 },
-@@ -4280,6 +4304,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4376,6 +4400,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "giantplus,gpm940b0",
  		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index cd507bf895f5..ac8cfb3ce163 100644
  		.compatible = "hannstar,hsd070pww1",
  		.data = &hannstar_hsd070pww1,
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch

@@ -1,19 +1,19 @@
-From e9ac5ae02481dfe87335d9f2033785f0263c820d Mon Sep 17 00:00:00 2001
+From 00b0bb6210bd15f21be74b89809300c4e8a4c335 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
 
 ---
- arch/arm/boot/dts/allwinner/Makefile                    |   1 +
- .../boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts  | 246 ++++++++++++++++++
+ arch/arm/boot/dts/allwinner/Makefile          |   1 +
+ .../allwinner/sun4i-a10-lark-freeme-70-2s.dts | 246 ++++++++++++++++++
  2 files changed, 247 insertions(+)
  create mode 100644 arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index ba31b42f1e18..f5df06c4d564 100644
+index 097614b95f..902b8f6752 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -1098,6 +1098,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+@@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
  	sun4i-a10-inet9f-rev03.dtb \
  	sun4i-a10-itead-iteaduino-plus.dtb \
  	sun4i-a10-jesurun-q5.dtb \
@@ -23,7 +23,7 @@ index ba31b42f1e18..f5df06c4d564 100644
  	sun4i-a10-mk802.dtb \
 diff --git a/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts b/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 new file mode 100644
-index 000000000000..fcba874976fa
+index 0000000000..5f17902410
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 @@ -0,0 +1,246 @@
@@ -62,7 +62,7 @@ index 000000000000..fcba874976fa
 +			};
 +		};
 +	};
-+	
++
 +	backlight: backlight {
 +		compatible = "pwm-backlight";
 +		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
@@ -70,7 +70,7 @@ index 000000000000..fcba874976fa
 +		default-brightness-level = <8>;
 +		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
 +	};
-+	
++
 +	panel: panel {
 +		compatible = "hannstar,hsd070idw1-a";
 +		power-supply = <&reg_vcc3v3>;
@@ -274,5 +274,5 @@ index 000000000000..fcba874976fa
 +	status = "okay";
 +};
 -- 
-2.31.1
+2.43.0
 

device/main/linux-postmarketos-allwinner/0011-sunxi-mmc-h6-fix.patch

@@ -1,4 +1,4 @@
-From 3453110622f9f5ab3a602bd5e126f4a598d9b7c4 Mon Sep 17 00:00:00 2001
+From d5ff25062e6167413fa221efa7496e482435ef72 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -9,10 +9,10 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
-index 55ca34803a3f..962c948fef17 100644
+index e9370c7364..a4abd589e9 100644
 --- a/drivers/mmc/host/sunxi-mmc.c
 +++ b/drivers/mmc/host/sunxi-mmc.c
-@@ -1426,15 +1426,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
+@@ -1436,15 +1436,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
  				  MMC_CAP_SDIO_IRQ;
  
  	/*
@@ -34,5 +34,5 @@ index 55ca34803a3f..962c948fef17 100644
  
  	ret = mmc_of_parse(mmc);
 -- 
-2.33.0
+2.43.0
 

device/main/linux-postmarketos-allwinner/0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch

@@ -1,4 +1,4 @@
-From a337472571ea8d154e22325a2c06a8b982716fb0 Mon Sep 17 00:00:00 2001
+From bfd8856798954e1afa2eed743bf14e5321c15357 Mon Sep 17 00:00:00 2001
 From: Maxim Karasev <begs@disroot.org>
 Date: Sat, 4 Sep 2021 14:56:01 +0300
 Subject: [PATCH] arm64: dts: allwinner: orangepi-3: fix ethernet
@@ -10,10 +10,10 @@ patch from LibreELEC tree.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index adf2134ec1a4..82740a8aef9b 100644
+index 218c26c594..a424eded00 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -141,7 +141,7 @@ hdmi_out_con: endpoint {
+@@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
  &emac {
  	pinctrl-names = "default";
  	pinctrl-0 = <&ext_rgmii_pins>;
@@ -22,7 +22,7 @@ index adf2134ec1a4..82740a8aef9b 100644
  	phy-handle = <&ext_rgmii_phy>;
  	/*
  	 * The board uses 2.5V RGMII signalling. Power sequence to enable
-@@ -151,8 +151,8 @@ &emac {
+@@ -155,8 +155,8 @@ &emac {
  	 */
  	phy-supply = <&reg_aldo2>;
  	phy-io-supply = <&reg_gmac_2v5>;
@@ -34,5 +34,5 @@ index adf2134ec1a4..82740a8aef9b 100644
  };
  
 -- 
-2.33.0
+2.43.0
 

device/main/linux-postmarketos-allwinner/0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch

@@ -1,4 +1,4 @@
-From fedafc567167a7a0d10ddc5657dd3f32a872ec86 Mon Sep 17 00:00:00 2001
+From cfad20d85c87e6e489c4f2e45bfe4664a60736a2 Mon Sep 17 00:00:00 2001
 From: marcin <marcin@ipv8.pl>
 Date: Sat, 6 Aug 2022 00:17:40 +0200
 Subject: [PATCH] Revert "usb: quirks: Add USB_QUIRK_RESET for Quectel EG25G
@@ -10,10 +10,10 @@ This reverts commit 62867934f6251349e1352a345f827ba8de514a36.
  1 file changed, 3 deletions(-)
 
 diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 631c3313c37bc..079e183cf3bff 100644
+index 7e42d7322e..15e9bd180a 100644
 --- a/drivers/usb/core/quirks.c
 +++ b/drivers/usb/core/quirks.c
-@@ -535,9 +535,6 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -542,9 +542,6 @@ static const struct usb_device_id usb_quirk_list[] = {
  	/* INTEL VALUE SSD */
  	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
  
@@ -24,4 +24,5 @@ index 631c3313c37bc..079e183cf3bff 100644
  };
  
 -- 
-GitLab
+2.43.0
+

device/main/linux-postmarketos-allwinner/0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch

@@ -1,3 +1,4 @@
+From d9a65f76763df1828644d0210fe747e67ba32fb3 Mon Sep 17 00:00:00 2001
 From: Thomas Thorne <Thomas.Thorne@Net2Edge.com>
 Date: Tue, 20 Sep 2022 20:34:57 -0400
 Subject: usb: serial: option: add 'reset_resume' callback for WWAN devices
@@ -16,13 +17,17 @@ However the rest of the patch is not needed/already upstreamed.
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 6b69d05..f5d797d 100644
+index 72390dbf07..71a2d6d61b 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
-@@ -2244,6 +2244,7 @@ static struct usb_serial_driver option_1port_device = {
+@@ -2314,6 +2314,7 @@ static struct usb_serial_driver option_1port_device = {
  #ifdef CONFIG_PM
  	.suspend           = usb_wwan_suspend,
  	.resume            = usb_wwan_resume,
 +	.reset_resume	   = usb_wwan_resume,
  #endif
  };
+ 
+-- 
+2.43.0
+

device/main/linux-postmarketos-allwinner/0015-usb-gadget-u_ether-Re-attach-netif-device-to-mirror.patch

@@ -0,0 +1,44 @@
+From 5f4158b3feecb4cc9fcae276cec2352ae3a03ec2 Mon Sep 17 00:00:00 2001
+From: Richard Acayan <mailingradian@gmail.com>
+Date: Mon, 18 Dec 2023 11:45:33 -0500
+Subject: [PATCH] usb: gadget: u_ether: Re-attach netif device to mirror
+ detachment
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In 6.7-rc1, there was a netif_device_detach call added to the
+gether_disconnect function. This clears the __LINK_STATE_PRESENT bit of
+the netif device and suppresses pings (ICMP messages) and TCP connection
+requests from the connected host. If userspace temporarily disconnects
+the gadget, such as by temporarily removing configuration in the gadget
+configfs interface, network activity should continue to be processed
+when the gadget is re-connected. Mirror the netif_device_detach call
+with a netif_device_attach call in gether_connect to fix re-connecting
+gadgets.
+
+Link: https://gitlab.com/postmarketOS/pmaports/-/tree/6002e51b7090aeeb42947e0ca7ec22278d7227d0/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh
+Fixes: f49449fbc21e ("usb: gadget: u_ether: Replace netif_stop_queue with netif_device_detach")
+Signed-off-by: Richard Acayan <mailingradian@gmail.com>
+Tested-by: Luca Weiss <luca@z3ntu.xyz>
+Tested-by: Duje Mihanović <duje.mihanovic@skole.hr>
+---
+ drivers/usb/gadget/function/u_ether.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/usb/gadget/function/u_ether.c b/drivers/usb/gadget/function/u_ether.c
+index 18fc4fb011..5817a0993a 100644
+--- a/drivers/usb/gadget/function/u_ether.c
++++ b/drivers/usb/gadget/function/u_ether.c
+@@ -1159,6 +1159,8 @@ struct net_device *gether_connect(struct gether *link)
+ 		if (netif_running(dev->net))
+ 			eth_start(dev, GFP_ATOMIC);
+ 
++		netif_device_attach(dev->net);
++
+ 	/* on error, disable any endpoints  */
+ 	} else {
+ 		(void) usb_ep_disable(link->out_ep);
+-- 
+2.43.0
+

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -3,9 +3,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=6.6.3_git20231128
+pkgver=6.7.0_git20240110
 pkgrel=0
-_tag="orange-pi-6.6-20231128-2239"
+_tag="orange-pi-6.7-20240108-1629"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -46,6 +46,7 @@ source="$pkgname-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/$_tag.tar
 	0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 	0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
 	0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
+	0015-usb-gadget-u_ether-Re-attach-netif-device-to-mirror.patch
 	"
 builddir="$srcdir/linux"
 
@@ -83,21 +84,22 @@ package() {
 }
 
 sha512sums="
-d192e12dee5dcb7792e2d78e97324fe17cb962e83f31ab7955a716624d1dea650e309a172448e2b6bc21c42ec7629ed7b9a6d083e1c8775598b69d6448e71ab2  linux-postmarketos-allwinner-orange-pi-6.6-20231128-2239.tar.gz
-4da887f87dde1a3732ff663455e0e6f98df95936d55845d72991cacbc8c1d9dd489e53ac11b59f7355d24eba42f128ed8997460830b86bae44ede85f04857ec8  config-postmarketos-allwinner.aarch64
-682e62c6d98a9f74ed7bd569d7193f2b2fd87b150d5dc215963c5faafdd901706992626642d52a7bb026981f8036116c8b53062e1383bbcbd108ebb4a3c276d1  config-postmarketos-allwinner.armv7
+9134abafeda71679e8fe567e4f1e17d51c3074f4c44c336183a3c5cf946abafcd07d166b22fc64f0a40b675342ae2534d8e250d4736e5b7361ffbfac3d574e18  linux-postmarketos-allwinner-orange-pi-6.7-20240108-1629.tar.gz
+e51e5a309db0451c897e1e07b78431f45214cf616ed82d047446b8fdde6889fb1b0bd865727a46e315d5ce88a16c88fbe5e94f3a68a5eb52976a2ea0f289dd6c  config-postmarketos-allwinner.aarch64
+9048599c676af89e0ec3a6735c517b3ccc67b7c2cf9fd33a799166b95087e7739a60c7e506e6c78e55635b31fa2416db82e7aec40b05b91dbe780a9951624ff6  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
-1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
-96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
-925bd630f3694d118b24f2f5a838ba105e4ca9ed8dd4294b6632310d8d6b1f421cdd673e2013758f9de7159050aa54e0f76e04edcff65f755842b1c95b6637e7  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-9bc6c2afadae8d367471f901b86a94be7fa70daf7a4bdde5bc6d4b1458b5ddd0e063a7765d962c68231c8f022d1c660d422124c31a2c899de768985d91d377ea  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab  0006-dts-pinephone-drop-modem-power-node.patch
-c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-1fd9a225d2bdf6ed25994105ac769df0ed9804320115a94ce67afad5a23f21edeaa355bcab99184c29a10a773db337c2b5d2176cfad9ce251169730754114673  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-4274e0312664b8326b0070bcae8424909e778086cfeccdc262c52cf17acfc5ba7b6a4b687009308ab27117a3c00a268b7c7ce1265c157400a68a6b9edde99795  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0011-sunxi-mmc-h6-fix.patch
-22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
-bc7d41b0e1b9f2c3f4d860f07c9fd1621c3f07e16e7ab48f80cedfccb81af263b0f4dc0964baeebdc03eddaacfc3bc9c090863d3748891709e1b2c32840ea16f  0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
-15062c72ba74ff5ca69a640e3a5fbf07f981a2b6129eb9c96ea83a62987c7b4fd99cb9e90b73021deaa7f08aa8c332683674287b285432f62cd0ddcc8932eb56  0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
+99edeccdee7beae5dc7337d78ba92de2f3d724b7648ede30ab040a66bdac0e38a6595e212e26011d608ccb8a92ffa9e393965f936dfead65ffe9b7eb31dfa345  0002-dts-add-pinetab-dev-old-display-panel.patch
+82c0203b02c671934d62e52311827ac1cc5b358e0843715ea2235117e4b47d6de63b29fdfc7c1adfc550cc7eb363c384de8276be1ca17da6e48916020124022d  0003-dts-pinetab-add-missing-bma223-ohci1.patch
+1fcfcc448424af475efd7f848eec04763c5930070f54fdb487e6f28717df7e20b73c0f444e9322d362deeedfd87b4e91c6e61e274d23206fafef36ca97ff95d6  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+16373f069c8a3b110f68cce6d60a7b75af32635467454f4203ceeae2f7f3a74dce73f9c41b00bc340fae580cff335f0fa8d4b033cb31907b69e7a05030461b0f  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+681c945abdb8dd595d505a36ef84100b968754a1c861e7525c00185f19aa431304ff3c3258750d2d67a8aa2fd8e078a9bbc4b5cabb1802c24637ce26ecd3ee2d  0006-dts-pinephone-drop-modem-power-node.patch
+c4ab9d65b4cd6ebe443cef51693ddaddfd55d3f73b5955b2c0211ecbc69054b17e875905f56c503873bb61f6fdb39e097d85d264d6e1bd6b7ab6526076ccd535  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+943f8a9791461621c20b1dd0db9946a31734c4fe316626d045de2e2207e6f099d469e1a5b9ab9bd93cd5fca85b6422a211d435c6124aea1a2ecee818c7b35ac2  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+952e2332cbc85e69259b037302411520d46c18bb90371492b6cfcc9eeeaf96d030875bf0a17edea756c9744faee38fd42288345681e5e903f6e64d0849f76db2  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+b7c084bb32cfc18defcec77966f1944fd3b33bb48769a4c0e257709d0f3898c5e0ca2a50c39a5d4513463580eef58b5301e75345bd36d6cc5f84347f7d241a8c  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+8ee720bc6195b1b454a274e7ad9a245107aa6d127018b98909c5f105d608568bcf1651343bf9633f4804d5649f4df7e3390d6eb72a708666e89337e39427943a  0011-sunxi-mmc-h6-fix.patch
+370e963805a4c984dc501a6a6f686cac059485a275370c5f55de0841e227c5f6652abb38ad935c8dd046014e632e70129d3f8fbeae9650fe7de6f0d10e9cdc3a  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+c766911f76d36b997582533707d7d7a089ed1272e49a79dbe75f7c1eafef0ba3f1417d6c66f25e12e56124e0cd4bb9f443d400236e252ef1c43d53def9392a87  0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
+382e6e8785235788101459ae47c940ec85831007c61e3f14c4e3a43abfa21b95cdaa6bdd1b7fdd6fd26944f4c629d41b9ab776e89d9a18778fbc9f6a7785444b  0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
+3ce3bc02e4cb401f5834b9607d50fe26e0cbd7d6f5e32f1ab092660185ff01b253a759be5e6dfb46aa629dc0871f935d93746a0b55ede49f194b617dda87f766  0015-usb-gadget-u_ether-Re-attach-netif-device-to-mirror.patch
 "

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.3 Kernel Configuration
+# Linux/arm64 6.7.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -323,6 +323,7 @@ CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
+# CONFIG_ARCH_PENSANDO is not set
 # CONFIG_ARCH_QCOM is not set
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -859,6 +860,7 @@ CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
+CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -973,6 +975,7 @@ CONFIG_INET_DIAG_DESTROY=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_AO is not set
 # CONFIG_TCP_MD5SIG is not set
 CONFIG_IPV6=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -1512,7 +1515,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1586,7 +1588,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 #
 # Bus devices
 #
-# CONFIG_BRCMSTB_GISB_ARB is not set
 CONFIG_SUN50I_DE2_BUS=y
 CONFIG_SUNXI_RSB=y
 # CONFIG_VEXPRESS_CONFIG is not set
@@ -1617,6 +1618,12 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
+
+#
+# Qualcomm firmware drivers
+#
+# end of Qualcomm firmware drivers
+
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1700,7 +1707,6 @@ CONFIG_PPKB_POWER_MANAGER=m
 # EEPROM support
 #
 # CONFIG_EEPROM_AT24 is not set
-# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_IDT_89HPESX is not set
@@ -1830,6 +1836,7 @@ CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 # CONFIG_NLMON is not set
+# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -2611,7 +2618,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
 
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_BRCMSTB=y
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 # CONFIG_POWER_RESET_LTC2952 is not set
@@ -2673,6 +2679,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
+# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -2718,11 +2725,13 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3029,6 +3038,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77503 is not set
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3276,6 +3286,10 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # Microchip Technology, Inc. media platform drivers
 #
 
+#
+# Nuvoton media platform drivers
+#
+
 #
 # NVidia media platform drivers
 #
@@ -3363,6 +3377,7 @@ CONFIG_VIDEO_CAMERA_SENSOR=y
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_MT9M001 is not set
 # CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9M114 is not set
 # CONFIG_VIDEO_MT9P031 is not set
 # CONFIG_VIDEO_MT9T112 is not set
 # CONFIG_VIDEO_MT9V011 is not set
@@ -3610,9 +3625,11 @@ CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=y
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 # CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
+# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
@@ -3632,6 +3649,7 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
@@ -3754,6 +3772,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -3938,6 +3957,8 @@ CONFIG_SND_SOC_AK4613=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW87390 is not set
+# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 CONFIG_SND_SOC_BT_SCO=m
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -4006,6 +4027,7 @@ CONFIG_SND_SOC_EC25=m
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_RT9120 is not set
+# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -4354,6 +4376,7 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_MSM=y
+CONFIG_USB_CHIPIDEA_NPCM=y
 CONFIG_USB_CHIPIDEA_IMX=y
 CONFIG_USB_CHIPIDEA_GENERIC=y
 CONFIG_USB_CHIPIDEA_TEGRA=y
@@ -4565,6 +4588,7 @@ CONFIG_TYPEC_ANX7688=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
+# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -4695,6 +4719,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_CPU=y
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
@@ -4933,11 +4958,6 @@ CONFIG_RTL8723BS=m
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
-
-#
-# Resolver to digital converters
-#
-# end of Resolver to digital converters
 # end of IIO staging drivers
 
 CONFIG_STAGING_MEDIA=y
@@ -5081,7 +5101,6 @@ CONFIG_ARM_SMMU_V3=y
 #
 # Broadcom SoC drivers
 #
-# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers
 
 #
@@ -5116,7 +5135,6 @@ CONFIG_ARM_SMMU_V3=y
 
 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
-# CONFIG_SUN20I_PPU is not set
 # CONFIG_SOC_TI is not set
 
 #
@@ -5125,6 +5143,33 @@ CONFIG_SUNXI_SRAM=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
+#
+# PM Domains
+#
+
+#
+# Amlogic PM Domains
+#
+# end of Amlogic PM Domains
+
+#
+# Broadcom PM Domains
+#
+# end of Broadcom PM Domains
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+
+#
+# Qualcomm PM Domains
+#
+# end of Qualcomm PM Domains
+
+# CONFIG_SUN20I_PPU is not set
+# end of PM Domains
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5221,6 +5266,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2497 is not set
@@ -5518,6 +5564,7 @@ CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
+# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
@@ -5734,7 +5781,6 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -5755,6 +5801,7 @@ CONFIG_F2FS_FS_LZ4HC=y
 CONFIG_F2FS_FS_ZSTD=y
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
+# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -6205,7 +6252,9 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_KDF800108_CTR=y
 # end of Random number generation
 
@@ -6362,7 +6411,6 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -6440,6 +6488,7 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
+# CONFIG_LWQ_TEST is not set
 # end of Library routines
 
 CONFIG_GENERIC_IOREMAP=y

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.6.3 Kernel Configuration
+# Linux/arm 6.7.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -788,6 +788,7 @@ CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
 # CONFIG_PAGE_REPORTING is not set
 CONFIG_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
+CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_BOUNCE=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -1401,7 +1402,6 @@ CONFIG_GENERIC_ARCH_TOPOLOGY=y
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 CONFIG_ARM_CCI400_PORT_CTRL=y
-# CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
 # CONFIG_SUN50I_DE2_BUS is not set
 CONFIG_SUNXI_RSB=y
@@ -1432,6 +1432,12 @@ CONFIG_SUNXI_RSB=y
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_ARM_PSCI_FW=y
+
+#
+# Qualcomm firmware drivers
+#
+# end of Qualcomm firmware drivers
+
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1514,7 +1520,6 @@ CONFIG_BLK_DEV_NBD=m
 #
 # CONFIG_EEPROM_AT24 is not set
 # CONFIG_EEPROM_AT25 is not set
-# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -1679,6 +1684,7 @@ CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=y
 # CONFIG_NLMON is not set
+# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ALACRITECH=y
@@ -2047,6 +2053,7 @@ CONFIG_MT7663U=m
 CONFIG_MT7663S=m
 # CONFIG_MT7921S is not set
 # CONFIG_MT7921U is not set
+# CONFIG_MT7925U is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 CONFIG_WILC1000=m
 CONFIG_WILC1000_SDIO=m
@@ -2699,6 +2706,7 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
+# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -2746,12 +2754,14 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3076,6 +3086,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77503 is not set
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
@@ -3259,6 +3270,10 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Microchip Technology, Inc. media platform drivers
 #
 
+#
+# Nuvoton media platform drivers
+#
+
 #
 # NVidia media platform drivers
 #
@@ -3440,10 +3455,12 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
@@ -3471,6 +3488,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -3611,6 +3629,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DMAMEM_HELPERS=y
+CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
@@ -3646,6 +3665,8 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=30
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -3788,6 +3809,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW87390 is not set
+# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -3866,6 +3889,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_RT5640 is not set
 # CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_RT9120 is not set
+# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -4368,6 +4392,7 @@ CONFIG_TYPEC_STUSB160X=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
+# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -4475,6 +4500,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 # CONFIG_LEDS_TRIGGER_CPU is not set
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
@@ -4718,12 +4744,6 @@ CONFIG_R8712U=m
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
 # end of IIO staging drivers
 
 CONFIG_STAGING_MEDIA=y
@@ -4844,7 +4864,6 @@ CONFIG_SUN6I_MSGBOX=y
 #
 # Broadcom SoC drivers
 #
-# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers
 
 #
@@ -4879,7 +4898,6 @@ CONFIG_SUN6I_MSGBOX=y
 
 CONFIG_SUNXI_MBUS=y
 CONFIG_SUNXI_SRAM=y
-# CONFIG_SUN20I_PPU is not set
 # CONFIG_SOC_TI is not set
 
 #
@@ -4888,6 +4906,33 @@ CONFIG_SUNXI_SRAM=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
+#
+# PM Domains
+#
+
+#
+# Amlogic PM Domains
+#
+# end of Amlogic PM Domains
+
+#
+# Broadcom PM Domains
+#
+# end of Broadcom PM Domains
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+
+#
+# Qualcomm PM Domains
+#
+# end of Qualcomm PM Domains
+
+# CONFIG_SUN20I_PPU is not set
+# end of PM Domains
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -5007,6 +5052,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
@@ -5021,6 +5067,7 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_MAX9611 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
+# CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_RICHTEK_RTQ6056 is not set
@@ -5369,6 +5416,7 @@ CONFIG_AXP20X_ADC=y
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
+# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
@@ -5416,6 +5464,7 @@ CONFIG_AXP20X_ADC=y
 #
 # CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters
 
 #
@@ -5580,7 +5629,6 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -5596,6 +5644,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
+# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -6137,7 +6186,6 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -6168,6 +6216,7 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
+CONFIG_ARCH_HAS_DMA_ALLOC=y
 CONFIG_DMA_CMA=y
 
 #
@@ -6203,6 +6252,7 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
+# CONFIG_LWQ_TEST is not set
 # end of Library routines
 
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y

device/testing/device-amazon-sheldon/APKBUILD

@@ -0,0 +1,29 @@
+# Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Eli Hersha <elihersha@gmail.com>
+pkgname=device-amazon-sheldon
+pkgdesc="Amazon Fire TV Stick Lite"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="
+	linux-amazon-sheldon
+	mkbootimg
+	postmarketos-base
+"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+37620adb66743b95831a0147b8ed6cda20f977f97355738da80d9896d2454182aeb3e1f9a9d12951329db4f3cfb9b38c7600898656cf14259b3a6088c3fca473  deviceinfo
+"

device/testing/device-amazon-sheldon/deviceinfo

@@ -0,0 +1,28 @@
+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell
+# scripts.
+deviceinfo_format_version="0"
+deviceinfo_name="Amazon Fire TV Stick Lite"
+deviceinfo_manufacturer="Amazon"
+deviceinfo_codename="amazon-sheldon"
+deviceinfo_year="2020"
+deviceinfo_arch="armv7"
+
+# Device related
+deviceinfo_chassis="embedded"
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="false"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,32N2 buildvariant=user veritykeyid=id:f3530e18f64d11fc25eb2dd762979f078de990bf"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_pagesize="2048"
+deviceinfo_header_version="1"
+deviceinfo_flash_offset_base="0x40000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x15000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x14000000"

device/testing/device-asus-flo/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: David Heidelberg <david@ixit.cz>
 pkgname=device-asus-flo
-pkgver=1.1
-pkgrel=4
+pkgver=2
+pkgrel=0
 pkgdesc="Google Nexus 7 2013 (flo)"
 url="https://postmarketos.org"
 arch="armv7"
@@ -12,9 +12,8 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
-	$pkgname-weston
 	$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal weston.ini"
+source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal"
 
 options="!check !archcheck"
 
@@ -32,12 +31,6 @@ package() {
 		"$pkgdir"/etc/pointercal
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 kernel_downstream() {
 	pkgdesc="GPU works somehow, very old"
 	depends="linux-asus-flo"
@@ -61,5 +54,4 @@ sha512sums="
 5ac89b627f52d2f1103c3329bd905cdbb906cae5bb332d52e6805d7971fbcc0faabe1fd9d2beb7c6de4e4487c05047eaa17852dbf9e114ee3c5d4b0d57d73859  90-android-touch-dev.rules
 3278921cc1617d10fdd13dfbeaf213cda0078d069e727acd8cfac10bd8ade6f373be1e22fd1e4b50ae71cd2eae09f7d6aad5de42338d9ea9f8c1a34f0b60cb69  wpa_supplicant.conf
 cf913217b41a3dde8bc2a16a5bc82013c85679de0e81db1cfc36f2409ea034fec430082ddcb207c16746453601cf8381300b049cd2fb131f1916dc7dbcc247e3  pointercal
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "

device/testing/device-asus-flo/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-generic-x86_64/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-generic-x86_64
 pkgdesc="Generic x86_64 system, with EFI"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -64,5 +64,5 @@ kernel_lts() {
 
 sha512sums="
 33f0450413c7b364390fdc715578b41389bced5ff69f04a2128155f5ad828ed0e1cc17a20b610eccf4bd99560e21be91e362faaa72e9decad4623f8669e8ab7a  deviceinfo
-d65ca12564ef032507c19359643794a14579fd1d065777f9042d40d38aad4d40d99c10aae9a3acd7799f4ad95651b6ca9d83335501d08869dc391f3050df4d1f  modules-initfs
+7e968698e54583023cc73a9dec0c15ef91d6eb24ad31f0ce531a6eada0ff2dceb22c9edc443bf7cef362a9a5b23ea95d698c217e1f780495029f4a5451ed2882  modules-initfs
 "

device/testing/device-generic-x86_64/modules-initfs

@@ -10,6 +10,7 @@ libata
 mbcache
 mmc_block
 mmc_core
+nvme
 scsi_mod
 sd
 sd_mod

device/testing/device-motorola-def/APKBUILD

@@ -2,16 +2,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-def
 pkgdesc="Motorola Moto One Hyper"
-pkgver=0.1
-pkgrel=7
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 depends="postmarketos-base linux-motorola-def mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo weston.ini"
+source="deviceinfo"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -21,12 +21,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Nonfree firmware metapackage for Motorola One Hyper"
 	depends="firmware-motorola-def"
@@ -36,5 +30,4 @@ nonfree_firmware() {
 
 sha512sums="
 0b133cd1fc0c3b77766771652c4a11f146c6d8cbc4a75a15675bf53640249096887a4a412a88a43ccee858366a08302e8810b146628cec8d39d137fe3859b0b0  deviceinfo
-809cac74c2ea02e21359c7f37f90a0efdf90ea1d23082acff6786e6dbaa1c2b5616a4d36de751ac6c73cfa727362bc23df95b0c78bf4dd1d3441ac182372358a  weston.ini
 "

device/testing/device-motorola-def/weston.ini

@@ -1,4 +0,0 @@
-[core]
-backend=dri-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-motorola-thea/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-thea
-pkgver=1
-pkgrel=6
+pkgver=2
+pkgrel=0
 pkgdesc="Motorola Moto G 2014"
 url="https://postmarketos.org"
 arch="armv7"
@@ -9,8 +9,8 @@ license="MIT"
 depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
-subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo 90-android-touch-dev.rules profile.sh weston.ini"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo 90-android-touch-dev.rules profile.sh"
 options="!check !archcheck"
 
 build() {
@@ -29,12 +29,6 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-motorola-titan"
@@ -45,5 +39,4 @@ sha512sums="
 40ce29e9b4fa8617f31b7d89576b9786b5503745fe25f5efc72dd8f5e47219e37dff5495021addc096aed1462c8958bdff8666e9f9cf33ae67df961662a3a84f  deviceinfo
 8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
 "

device/testing/device-motorola-thea/weston.ini

@@ -1,11 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=false
-backend=fbdev-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-motorola-titan/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-titan
-pkgver=1
-pkgrel=41
+pkgver=2
+pkgrel=0
 pkgdesc="Motorola Moto G 2014"
 url="https://postmarketos.org"
 arch="armv7"
@@ -9,8 +9,8 @@ license="MIT"
 depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
-subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo 90-android-touch-dev.rules profile.sh weston.ini"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+source="deviceinfo 90-android-touch-dev.rules profile.sh"
 options="!check !archcheck"
 
 build() {
@@ -29,12 +29,6 @@ package() {
 	ln -s /dev/null "$pkgdir"/etc/udev/rules.d/60-persistent-v4l.rules
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="firmware-motorola-titan"
@@ -45,5 +39,4 @@ sha512sums="
 4698a4cb0f5f9bc083798f18ff1c85c9952868817a085cb2e00c8f64fc44649538a18d6e896aa6b03f2b55bbada097590848be34927f9c1dc9c5acaefece77d1  deviceinfo
 8406968cd554393ea1e350967c80810d059de2b1d33ea1302e265780c1f0110d64cf15a68c2f374981a88906d0317315e0a71995c85fd5eaf93bb47ed427529c  90-android-touch-dev.rules
 d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
 "

device/testing/device-motorola-titan/weston.ini

@@ -1,11 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=false
-backend=fbdev-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-nokia-n9/APKBUILD

@@ -1,18 +1,16 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-nokia-n9
-pkgver=1
-pkgrel=16
+pkgver=2
+pkgrel=0
 pkgdesc="Nokia N9"
 url="https://postmarketos.org"
 arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-nokia-n9 ofono watchdog-kick"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-weston:weston"
 source="
 	deviceinfo
 	initfs-hook.sh
-	weston.ini
 "
 options="!check !archcheck"
 
@@ -24,12 +22,6 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi firmware"
 	depends="linux-firmware"
@@ -39,5 +31,4 @@ nonfree_firmware() {
 sha512sums="
 f1a940b092e38d241a81828bbf3116ec07684e89519ed16cb9b1c271685979f0bce070d615f21af833d765a28cc92d8438e0306be7c34cb184c9b7d949a55649  deviceinfo
 194b135573da8c894b079bc00cf560e318a62d71ed3dd63f219f0f80d0f882b7d41e988c9c0945319a665e0f217c8eb5ff5353acafe25fa755a84e9e8de3df4b  initfs-hook.sh
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 "

device/testing/device-nokia-n9/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-oneplus-bacon/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-bacon
-pkgver=2
-pkgrel=5
+pkgver=3
+pkgrel=0
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
 arch="armv7"
@@ -16,9 +16,8 @@ subpackages="
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-weston
 "
-source="deviceinfo modules-initfs.mainline 90-android-touch-dev.rules weston.ini"
+source="deviceinfo modules-initfs.mainline 90-android-touch-dev.rules"
 options="!check !archcheck"
 
 build() {
@@ -49,15 +48,8 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 sha512sums="
 4daaf93f610cbc1b2a864dcb9b6488b04218f6ca9b14f579afc219e813eb22a8e4c48a2852b217cbae9c165a851a88546c8e2851cb1aa301ed636947e56cf24c  deviceinfo
 fd639faebbee2c0c2c227710678376e0d039b7d96a62103f7ba7e6304d7060023f09064918e93a125465d20d125c0334225680521a7aeae5a43d77d7360c180c  modules-initfs.mainline
 65e9ee7352b1dc39d99ea411eb0ed9c56f9975230907db5add3a1b4146cdf6f227c934052dab38a1937ed67d67585f28fb7410f10a1bec9dd5e4eb69d7253515  90-android-touch-dev.rules
-86a0c08720225e4532f797ad69307dfff66867e4a35de1aacceefc48f19721caf93f9a17a268e58f1f5a7e947f157d6984676837c2b5b835b0caf6ee9821bb5a  weston.ini
 "

device/testing/device-oneplus-bacon/weston.ini

@@ -1,11 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=false
-backend=fbdev-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-pine64-dontbeevil/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-pine64-dontbeevil
-pkgver=0.4
-pkgrel=3
+pkgver=0.5
+pkgrel=0
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 url="https://postmarketos.org"
 license="MIT"
@@ -12,7 +12,6 @@ subpackages="
 	$pkgname-kernel-shortts:kernel_shortts
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-sensorfw
-	$pkgname-weston
 	$pkgname-x11
 "
 depends="postmarketos-base u-boot-sunxi u-boot-tools ofono"
@@ -23,7 +22,6 @@ source="
 	modules-initfs
 	sensorfw/90-dontbeevil.conf
 	uboot-script.cmd
-	weston.ini
 	xorg.conf
 	"
 
@@ -48,12 +46,6 @@ x11() {
 		"$subpkgdir"/etc/X11/xorg.conf.d/10-framebuffer.conf
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi and Bluetooth firmware"
 	depends="linux-firmware-rtlwifi linux-firmware-rtl_bt firmware-pine64-rtl8723bt"
@@ -85,6 +77,5 @@ dc24f907b420481fc63c277bb3ddc1bde07c01b5bdb1cd13648357299e2279e6a42310ffbaec2c3d
 c240c7ff7bd0ec0561eacc1927e678b3955086c951548633e1ee5284283e005f0c7fb4c4472f40529cba552cce076294fdfae97f35a338592b3a6961da4a7a3f  modules-initfs
 967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d  90-dontbeevil.conf
 7d46b92a9a831ead6c1919b95ec4930242b35c2d8e2ce05fcb70dcd8c77c61d840d78738c5d82f6f4d56a1e676237243a795a728e76f38c27a74ed6dcb44279a  uboot-script.cmd
-c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
 "

device/testing/device-pine64-dontbeevil/weston.ini

@@ -1,12 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=true
-backend=fbdev-backend.so
-
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-raspberry-pi3/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
-pkgver=0.2
-pkgrel=5
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -10,8 +10,7 @@ options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-weston"
-source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini networkmanager.conf"
+source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -28,12 +27,6 @@ package() {
 		"$pkgdir"/etc/NetworkManager/conf.d/10-rpi3.conf
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 sha512sums="
 dc77ec14629e3821544fd660b4353dd0c104b7320508d71c7f87afc85263b35ae716964cfda114a3db07a9799f03443a6db874411aba1f3b06dd3eaa33d60500  deviceinfo
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
@@ -41,6 +34,5 @@ ba195d9345fa4f4aee38cbc945b02f5bf13bd7e255124de006b4d04bc78c846c8c6b85268816f8a8
 a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548  usercfg.txt
 ae3de0b8fec07d3a283dc3c06bf8678eec1e65c9faf0b7f4fdc9fb92751e324d1f8e2fb224dbbf561b7e5a6fb34769bfa1657858375f74b101a130d78e0737e2  cmdline.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
-320a466009c5abb416f70a60b45b3403ef1d1b4ac68a762c8028cd4615d537c48d906afe101e7335907a0274cc25b0b9b547e02ee69950e6792a7b54759c7cd9  weston.ini
 0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b  networkmanager.conf
 "

device/testing/device-raspberry-pi3/weston.ini

@@ -1,6 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-samsung-i9100/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9100
-pkgver=4
-pkgrel=10
+pkgver=5
+pkgrel=0
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
 arch="armv7"
@@ -15,13 +15,11 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-front-camera:nonfree_firmware_front_camera
-	$pkgname-weston:weston
 	$pkgname-media-pipeline:media_pipeline
 "
 source="
 	deviceinfo
 	90-android-touch-dev.rules
-	weston.ini
 	media-pipeline.initd
 "
 
@@ -60,12 +58,6 @@ nonfree_firmware_front_camera() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname-kernel-mainline weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 media_pipeline() {
 	install_if="$pkgname-kernel-mainline"
 	depends="v4l-utils"
@@ -76,6 +68,5 @@ media_pipeline() {
 sha512sums="
 3f9eea389812bb95efdc7921d50dc7589aafc70f7ad4ce7f2e16cda135ff2683ca07bfa899a000e9272ea7abf2cc28870782ade02f0a1f164dc6370e56918fa7  deviceinfo
 089635daddd88eec35451bfe98dc3713035e3623c896dd21305b990ecf422e8fbb54e010cf347919bbb3a7385f639ab119280477fe0783df3228168d97d96fc6  90-android-touch-dev.rules
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 d3f06476be583f095189557e5269866cfc9346ddbf8d78267d7562fad7f5eca6b09b81fd08cd9690ecf88105bafe8f3ebd9136b68ab5cdaa8bfff740a8bdf3d2  media-pipeline.initd
 "

device/testing/device-samsung-i9100/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-samsung-m3/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-m3
 pkgdesc="Samsung Galaxy S III LTE"
-pkgver=6.1
-pkgrel=3
+pkgver=6.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -12,6 +12,7 @@ depends="
 	linux-postmarketos-exynos4
 	mkbootimg
 	postmarketos-base
+	postmarketos-update-kernel
 	soc-samsung-exynos4412-haptics
 	"
 makedepends="devicepkg-dev"
@@ -51,7 +52,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-d2ed2eedd223854766121058273a3a90b1672dbb95d0072b56100c01196cbe5ee96049c3b646b9b2f60af1254743ef4c4006e6275f407d582ec012e7bd383f71  deviceinfo
+4674bb08bce234140144a6cb5f22eb7095367bf01b8976b33f122c78459b79f181d39acd9fa0a15f183a43729d0838143d4027665fa753c38d04dce13e3eacec  deviceinfo
 caa81e8ab6753c0ca24c22fb6742288765dfbf2469b8b8c35c5789edfcee546ef1c3b14ad6e540c417f434258399300f17d312b58157635eafab134587ef94cc  Midas.conf
 21f64c9104ec5780fffde8ba7ce57583592469694d07dd5e2de4173d7c9f99ba57fb28bb5bcfbbce921be9c4ead9d31980e948533162fe12424c2037145debb1  HiFi.conf
 56a2bdffc273cb0a581192e65378ff50e71c7bc8a696af7d5e7c165a53c005aae104c4514c68afb668454c5a94ce78bd509f8a40e3401d67e16636b1ed81d051  modules-load.conf

device/testing/device-samsung-m3/deviceinfo

@@ -8,7 +8,9 @@ deviceinfo_codename="samsung-m3"
 deviceinfo_year="2012"
 deviceinfo_append_dtb="true"
 deviceinfo_dtb="exynos4412-i9305"
+deviceinfo_getty="ttySAC2;115200"
 deviceinfo_arch="armv7"
+deviceinfo_flash_kernel_on_update="true"
 
 # Device related
 deviceinfo_gpu_accelerated="true"

device/testing/device-samsung-manta/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-samsung-manta
 pkgdesc="Google Nexus 10"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -33,6 +33,10 @@ package() {
 
 	install -Dm644 "$srcdir"/100-wlan-mac.rules \
 		-t "$pkgdir"/usr/lib/udev/rules.d/
+
+	mkdir -p "$pkgdir"/etc/modprobe.d
+	echo "options ds2482 active_pullup=0" \
+		> "$pkgdir"/etc/modprobe.d/ds2482.conf
 }
 
 nonfree_firmware() {

device/testing/device-sony-sirius/APKBUILD

@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-sirius
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
 arch="armv7"
@@ -12,11 +12,10 @@ depends="
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
-subpackages="$pkgname-weston $pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="$pkgname-x11 $pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	deviceinfo
 	modules-initfs
-	weston.ini
 	99-touch.rules
 	modules-load.conf
 	brcmfmac4339-sdio.txt
@@ -44,12 +43,6 @@ x11() {
 	mkdir "$subpkgdir"
 }
 
-weston() {
-	install_if="$pkgname weston"
-	install -Dm644 "$srcdir"/weston.ini \
-		"$subpkgdir"/etc/xdg/weston/weston.ini
-}
-
 nonfree_firmware() {
 	pkgdesc="Wifi/GPU firmware"
 	depends="linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
@@ -59,7 +52,6 @@ nonfree_firmware() {
 sha512sums="
 3e856f1832ea0e2836545d3e6c1765134c9117d41e7b12ff5d43282aef6c295f02f812629f78c695483a5dd8c1287bf6bad0b4ee16c19e86ddcaa42e0f449acb  deviceinfo
 a6580d63105978aac1ee13098bdee1d98528dba671889199ba79264c40750807fecd3d526471fb77abd55fa0fec21c8fea1d0fd6d4fb5afd2b306bc98ef1a0d7  modules-initfs
-de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25  weston.ini
 ec5e26e60a77e74befabf5cc3f85a2636ce07261e725c0a051999d321ddec056f307001ba659c91e403770ac99d38b3160fd46e235c467fefc03d0901452314d  99-touch.rules
 35a5dbd90eef6c567822f1a805c6adf620bb9c6c9c2e1755407409c2fab044baa40dda9e526c45108b4a2bbf43e0ad67e3dd90c35f6a6c6e29ec5930f2d1c4a7  modules-load.conf
 b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68  brcmfmac4339-sdio.txt

device/testing/device-sony-sirius/weston.ini

@@ -1,5 +0,0 @@
-[core]
-xwayland=true
-backend=drm-backend.so
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg

device/testing/device-xiaomi-clover/APKBUILD

@@ -1,15 +1,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-clover
 pkgdesc="Xiaomi Mi Pad 4"
-pkgver=0.2
-pkgrel=3
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-sdm660 mkbootimg"
+depends="
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+subpackages="
+	$pkgname-kernel-clover:kernel_clover
+	$pkgname-kernel-cloverplus:kernel_cloverplus
+"
+source="
+	deviceinfo
+	modules-initfs.clover
+	modules-initfs.cloverplus
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,7 +30,20 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_clover() {
+	pkgdesc="For regular Mi Pad 4"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_cloverplus() {
+	pkgdesc="For Mi Pad 4 Plus"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
-08419372e39578e00965625cc5515ee75c6e092e0f88e9ba9e608bfed3e94baaa07a88aaa405ba4051525f69e8d7ad55c63acee056d53118732139c3d2f4441d  deviceinfo
-709e3b6b082189d3a84e56d624221a6d5e502cd3d2a61080979cabfc2f048dc90b45f2cf1dd79c095e74db726d5670d22772bdc1a3ab6c42f97cd6ac09c86946  modules-initfs
+d3d0ca6a2a8edc471bd1087afa72dbb69d869e597e58867d437be4aa34b0b1dbd637d81c6835a0ba3d9f264ca6d24e7a0d77b892b7d35b48355f02e9e11b6bc7  deviceinfo
+709e3b6b082189d3a84e56d624221a6d5e502cd3d2a61080979cabfc2f048dc90b45f2cf1dd79c095e74db726d5670d22772bdc1a3ab6c42f97cd6ac09c86946  modules-initfs.clover
+103ecf9d5005d44114fa644f61d059b5b22d5936ed71da460e55614ed9ec795595d4e9e2f2b79fb3511751edcf8e88ae134c5530ce037f86ae92c87768396e49  modules-initfs.cloverplus
 "

device/testing/device-xiaomi-clover/deviceinfo

@@ -7,7 +7,8 @@ deviceinfo_name="Xiaomi Mi Pad 4"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-clover"
 deviceinfo_year="2018"
-deviceinfo_dtb="qcom/sdm660-xiaomi-clover"
+deviceinfo_dtb_clover="qcom/sdm660-xiaomi-clover"
+deviceinfo_dtb_cloverplus="qcom/sdm660-xiaomi-clover-plus"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 

device/testing/device-xiaomi-clover/modules-initfs.cloverplus

@@ -0,0 +1 @@
+goodix_ts

device/testing/firmware-xiaomi-elish/APKBUILD

@@ -1,5 +1,5 @@
 pkgname=firmware-xiaomi-elish
-pkgver=20230516
+pkgver=20240109
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Mi Pad 5 Pro"
 subpackages="
@@ -15,7 +15,7 @@ url="https://github.com/lujianhua/xiaomi-elish-firmware"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="d81ba3dfd6b13a719906b1e1f708fd3e46c8c39b"
+_commit="013b45d1fe64a392c94dc6c58aba72c791be6209"
 source="https://github.com/lujianhua/xiaomi-elish-firmware/archive/$_commit/xiaomi-elish-firmware-$_commit.tar.gz"
 builddir="$srcdir/xiaomi-elish-firmware-$_commit"
 
@@ -76,5 +76,5 @@ venus() {
 }
 
 sha512sums="
-e4e46e0c72d0f06c98cc8947a3c2ddf5edec84dff68cd9fa63059c50868a98e73dfa3acc9469f70ee245130f90c4d795a80871e82681162ee0df08aaab1ef22c  xiaomi-elish-firmware-d81ba3dfd6b13a719906b1e1f708fd3e46c8c39b.tar.gz
+0581361b9b376ed52798622e337294933b81b594ab7fb223668531e297acc977ce5b6770a0ee5bf7382c1989a6e4d64184f5ce937ea6cb9171e6b4a5bbc7ff16  xiaomi-elish-firmware-013b45d1fe64a392c94dc6c58aba72c791be6209.tar.gz
 "

device/testing/firmware-xiaomi-kenzo/APKBUILD

@@ -1,7 +1,7 @@
 pkgname=firmware-xiaomi-kenzo
 pkgver=1
-pkgrel=2
-_commit="a95bb1dcd92fb301d8e4401679f6c19d93f5875c"
+pkgrel=3
+_commit="1f5bc36bab97586358feab5952be859195760688"
 pkgdesc="Firmware files for Xiaomi Redmi Note 3"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -13,6 +13,7 @@ builddir="$srcdir/vendor_xiaomi_kenzo-$_commit"
 
 _files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06
 	    wcnss.b09 wcnss.b10 wcnss.b11 wcnss.b12 wcnss.mdt"
+_files_venus="venus-v1.b00 venus-v1.b01 venus-v1.b02 venus-v1.b03 venus-v1.b04 venus-v1.mbn venus-v1.mdt"
 _files_prima="WCNSS_wlan_dictionary.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin WCNSS_cfg.dat"
 
 package() {
@@ -21,6 +22,10 @@ package() {
 		install -D -m644 "$_i" \
 			"$pkgdir"/lib/firmware/postmarketos/"$_i"
 	done
+	for _i in $_files_venus; do
+		install -D -m644 "$_i" \
+			"$pkgdir"/lib/firmware/postmarketos/"$_i"
+	done
 
 	# /lib/firmware/postmarketos/wlan/prima
 	for _i in $_files_prima; do
@@ -29,4 +34,6 @@ package() {
 	done
 }
 
-sha512sums="804a69851e13d7ebcc90782b6bf246150327ad4282d67195bb7018bbeae93670e4896a336dadf3bd992110517afd2116df165a132545a0f62072bb6261a7588d  firmware-xiaomi-kenzo-a95bb1dcd92fb301d8e4401679f6c19d93f5875c.tar.gz"
+sha512sums="
+47b0a8d34ea7db56ffe8c1f81f947568e743c143d3e51937d3cfa711994cae3774cbfaef6ad6ed68b48b8ebc437d817a0b476b469dad1e5061333482119b84c6  firmware-xiaomi-kenzo-1f5bc36bab97586358feab5952be859195760688.tar.gz
+"

device/testing/linux-amazon-sheldon/APKBUILD

@@ -0,0 +1,62 @@
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm/configs/sheldon_defconfig
+pkgname=linux-amazon-sheldon
+pkgver=4.4.121
+pkgrel=0
+pkgdesc="Amazon Fire TV Stick Lite kernel fork"
+arch="armv7"
+_carch="arm"
+_flavor="amazon-sheldon"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps pmb:cross-native"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	findutils
+	flex
+	openssl-dev
+	perl
+"
+
+# Source
+_repository="android_kernel_amazon_mt8695"
+_commit="119f0dd3c04a91639cc80cf46371d724d84b1048"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/mt8695/$_repository/archive/$_commit.tar.gz
+	$_config
+	linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+	proc-v7-fix.patch
+	head.s-fix.patch
+	piggy.gzip.s-fix.patch
+"
+builddir="$srcdir/$_repository-$_commit"
+_outdir="out"
+
+prepare() {
+	default_prepare
+	. downstreamkernel_prepare
+}
+
+build() {
+	unset LDFLAGS
+	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
+		"$_flavor" "$_outdir"
+}
+
+sha512sums="
+0efe1eb1751d2af6013d4dbe2bee69f84f83dede7a50db1a2de41daa987e31f6fc8df0e9780d3d0a9ae865ada0f0af55ba8e391e2c56024715a62911fa2c03ef  linux-amazon-sheldon-119f0dd3c04a91639cc80cf46371d724d84b1048.tar.gz
+a3f0998128a379802696ec56d5a734930ece813637837b2b5feefbcf5aec0ffebc38c5eac05349ee445ae4aca70612b39ddde8cb4c870c78381cb456d8191279  config-amazon-sheldon.armv7
+eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+f1218ddaf456e53945c647cc4e3459acc2a1ec33e20f746cf3d74950fcdbfe50e0eee6e9dadc386f4aecba1495e35f2f24f30325d7fcf1e51d9bd8d648072fad  proc-v7-fix.patch
+b396a1586f9746054f54534891baab8c9c20f49630f74ec99ce7c0f34fdf2f91b0891d747e7cc576be5695056a5453f6595b50e38718db84c4bde11d4dfa7c5f  head.s-fix.patch
+40aac5e96cc9e2c2b5d66665b60311a2eccd001669e98415e48e6f22be344fad01bc6ef6aa125854586a7f930a0623afcbc899accae38bf7dabd457b681fc5ec  piggy.gzip.s-fix.patch
+"

device/testing/linux-amazon-sheldon/head.s-fix.patch

@@ -0,0 +1,22 @@
+From 1e5273ea46a2869ad31d9275dc99661ef58f013b Mon Sep 17 00:00:00 2001
+From: BeastRein <80418545+BeastRein@users.noreply.github.com>
+Date: Mon, 8 Jan 2024 20:06:32 -0500
+Subject: [PATCH] Update head.S
+
+---
+ arch/arm/boot/compressed/head.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
+index d2e43b053d9b..002cb8ca3d40 100644
+--- a/arch/arm/boot/compressed/head.S
++++ b/arch/arm/boot/compressed/head.S
+@@ -112,7 +112,7 @@
+ #endif
+ 		.endm
+ 
+-		.section ".start", #alloc, #execinstr
++		.section ".start", "ax"
+ /*
+  * sort out different calling conventions
+  */

device/testing/linux-amazon-sheldon/linux4.2-gcc10-extern_YYLOC_global_declaration.patch

@@ -0,0 +1,64 @@
+From 4c2e46a9ec9ec477346d9145fdeba8413ae5c515 Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dmueller@suse.com>
+Date: Tue, 14 Jan 2020 18:53:41 +0100
+Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
+
+gcc 10 will default to -fno-common, which causes this error at link
+time:
+
+  (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
+
+This is because both dtc-lexer as well as dtc-parser define the same
+global symbol yyloc. Before with -fcommon those were merged into one
+defintion. The proper solution would be to to mark this as "extern",
+however that leads to:
+
+  dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
+   26 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+In file included from dtc-lexer.l:24:
+dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
+  127 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+cc1: all warnings being treated as errors
+
+which means the declaration is completely redundant and can just be
+dropped.
+
+Signed-off-by: Dirk Mueller <dmueller@suse.com>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+[robh: cherry-pick from upstream]
+Cc: stable@vger.kernel.org
+Signed-off-by: Rob Herring <robh@kernel.org>
+---
+ scripts/dtc/dtc-lexer.l             | 1 -
+ scripts/dtc/dtc-lexer.lex.c_shipped | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
+index 790fbf6cf2d7..e4e0f6a8d07b 100644
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
+index ba525c2f9fc2..750f7a4e3ece 100644
+--- a/scripts/dtc/dtc-lexer.lex.c_shipped
++++ b/scripts/dtc/dtc-lexer.lex.c_shipped
+@@ -637,7 +637,6 @@ char *yytext;
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+2.28.0
+

device/testing/linux-amazon-sheldon/piggy.gzip.s-fix.patch

@@ -0,0 +1,19 @@
+From d4501f99a743889e89afea7f3d9675d8a5cb2907 Mon Sep 17 00:00:00 2001
+From: BeastRein <80418545+BeastRein@users.noreply.github.com>
+Date: Mon, 8 Jan 2024 20:12:08 -0500
+Subject: [PATCH] Update piggy.gzip.S
+
+---
+ arch/arm/boot/compressed/piggy.gzip.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/compressed/piggy.gzip.S b/arch/arm/boot/compressed/piggy.gzip.S
+index a68adf91a165..c71952cfe45d 100644
+--- a/arch/arm/boot/compressed/piggy.gzip.S
++++ b/arch/arm/boot/compressed/piggy.gzip.S
+@@ -1,4 +1,4 @@
+-	.section .piggydata,#alloc
++	.section .piggydata, "a"
+ 	.globl	input_data
+ input_data:
+ 	.incbin	"arch/arm/boot/compressed/piggy.gzip"

device/testing/linux-amazon-sheldon/proc-v7-fix.patch

@@ -0,0 +1,22 @@
+From 50f223713472d5edced4cac7b8b32db0310973fc Mon Sep 17 00:00:00 2001
+From: BeastRein <80418545+BeastRein@users.noreply.github.com>
+Date: Mon, 8 Jan 2024 19:43:05 -0500
+Subject: [PATCH] Update proc-v7.S
+
+---
+ arch/arm/mm/proc-v7.S | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
+index 8e1ea433c3f1..e35a5e8cd700 100644
+--- a/arch/arm/mm/proc-v7.S
++++ b/arch/arm/mm/proc-v7.S
+@@ -504,7 +504,7 @@ __v7_setup_stack:
+ 	string	cpu_elf_name, "v7"
+ 	.align
+ 
+-	.section ".proc.info.init", #alloc
++	.section ".proc.info.init", "a"
+ 
+ 	/*
+ 	 * Standard v7 proc info content

device/testing/linux-postmarketos-qcom-msm8974/APKBUILD

@@ -4,7 +4,7 @@ _flavor=postmarketos-qcom-msm8974
 _config="config-$_flavor.$CARCH"
 
 pkgname=linux-$_flavor
-pkgver=6.7.0_rc5
+pkgver=6.7.0
 pkgrel=0
 _tag="v${pkgver/_/-}-msm8974"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
@@ -60,6 +60,6 @@ package() {
 }
 
 sha512sums="
-f569a428b411091df0f4786f1e3535082081937e056d2c8c733dd05b64dc83720936e7e5c270637d48459221282b99cdb61371427e4692bac9649f206e9a7311  linux-v6.7.0-rc5-msm8974.tar.gz
-71fd4212822f05687119998fa2f47c38e3dccdc89a2f2fc88febf553aa94aa18d1fa547489294c83e5ad545965e84537f78adc09fb3aac2bf045674cc3afa620  config-postmarketos-qcom-msm8974.armv7
+b635fe71bf699c56c4ff99a786eee1543759a981be5a281f61802a01b406a3b38b478475d8d6f5cdd3f8375f144078694f5a59ca77a67d803ab5e9009b86a986  linux-v6.7.0-msm8974.tar.gz
+a1dca9850d785234757b824c1a6219f060c63f169ce95e407bd97d81263cf14b80f354445a913f28e100e9b6d17eea3ae7901c40044d2ce6c65ade7380c24fe7  config-postmarketos-qcom-msm8974.armv7
 "

device/testing/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 6.7.0-rc5 Kernel Configuration
+# Linux/arm 6.7.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -5022,7 +5022,6 @@ CONFIG_MSM_MMCC_8974=y
 # CONFIG_SDX_GCC_55 is not set
 # CONFIG_SDX_GCC_65 is not set
 # CONFIG_SDX_GCC_75 is not set
-# CONFIG_SM_CAMCC_8550 is not set
 # CONFIG_SM_GCC_7150 is not set
 # CONFIG_SPMI_PMIC_CLKDIV is not set
 # CONFIG_QCOM_HFPLL is not set
@@ -6752,8 +6751,6 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
-# CONFIG_DEBUG_CREDENTIALS is not set
-
 #
 # RCU Debugging
 #

device/testing/linux-postmarketos-qcom-sdm660/APKBUILD

@@ -3,7 +3,7 @@
 
 _flavor="postmarketos-qcom-sdm660"
 pkgname=linux-$_flavor
-pkgver=6.3.3
+pkgver=6.7.0
 pkgrel=0
 pkgdesc="Close to mainline linux kernel for Qualcomm Snapdragon 660 SoC"
 arch="aarch64"
@@ -44,8 +44,7 @@ prepare() {
 build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \
-		LOCALVERSION=-sdm660
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
 }
 
 package() {
@@ -53,7 +52,6 @@ package() {
 
 	make zinstall modules_install dtbs_install \
 		ARCH="$_carch" \
-		LOCALVERSION=-sdm660 \
 		INSTALL_PATH="$pkgdir"/boot \
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_MOD_STRIP=1 \
@@ -65,6 +63,6 @@ package() {
 }
 
 sha512sums="
-2f436cad5bfaa48a008bdc13306d890bea099da49aa01d016adb851e4b99254da8ac9c5fbc00c000bac9ecc57fbd7781068f2bb837428b31281a5a6550e98024  linux-v6.3.3-sdm660.tar.gz
-ad03eaa65aff11f63eb4fbd3fb42adecb2bccc0a3a54c8b5c8abace25ffffcce54e87814ab7b68e2d239a557a3ca2a2e6c7975333fa2f5cfb6ca3009a2eac825  config-postmarketos-qcom-sdm660.aarch64
+e5c4e0478a5e1e0dbddbfca35bd280bfd1a372d671f21e673b6f6377d1861a59fdde19949f0bd62cf05eb133ad91f6d6e887565e26ad5ace5dee0408a6cd76f4  linux-v6.7.0-sdm660.tar.gz
+8da0fccc8cabcd5c2b8a37a7d870213f5190d84e916ddba9b6b5fd282f82a316a06f0ae2e3295bc3a4f5a2c3877333b5ddccf773b151eb4d389bedeae71226cd  config-postmarketos-qcom-sdm660.aarch64
 "

device/testing/linux-postmarketos-qcom-sm8250/APKBUILD

@@ -3,7 +3,7 @@
 
 _flavor="postmarketos-qcom-sm8250"
 pkgname=linux-$_flavor
-pkgver=6.6.0
+pkgver=6.7.0
 pkgrel=0
 pkgdesc="Mainline kernel fork for SM8250"
 arch="aarch64"
@@ -26,7 +26,7 @@ makedepends="
 "
 
 # Source
-_tag="sm8250-6.6.0"
+_tag="sm8250-6.7.0"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_tag.tar.gz::https://gitlab.com/sm8250-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
@@ -61,6 +61,6 @@ package() {
 }
 
 sha512sums="
-babc2cd2d505a5a109042b7815f58e6969216ad5c48920c0bb11d96700e58381762e09d36973c9161f3ac5a92c7185dbdf2592db1ff4058f9f972319737bdbe4  linux-postmarketos-qcom-sm8250-sm8250-6.6.0.tar.gz
-6161f51f95965715bf80cabf7a986a88cffd4b7cb127d51009e5092d8f3dae911c6a028b2a25ff0c59da8601cdfb036c0f680ddc2b04da5db1beb18bdeba0834  config-postmarketos-qcom-sm8250.aarch64
+0922039d4de9077ee94dcaa43de683d7d0f1ceec19029339556133cf2123442afcd4ed174792b5f279f29bba5c98437c94f2ce95087d44fb8a832c4d8e176248  linux-postmarketos-qcom-sm8250-sm8250-6.7.0.tar.gz
+eba45de0f1c2048c381811bad0726b52d9e3c20f2d4c90935349dae012f2cdf94db427a8227e2f735bb1c501a6b512bcaf2c5d1ede79f77b2e1a07745fc53cae  config-postmarketos-qcom-sm8250.aarch64
 "

device/testing/linux-postmarketos-qcom-sm8250/config-postmarketos-qcom-sm8250.aarch64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.0 Kernel Configuration
+# Linux/arm64 6.7.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014"
 CONFIG_CC_IS_GCC=y
@@ -315,6 +315,7 @@ CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y
 # CONFIG_ARCH_NXP is not set
 # CONFIG_ARCH_MA35 is not set
 # CONFIG_ARCH_NPCM is not set
+# CONFIG_ARCH_PENSANDO is not set
 CONFIG_ARCH_QCOM=y
 # CONFIG_ARCH_REALTEK is not set
 # CONFIG_ARCH_RENESAS is not set
@@ -426,6 +427,7 @@ CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y
 CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y
+CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION=y
 CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_ARCH_FORCE_MAX_ORDER=10
@@ -960,6 +962,7 @@ CONFIG_MIGRATION=y
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_ARCH_ENABLE_THP_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
+CONFIG_PCP_BATCH_SCALE_MAX=5
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -1606,7 +1609,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 # CONFIG_MAC80211_MESH is not set
 CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1693,6 +1695,7 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_AMPERE_ALTRA is not set
 # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 # CONFIG_HOTPLUG_PCI_SHPC is not set
@@ -1819,7 +1822,6 @@ CONFIG_GENERIC_ARCH_NUMA=y
 #
 # Bus devices
 #
-# CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
 CONFIG_QCOM_EBI2=y
 # CONFIG_QCOM_SSC_BLOCK_BUS is not set
@@ -1855,6 +1857,7 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y
 # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set
 # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set
 CONFIG_ARM_SCMI_POWER_DOMAIN=y
+CONFIG_ARM_SCMI_PERF_DOMAIN=y
 # CONFIG_ARM_SCMI_POWER_CONTROL is not set
 # end of ARM System Control and Management Interface Protocol
 
@@ -1865,8 +1868,6 @@ CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_FW_CFG_SYSFS is not set
-CONFIG_QCOM_SCM=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_SYSFB=y
 CONFIG_SYSFB_SIMPLEFB=y
 # CONFIG_ARM_FFA_TRANSPORT is not set
@@ -1899,6 +1900,15 @@ CONFIG_UEFI_CPER=y
 CONFIG_UEFI_CPER_ARM=y
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
+
+#
+# Qualcomm firmware drivers
+#
+CONFIG_QCOM_SCM=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+# CONFIG_QCOM_QSEECOM is not set
+# end of Qualcomm firmware drivers
+
 CONFIG_HAVE_ARM_SMCCC=y
 CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
 CONFIG_ARM_SMCCC_SOC_ID=y
@@ -1921,7 +1931,6 @@ CONFIG_MTD=y
 #
 # Partition parsers
 #
-# CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
@@ -2150,7 +2159,6 @@ CONFIG_PCI_ENDPOINT_TEST=m
 #
 CONFIG_EEPROM_AT24=m
 CONFIG_EEPROM_AT25=m
-# CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_93XX46 is not set
@@ -2453,6 +2461,7 @@ CONFIG_TAP=m
 CONFIG_VETH=m
 # CONFIG_VIRTIO_NET is not set
 # CONFIG_NLMON is not set
+# CONFIG_NETKIT is not set
 # CONFIG_NET_VRF is not set
 # CONFIG_MHI_NET is not set
 # CONFIG_ARCNET is not set
@@ -3430,7 +3439,6 @@ CONFIG_GPIO_MAX77620=y
 
 # CONFIG_W1 is not set
 CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMSTB is not set
 # CONFIG_POWER_RESET_GPIO is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 CONFIG_POWER_RESET_MSM=y
@@ -3476,6 +3484,8 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_MAX77976 is not set
 # CONFIG_CHARGER_QCOM_SMBB is not set
+# CONFIG_BATTERY_PM8916_BMS_VM is not set
+# CONFIG_CHARGER_PM8916_LBC is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -3495,6 +3505,7 @@ CONFIG_BATTERY_BQ27XXX_I2C=y
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
 # CONFIG_CHARGER_QCOM_SMB2 is not set
+# CONFIG_FUEL_GAUGE_MM8013 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
@@ -3546,12 +3557,14 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
+# CONFIG_SENSORS_POWERZ is not set
 # CONFIG_SENSORS_POWR1220 is not set
 # CONFIG_SENSORS_LINEAGE is not set
 # CONFIG_SENSORS_LTC2945 is not set
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2991 is not set
 # CONFIG_SENSORS_LTC2992 is not set
 # CONFIG_SENSORS_LTC4151 is not set
 # CONFIG_SENSORS_LTC4215 is not set
@@ -3914,6 +3927,7 @@ CONFIG_REGULATOR_HI6421V530=y
 # CONFIG_REGULATOR_LTC3589 is not set
 # CONFIG_REGULATOR_LTC3676 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
+# CONFIG_REGULATOR_MAX77503 is not set
 CONFIG_REGULATOR_MAX77620=y
 # CONFIG_REGULATOR_MAX77857 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
@@ -4089,6 +4103,10 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 # Microchip Technology, Inc. media platform drivers
 #
 
+#
+# Nuvoton media platform drivers
+#
+
 #
 # NVidia media platform drivers
 #
@@ -4265,10 +4283,12 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_JDI_LPM102A188A is not set
 # CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
@@ -4296,6 +4316,7 @@ CONFIG_DRM_PANEL_NOVATEK_NT36523=y
 # CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
+# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -4458,6 +4479,7 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_SYSMEM_HELPERS=y
 CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
 CONFIG_FB_MODE_HELPERS=y
@@ -4665,6 +4687,8 @@ CONFIG_SND_SOC_WM_ADSP=m
 # CONFIG_SND_SOC_AW8738 is not set
 # CONFIG_SND_SOC_AW88395 is not set
 # CONFIG_SND_SOC_AW88261 is not set
+# CONFIG_SND_SOC_AW87390 is not set
+# CONFIG_SND_SOC_AW88399 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CHV3_CODEC is not set
@@ -4763,6 +4787,7 @@ CONFIG_SND_SOC_HDMI_CODEC=y
 # CONFIG_SND_SOC_RT715_SDW is not set
 # CONFIG_SND_SOC_RT715_SDCA_SDW is not set
 # CONFIG_SND_SOC_RT9120 is not set
+# CONFIG_SND_SOC_RTQ9128 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
 # CONFIG_SND_SOC_SIMPLE_MUX is not set
@@ -5011,6 +5036,7 @@ CONFIG_USB_CONN_GPIO=m
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 CONFIG_USB_PCI=y
+# CONFIG_USB_PCI_AMD is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
 
 #
@@ -5138,6 +5164,7 @@ CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_CHIPIDEA_PCI=y
 CONFIG_USB_CHIPIDEA_MSM=y
+CONFIG_USB_CHIPIDEA_NPCM=y
 CONFIG_USB_CHIPIDEA_IMX=y
 CONFIG_USB_CHIPIDEA_GENERIC=y
 CONFIG_USB_CHIPIDEA_TEGRA=y
@@ -5221,6 +5248,7 @@ CONFIG_USB_SERIAL_OPTION=m
 # CONFIG_USB_APPLEDISPLAY is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_APPLE_MFI_FASTCHARGE is not set
+# CONFIG_USB_LJCA is not set
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
@@ -5355,6 +5383,7 @@ CONFIG_TYPEC_HD3SS3220=m
 # CONFIG_TYPEC_MUX_GPIO_SBU is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_MUX_NB7VPQ904M is not set
+# CONFIG_TYPEC_MUX_PTN36502 is not set
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -5448,6 +5477,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
 CONFIG_LEDS_TRIGGER_CPU=y
 # CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 
 #
@@ -5667,7 +5697,6 @@ CONFIG_VIRTIO=y
 # CONFIG_COMEDI is not set
 CONFIG_STAGING=y
 # CONFIG_PRISM2_USB is not set
-# CONFIG_RTL8192U is not set
 # CONFIG_RTLLIB is not set
 # CONFIG_R8712U is not set
 # CONFIG_RTS5208 is not set
@@ -5709,12 +5738,6 @@ CONFIG_STAGING=y
 #
 # CONFIG_AD5933 is not set
 # end of Network Analyzer, Impedance Converters
-
-#
-# Resolver to digital converters
-#
-# CONFIG_AD2S1210 is not set
-# end of Resolver to digital converters
 # end of IIO staging drivers
 
 # CONFIG_FB_SM750 is not set
@@ -5836,7 +5859,9 @@ CONFIG_QCOM_CLK_RPMH=y
 # CONFIG_SM_CAMCC_6350 is not set
 # CONFIG_SM_CAMCC_8250 is not set
 # CONFIG_SM_CAMCC_8450 is not set
+# CONFIG_SM_CAMCC_8550 is not set
 CONFIG_SM_DISPCC_8250=y
+# CONFIG_SM_GCC_4450 is not set
 # CONFIG_SM_GCC_6115 is not set
 # CONFIG_SM_GCC_6125 is not set
 # CONFIG_SM_GCC_6350 is not set
@@ -5977,7 +6002,6 @@ CONFIG_SOUNDWIRE_QCOM=y
 #
 # Broadcom SoC drivers
 #
-# CONFIG_SOC_BRCMSTB is not set
 # end of Broadcom SoC drivers
 
 #
@@ -6011,7 +6035,6 @@ CONFIG_FSL_RCPM=y
 #
 CONFIG_QCOM_AOSS_QMP=y
 CONFIG_QCOM_COMMAND_DB=y
-CONFIG_QCOM_CPR=y
 CONFIG_QCOM_GENI_SE=y
 # CONFIG_QCOM_GSBI is not set
 CONFIG_QCOM_LLCC=y
@@ -6025,8 +6048,6 @@ CONFIG_QCOM_QMI_HELPERS=y
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_RPM_MASTER_STATS is not set
 CONFIG_QCOM_RPMH=y
-CONFIG_QCOM_RPMHPD=y
-CONFIG_QCOM_RPMPD=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD_RPM=y
 CONFIG_QCOM_SMEM_STATE=y
@@ -6048,6 +6069,34 @@ CONFIG_QCOM_ICC_BWMON=y
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
+#
+# PM Domains
+#
+
+#
+# Amlogic PM Domains
+#
+# end of Amlogic PM Domains
+
+#
+# Broadcom PM Domains
+#
+# end of Broadcom PM Domains
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+
+#
+# Qualcomm PM Domains
+#
+CONFIG_QCOM_CPR=y
+CONFIG_QCOM_RPMHPD=y
+CONFIG_QCOM_RPMPD=y
+# end of Qualcomm PM Domains
+# end of PM Domains
+
 CONFIG_PM_DEVFREQ=y
 
 #
@@ -6174,6 +6223,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2309 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
@@ -6188,6 +6238,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 CONFIG_MAX9611=m
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
+# CONFIG_MCP3564 is not set
 # CONFIG_MCP3911 is not set
 # CONFIG_NAU7802 is not set
 CONFIG_QCOM_VADC_COMMON=m
@@ -6560,6 +6611,7 @@ CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
 # Pressure sensors
 #
 # CONFIG_ABP060MG is not set
+# CONFIG_ROHM_BM1390 is not set
 # CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
@@ -6607,6 +6659,7 @@ CONFIG_MPL3115=m
 #
 # CONFIG_AD2S90 is not set
 # CONFIG_AD2S1200 is not set
+# CONFIG_AD2S1210 is not set
 # end of Resolver to digital converters
 
 #
@@ -6835,6 +6888,7 @@ CONFIG_INTERCONNECT_QCOM_RPMH=y
 # CONFIG_INTERCONNECT_QCOM_SDM845 is not set
 # CONFIG_INTERCONNECT_QCOM_SDX55 is not set
 # CONFIG_INTERCONNECT_QCOM_SDX65 is not set
+# CONFIG_INTERCONNECT_QCOM_SDX75 is not set
 # CONFIG_INTERCONNECT_QCOM_SM6350 is not set
 # CONFIG_INTERCONNECT_QCOM_SM8150 is not set
 CONFIG_INTERCONNECT_QCOM_SM8250=y
@@ -6875,7 +6929,6 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_OCFS2_FS is not set
 CONFIG_BTRFS_FS=y
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
-# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_ASSERT is not set
@@ -6891,6 +6944,7 @@ CONFIG_F2FS_FS_POSIX_ACL=y
 # CONFIG_F2FS_FS_COMPRESSION is not set
 CONFIG_F2FS_IOSTAT=y
 # CONFIG_F2FS_UNFAIR_RWSEM is not set
+# CONFIG_BCACHEFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
@@ -7057,7 +7111,7 @@ CONFIG_RPCSEC_GSS_KRB5=y
 # CONFIG_AFS_FS is not set
 # CONFIG_9P_FS is not set
 CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
@@ -7106,7 +7160,7 @@ CONFIG_NLS_ISO8859_1=y
 # CONFIG_NLS_MAC_INUIT is not set
 # CONFIG_NLS_MAC_ROMANIAN is not set
 # CONFIG_NLS_MAC_TURKISH is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS_UTF8=y
 # CONFIG_DLM is not set
 # CONFIG_UNICODE is not set
 CONFIG_IO_WQ=y
@@ -7260,7 +7314,7 @@ CONFIG_CRYPTO_CBC=m
 # CONFIG_CRYPTO_CFB is not set
 CONFIG_CRYPTO_CTR=m
 # CONFIG_CRYPTO_CTS is not set
-CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_HCTR2 is not set
 # CONFIG_CRYPTO_KEYWRAP is not set
 # CONFIG_CRYPTO_LRW is not set
@@ -7337,7 +7391,9 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_JITTERENTROPY_TESTINTERFACE is not set
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64
+CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32
+CONFIG_CRYPTO_JITTERENTROPY_OSR=1
 CONFIG_CRYPTO_KDF800108_CTR=y
 # end of Random number generation
 
@@ -7399,7 +7455,7 @@ CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
 # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set
 # CONFIG_CRYPTO_DEV_QCE is not set
-CONFIG_CRYPTO_DEV_QCOM_RNG=y
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_CCREE=m
@@ -7508,7 +7564,6 @@ CONFIG_ZSTD_DECOMPRESS=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
-CONFIG_XZ_DEC_IA64=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_XZ_DEC_SPARC=y
@@ -7587,10 +7642,12 @@ CONFIG_SG_POOL=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_STACKDEPOT=y
 CONFIG_SBITMAP=y
+# CONFIG_LWQ_TEST is not set
 # end of Library routines
 
 CONFIG_GENERIC_IOREMAP=y
 CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_FIRMWARE_TABLE=y
 
 #
 # Kernel hacking
@@ -7770,8 +7827,6 @@ CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_MAPLE_TREE is not set
 # end of Debug kernel data structures
 
-# CONFIG_DEBUG_CREDENTIALS is not set
-
 #
 # RCU Debugging
 #
@@ -7897,6 +7952,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_MEMCAT_P is not set
 # CONFIG_TEST_MEMINIT is not set
 # CONFIG_TEST_FREE_PAGES is not set
+# CONFIG_TEST_OBJPOOL is not set
 CONFIG_ARCH_USE_MEMTEST=y
 CONFIG_MEMTEST=y
 # end of Kernel Testing and Coverage

device/testing/linux-xiaomi-kenzo/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname=linux-xiaomi-kenzo
 pkgver=3.10.105
-pkgrel=3
+pkgrel=4
 pkgdesc="Xiaomi Redmi Note 3 kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -30,6 +30,7 @@ source="
 	01_fix_gcc6_errors.patch
 	02_fix_msm_dba.patch
 	gcc10-extern_YYLOC_global_declaration.patch
+	linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 
@@ -53,8 +54,11 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="c2d57468544d9b96e7f55d8358419fecdbbb75ae02e08fb3e008a882750855966d989a79e058888bcdd5542f322fd26ac217cd73c316768183b496f108089b43  linux-xiaomi-kenzo-92430f1a110b9b49e69fb1d3bde81c0f048d0282.tar.gz
+sha512sums="
+c2d57468544d9b96e7f55d8358419fecdbbb75ae02e08fb3e008a882750855966d989a79e058888bcdd5542f322fd26ac217cd73c316768183b496f108089b43  linux-xiaomi-kenzo-92430f1a110b9b49e69fb1d3bde81c0f048d0282.tar.gz
 412fd5ab87a01b5a525f4bb31c6541c27c95ed81dbc889a49d15a75493b43114b77db265ce8bede25e094fe0e7deb551edb741b99255441a0e5278f2f608b7de  config-xiaomi-kenzo.aarch64
 972e98523d6ef06342e69a09e979bdd86904cf7f9a843b519b37791e531b680182564a2ab537c94629c3589f4e775b2c39de04c64e210a0f8b6f10745c3596f1  01_fix_gcc6_errors.patch
 7e765cb696fa8c3dfbc305b05cbf1fad85fb9572613d5391e945341dae5974a745f4906c795dc841e5562b19ab77d5257f9741e514af2c2573aa4bb8b262ce51  02_fix_msm_dba.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+75545ccd0082a119b9ad95fcef3523c939a5c946f8f3a5c3dde15cee1502f6c1011050a0ad5359426f018bb7ceea1c97a28c7665941bc89f365c8d11065ce0f6  linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch
+"

device/testing/linux-xiaomi-kenzo/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.7to4.5-ARM64-remove-Sun-Solaris-style-flag-on-section.patch

device/testing/oem-amd/00-amdgpu-firmware.files

@@ -0,0 +1 @@
+/lib/firmware/amdgpu

device/testing/oem-amd/00-oem-amd.modules

@@ -0,0 +1 @@
+amdgpu

device/testing/oem-amd/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=oem-amd
 pkgdesc="AMD device support"
-pkgver=1
+pkgver=1.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -15,9 +15,17 @@ subpackages="
 	$pkgname-libva
 	$pkgname-vulkan
 	"
+source="
+	00-amdgpu-firmware.files
+	00-oem-amd.modules
+"
 
 package() {
 	mkdir -p "$pkgdir"
+	install -Dm644 00-oem-amd.modules \
+		-t "$pkgdir"/usr/share/mkinitfs/modules
+	install -Dm644 00-amdgpu-firmware.files \
+		-t "$pkgdir"/usr/share/mkinitfs/files
 }
 
 libva() {
@@ -35,3 +43,7 @@ vulkan() {
 
 	mkdir "$subpkgdir"
 }
+sha512sums="
+38c53d91a60d0402d4cc5428d65e1e8c26360c481c70b34593b1812c87241c32e91904a3bd31fbfe507f7fdb8b50c909eaad8c4c3a37ca962760567329f7f6ee  00-amdgpu-firmware.files
+f56b5293f88727bb4fcceb2a347527402dd0938e96403461b1e2a6821cc00a4e680f58770addd7ba1ded20a187f91ccfd6270bc8bd28c6eae75cc075952361ca  00-oem-amd.modules
+"

main/postmarketos-ui-mate/10_onboard.gschema.override

@@ -10,5 +10,8 @@ show-tooltips=false
 enabled=true
 keyboard-device-detection-enabled=true
 
+[org.onboard.keyboard]
+show-click-buttons=true
+
 [org.onboard.window]
 docking-enabled=true

main/postmarketos-ui-mate/APKBUILD

@@ -1,8 +1,8 @@
 # Reference: https://postmarketos.org/uipkg
 # Maintainer: Jakko <jahau@rocketmail.com>
 pkgname=postmarketos-ui-mate
-pkgver=6
-pkgrel=3
+pkgver=7
+pkgrel=0
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
@@ -42,35 +42,29 @@ source="
 	10_mate-terminal_colors.gschema.override
 	10_onboard.gschema.override
 	61-lightdm-autologin.conf
+	gtk.css
 	onboard-autostart.desktop
 	unclutter-xfixes.desktop
 	"
 options="!check"
 
 package() {
-	install -Dm644 "$srcdir"/000-system-background.gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/000-system-background.gschema.override
+	install -Dm644 -t "$pkgdir"/usr/share/glib-2.0/schemas \
+		"$srcdir"/000-system-background.gschema.override \
+		"$srcdir"/001-screensaver.gschema.override \
+		"$srcdir"/10_caja_single-click.gschema.override \
+		"$srcdir"/10_mate-terminal_colors.gschema.override \
+		"$srcdir"/10_onboard.gschema.override
 
-	install -Dm644 "$srcdir"/001-screensaver.gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/001-screensaver.gschema.override
-
-	install -Dm644 "$srcdir"/10_caja_single-click.gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/10_caja_single-click.gschema.override
-
-	install -Dm644 "$srcdir"/10_mate-terminal_colors.gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/10_mate-terminal_colors.gschema.override
-
-	install -Dm644 "$srcdir"/10_onboard.gschema.override \
-		"$pkgdir"/usr/share/glib-2.0/schemas/10_onboard.gschema.override
+	install -Dm644 -t "$pkgdir"/etc/skel/.config/autostart \
+		"$srcdir"/onboard-autostart.desktop \
+		"$srcdir"/unclutter-xfixes.desktop
 
 	install -Dm644 "$srcdir"/61-lightdm-autologin.conf \
 		"$pkgdir"/usr/share/lightdm/lightdm.conf.d/61-autologin.conf
 
-	install -Dm644 "$srcdir"/onboard-autostart.desktop \
-		"$pkgdir"/etc/skel/.config/autostart/onboard-autostart.desktop
-
-	install -Dm644 "$srcdir"/unclutter-xfixes.desktop \
-		"$pkgdir"/etc/skel/.config/autostart/unclutter-xfixes.desktop
+	install -Dm644 "$srcdir"/gtk.css \
+		"$pkgdir"/etc/skel/.config/gtk-3.0/gtk.css
 }
 
 sha512sums="
@@ -78,8 +72,9 @@ b4eded3d1aba2086d53507d434da6f2d5aae24fa49c7a8619abb1d81f87898d7a6d813be777a285c
 fe6a37a1e22fbf29a8b6de3b3e137bc19becd6d80d391ad1a0c7908cb996dd9982c88ef55b84fd258a81263e37d47df5a81566ce7c337886ae4c0d7a83d640aa  001-screensaver.gschema.override
 c69d44f1c69e3880ba822a4b98bc59f4049f7b8e228bec31076b9d3fa510e8e205ecf7e3e4b7b00fb28b39a447a55126aaede7e5e5741350aff2a37172b77659  10_caja_single-click.gschema.override
 edef87a2b88a09d023dd51e8b32e2fc1cc9f5bec4a00b88b4f2adfb844ae2dc72747ef8891fc8a08652ae563fb1b914fba214c28a93e77de76b489a5fb50a96c  10_mate-terminal_colors.gschema.override
-ffcc518ff58d37de302bd101e57bf983800e45899645d476045d0a74096704333a0b513f45e6a5485fdbd80ac1caebce14a760cab6fcc6d5dde0d766ade8b58b  10_onboard.gschema.override
+114d77e6e7c11fc87244fc7c179244274c8f8711f111fcb1b9774ef6b226bd2bea01f85395da130f53670a870cfe571babd7f1c233ba85e1ef5a056ab65bd0b7  10_onboard.gschema.override
 225c4d1bccad4bdacad34958322015147077158b395b8db095b7afd47e18638044780b381124c3b82bf639af66ea565e1763c54ab9599ec13177c289e0d2a000  61-lightdm-autologin.conf
+4532cf5c4cb687947c922d75cc942f26d4a695762a6b90cf53fddab84f2185799b7ee04c95b5e2263655e68a9a111967d92062ef5eb99b4122068c8585cf43a1  gtk.css
 d598b806bf749e0fedfdaeb51aa035b3877fedf4adc123ce2e50aef20f3cc6727b520a379aa26e88f9a2fe0f1fb96c4682895bb49c6a9cf4b5a5fd963ea93747  onboard-autostart.desktop
 b626c8b27d9418df15124d6e97f5174c173863536e9c3eebfb11473d764c81e1db40cf4b7cdabe44b67a0e295d920c7a849a3e2e40dd86402de8200242c7b05a  unclutter-xfixes.desktop
 "

main/postmarketos-ui-mate/gtk.css

@@ -0,0 +1,4 @@
+tooltip {
+    opacity: 0;
+    font-size: 0;
+}