.ci/testcases/test_deviceinfo.py

@@ -36,7 +36,7 @@ def test_deviceinfo():
     # Iterate over all devices
     last_exception = None
     count = 0
-    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"$")
+    pattern = re.compile("^deviceinfo_[a-zA-Z0-9_]*=\".*\"(\\s*# .*)?$")
 
     for folder in pkgrepo_iglob("device/*/device-*"):
         device = folder.name.split("-", 1)[1]
@@ -63,8 +63,8 @@ def test_deviceinfo():
                 # Check line against regex (can't use multiple lines etc.)
                 if not pattern.match(line) or line.endswith("\\\""):
                     raise RuntimeError("Line looks invalid, maybe missing"
-                                       " quotes/multi-line string/comment next"
-                                       f" to line instead of above? {line}")
+                                       " quotes/multi-line string/malformed"
+                                       f" inline comment? {line}")
 
             # Successful deviceinfo parsing / obsolete options
             info = pmb.parse.deviceinfo(device)

device/testing/device-qcom-msm8953/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -17,6 +17,7 @@ depends="
 	mkbootimg
 	msm-firmware-loader
 	postmarketos-base
+	qbootctl
 	soc-qcom-msm8953
 	soc-qcom-msm8953-modem
 "

device/testing/linux-next/APKBUILD

@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig
 
 pkgname=linux-next
-pkgver=6.12_git20241120
+pkgver=6.12_git20241122
 pkgrel=3
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
 }
 
 sha512sums="
-5dcb17f883ce08849ad5e72a9810ecdd192143e3b3a6772c61ef83d6d5ac92f1bb9cedff2f2f6a92027becba6b8ef6ac4eb67ec5b2d9963ba9c5f84b73b0ddb1  linux-next-next-20241120.tar.gz
+8fe2352dab4bb61f9612c1055f654f0c40581ce08e0dba69633080aeea3bea7727aa5f837d4b6cb4b6e238b6a4c2d1587abaa111fabe4171a198a034d71a2e3e  linux-next-next-20241122.tar.gz
 8de0a3791ea671528a9fc753071683dfea68ea4f4c22060fc0ca8a4b1b3d76eaa2a3fd40bb013173f0e55da15dde91cf285902779beb35781b6c90f39244ce11  devices.config
 a30df186f06519e2f519bfe622bbd46caec6c2473a1fd3df370320a661d53882b49cfb2b3be7edd92fabdb4a8e6e3419194e8d43cca3cf4ab1615275dab4fee4  pmos.config
 "

device/testing/linux-postmarketos-qcom-msm8994/0002-arm64-dts-qcom-msm8992-lg-h815.patch

-diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
-index 39889d5f8..019d7a157 100644
---- a/arch/arm64/boot/dts/qcom/Makefile
-+++ b/arch/arm64/boot/dts/qcom/Makefile
-@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= msm8956-sony-xperia-loire-kugo.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8956-sony-xperia-loire-suzu.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-lg-bullhead-rev-10.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-lg-bullhead-rev-101.dtb
-+dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-lg-h815.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-msft-lumia-octagon-talkman.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8992-xiaomi-libra.dtb
- dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-huawei-angler-rev-101.dtb
-diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts b/arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts
-new file mode 100644
-index 000000000..6767e9be1
---- /dev/null
-+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts
-@@ -0,0 +1,386 @@
-+// SPDX-License-Identifier: GPL-2.0-only
-+
-+/dts-v1/;
-+
-+#include "msm8992.dtsi"
-+#include "pm8994.dtsi"
-+#include "pmi8994.dtsi"
-+
-+/delete-node/ &cont_splash_mem;
-+
-+/* disabled downstream */
-+/delete-node/ &dfps_data_mem;
-+
-+/ {
-+	model = "LG G4 (H815)";
-+	compatible = "lg,h815", "qcom,msm8992";
-+	chassis-type = "handset";
-+
-+	/* required for bootloader to select correct board */
-+	qcom,msm-id = <251 0 252 0>;
-+	qcom,pmic-id = <0x10009 0x1000a 0x00 0x00>;
-+	qcom,board-id = <0xb64 0>;
-+
-+	/* psci is broken */
-+	/delete-node/ psci;
-+
-+	chosen {};
-+
-+	gpio-hall-sensor {
-+		compatible = "gpio-keys";
-+
-+		pinctrl-0 = <&hall_sensor_default>;
-+		pinctrl-names = "default";
-+
-+		event-hall-sensor {
-+			gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
-+			label = "hall effect sensor";
-+			linux,input-type = <EV_SW>;
-+			linux,code = <SW_LID>;
-+			linux,can-disable;
-+			wakeup-source;
-+		};
-+	};
-+
-+	gpio-keys {
-+		compatible = "gpio-keys";
-+		autorepeat;
-+
-+		key-vol-up {
-+			label = "volume up";
-+			gpios = <&pm8994_gpios 3 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_VOLUMEUP>;
-+			wakeup-source;
-+			debounce-interval = <15>;
-+		};
-+	};
-+
-+	reserved-memory {
-+		#address-cells = <2>;
-+		#size-cells = <2>;
-+		ranges;
-+
-+		ramoops@ff00000 {
-+			compatible = "ramoops";
-+			reg = <0x0 0xff00000 0x0 0x100000>;
-+			console-size = <0x20000>;
-+			pmsg-size = <0x20000>;
-+			record-size = <0x10000>;
-+			ecc-size = <0x10>;
-+		};
-+
-+		cont_splash_mem: fb@3400000 {
-+			compatible = "framebuffer";
-+			reg = <0 0x3400000 0 0xc00000>;
-+			no-map;
-+		};
-+
-+		crash_fb_mem: crash_fb@4000000 {
-+			reg = <0 0x4000000 0 0xc00000>;
-+			no-map;
-+		};
-+	};
-+};
-+
-+&pm8994_spmi_regulators {
-+	vdd_s8-supply = <&vph_pwr>;
-+	vdd_s11-supply = <&vph_pwr>;
-+
-+	pm8994_s8: s8 {
-+		regulator-min-microvolt = <700000>;
-+		regulator-max-microvolt = <1180000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+
-+	pm8994_s11: s11 {
-+		regulator-min-microvolt = <700000>;
-+		regulator-max-microvolt = <1225000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+};
-+
-+&rpm_requests {
-+	pmi8994_regulators: pmi8994-regulators {
-+		compatible = "qcom,rpm-pmi8994-regulators";
-+
-+		vdd_s1-supply = <&vph_pwr>;
-+		vdd_bst_byp-supply = <&vph_pwr>;
-+
-+		pmi8994_s1: s1 {
-+			regulator-min-microvolt = <1025000>;
-+			regulator-max-microvolt = <1025000>;
-+		};
-+
-+		/* S2 & S3 - VDD_GFX */
-+
-+		pmi8994_bby: boost-bypass {
-+			regulator-min-microvolt = <3150000>;
-+			regulator-max-microvolt = <3600000>;
-+		};
-+	};
-+
-+	pm8994_regulators: pm8994-regulators {
-+		compatible = "qcom,rpm-pm8994-regulators";
-+
-+		vdd_s3-supply = <&vph_pwr>;
-+		vdd_s4-supply = <&vph_pwr>;
-+		vdd_s5-supply = <&vph_pwr>;
-+		vdd_s7-supply = <&vph_pwr>;
-+		vdd_l1-supply = <&pmi8994_s1>;
-+		vdd_l2_26_28-supply = <&pm8994_s3>;
-+		vdd_l3_11-supply = <&pm8994_s3>;
-+		vdd_l4_27_31-supply = <&pm8994_s3>;
-+		vdd_l5_7-supply = <&pm8994_s5>;
-+		vdd_l6_12_32-supply = <&pm8994_s5>;
-+		vdd_l8_16_30-supply = <&vph_pwr>;
-+		vdd_l9_10_18_22-supply = <&pmi8994_bby>;
-+		vdd_l13_19_23_24-supply = <&pmi8994_bby>;
-+		vdd_l14_15-supply = <&pm8994_s5>;
-+		vdd_l17_29-supply = <&pmi8994_bby>;
-+		vdd_l20_21-supply = <&pmi8994_bby>;
-+		vdd_l25-supply = <&pm8994_s5>;
-+		vdd_lvs1_2 = <&pm8994_s4>;
-+
-+		pm8994_s3: s3 {
-+			regulator-min-microvolt = <1300000>;
-+			regulator-max-microvolt = <1300000>;
-+		};
-+
-+		/* sdhc1 vqmmc and bcm */
-+		pm8994_s4: s4 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+			regulator-system-load = <325000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		pm8994_s5: s5 {
-+			regulator-min-microvolt = <2150000>;
-+			regulator-max-microvolt = <2150000>;
-+		};
-+
-+		pm8994_s7: s7 {
-+			regulator-min-microvolt = <1000000>;
-+			regulator-max-microvolt = <1000000>;
-+		};
-+
-+		pm8994_l1: l1 {
-+			regulator-min-microvolt = <1000000>;
-+			regulator-max-microvolt = <1000000>;
-+		};
-+
-+		pm8994_l2: l2 {
-+			regulator-min-microvolt = <1250000>;
-+			regulator-max-microvolt = <1250000>;
-+			regulator-system-load = <10000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* camera */
-+		pm8994_l3: l3 {
-+			regulator-min-microvolt = <1050000>;
-+			regulator-max-microvolt = <1050000>;
-+		};
-+
-+		pm8994_l4: l4 {
-+			regulator-min-microvolt = <1225000>;
-+			regulator-max-microvolt = <1225000>;
-+		};
-+
-+		/* L5 is inaccessible from RPM */
-+
-+		pm8994_l6: l6 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		/* L7 is inaccessible from RPM */
-+
-+		pm8994_l8: l8 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		pm8994_l9: l9 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		/* touch  */
-+		pm8994_l10: l10 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		pm8994_l11: l11 {
-+			regulator-min-microvolt = <1200000>;
-+			regulator-max-microvolt = <1200000>;
-+		};
-+
-+		pm8994_l12: l12 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+			regulator-system-load = <10000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* sdhc2 vqmmc */
-+		pm8994_l13: l13 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <2950000>;
-+			regulator-system-load = <22000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* camera */
-+		pm8994_l14: l14 {
-+			regulator-min-microvolt = <1200000>;
-+			regulator-max-microvolt = <1200000>;
-+			regulator-system-load = <10000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		pm8994_l15: l15 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		pm8994_l16: l16 {
-+			regulator-min-microvolt = <2700000>;
-+			regulator-max-microvolt = <2700000>;
-+		};
-+
-+		/* camera */
-+		pm8994_l17: l17 {
-+			regulator-min-microvolt = <2800000>;
-+			regulator-max-microvolt = <2800000>;
-+		};
-+
-+		pm8994_l18: l18 {
-+			regulator-min-microvolt = <2850000>;
-+			regulator-max-microvolt = <2850000>;
-+		};
-+
-+		/* LCD */
-+		pm8994_l19: l19 {
-+			regulator-min-microvolt = <3000000>;
-+			regulator-max-microvolt = <3000000>;
-+		};
-+
-+		/* sdhc1 vmmc */
-+		pm8994_l20: l20 {
-+			regulator-min-microvolt = <2950000>;
-+			regulator-max-microvolt = <2950000>;
-+			regulator-system-load = <570000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* sdhc2 vmmc */
-+		pm8994_l21: l21 {
-+			regulator-min-microvolt = <2950000>;
-+			regulator-max-microvolt = <2950000>;
-+			regulator-system-load = <800000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* touch */
-+		pm8994_l22: l22 {
-+			regulator-min-microvolt = <3000000>;
-+			regulator-max-microvolt = <3000000>;
-+		};
-+
-+		/* camera */
-+		pm8994_l23: l23 {
-+			regulator-min-microvolt = <2800000>;
-+			regulator-max-microvolt = <2800000>;
-+		};
-+
-+		pm8994_l24: l24 {
-+			regulator-min-microvolt = <3075000>;
-+			regulator-max-microvolt = <3150000>;
-+		};
-+
-+		/* IRRC */
-+		pm8994_l25: l25 {
-+			regulator-min-microvolt = <1000000>;
-+			regulator-max-microvolt = <1000000>;
-+		};
-+
-+		pm8994_l26: l26 {
-+			regulator-min-microvolt = <987500>;
-+			regulator-max-microvolt = <987500>;
-+		};
-+
-+		/* hdmi */
-+		pm8994_l27: l27 {
-+			regulator-min-microvolt = <1000000>;
-+			regulator-max-microvolt = <1000000>;
-+		};
-+
-+		pm8994_l28: l28 {
-+			regulator-min-microvolt = <1000000>;
-+			regulator-max-microvolt = <1000000>;
-+			regulator-system-load = <10000>;
-+			regulator-allow-set-load;
-+		};
-+
-+		/* camera */
-+		pm8994_l29: l29 {
-+			regulator-min-microvolt = <2800000>;
-+			regulator-max-microvolt = <2800000>;
-+		};
-+
-+		/* camera */
-+		pm8994_l30: l30 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		pm8994_l31: l31 {
-+			regulator-min-microvolt = <1262500>;
-+			regulator-max-microvolt = <1262500>;
-+		};
-+
-+		pm8994_l32: l32 {
-+			regulator-min-microvolt = <1800000>;
-+			regulator-max-microvolt = <1800000>;
-+		};
-+
-+		pm8994_lvs1: lvs1 {};
-+
-+		pm8994_lvs2: lvs2 {};
-+	};
-+};
-+
-+&pm8994_pon {
-+	resin {
-+		status = "okay";
-+		linux,code = <KEY_VOLUMEDOWN>;
-+	};
-+};
-+
-+&tlmm {
-+	hall_sensor_default: hall-sensor-default-state {
-+		pins = "gpio75";
-+		function = "gpio";
-+		drive-strength = <2>;
-+		bias-pull-up;
-+	};
-+};
-+
-+&sdhc1 {
-+	status = "okay";
-+	mmc-hs400-1_8v;
-+	vmmc-supply = <&pm8994_l20>;
-+	vqmmc-supply = <&pm8994_s4>;
-+	non-removable;
-+};
-+
-+&sdhc2 {
-+	status = "okay";
-+	vmmc-supply = <&pm8994_l21>;
-+	vqmmc-supply = <&pm8994_l13>;
-+	cd-gpios = <&pm8994_gpios 8 GPIO_ACTIVE_LOW>;
-+};

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

@@ -3,7 +3,7 @@
 
 _flavor="postmarketos-qcom-msm8994"
 pkgname=linux-$_flavor
-pkgver=6.8
+pkgver=6.12
 pkgrel=1
 pkgdesc="Mainline kernel for Qualcomm MSM8994/MSM8992 devices"
 arch="aarch64"
@@ -21,6 +21,7 @@ makedepends="
 	flex
 	openssl-dev
 	perl
+	python3
 	postmarketos-installkernel
 "
 
@@ -29,7 +30,6 @@ source="
 	https://git.kernel.org/torvalds/t/linux-$_tag.tar.gz
 	config-$_flavor.$arch
 	0001-arm64-dts-qcom-msm8994-huawei-angler-Add-regulators.patch
-	0002-arm64-dts-qcom-msm8992-lg-h815.patch
 "
 builddir="$srcdir/linux-${_tag#v}"
 
@@ -59,8 +59,7 @@ package() {
 }
 
 sha512sums="
-17991b3e0cd69e910416e8b11ba48919a4ee179bf1bb8a66516897218f1bafb297754777ebee77e75f6f844a6ec79a748b10371e33ae5374a4f4accab6c6b8f7  linux-6.8.tar.gz
-9f923f4dc4cf33a45208c65873d5d02f01f58a90a949155eb8d186cfe940a3f50823ddc2c590986ce5933a85fa51091cce78305ad58900a9e0fd0473bc71a5c0  config-postmarketos-qcom-msm8994.aarch64
+0623859aecdfd45e6f8a5c6742bf7153ee864d5c66c9a233837b121355e84c7a17c1e02718d220d21557ad3173af6e2fdbfef676efec1ce96807d4b298105b74  linux-6.12.tar.gz
+5b5634c001d114619d29cebe43b062ebe6e0e002ca02e8da03a436ee989c4930f5c2cc0f6901c506d333caffb38a19b66f5d3a2984140662b268289ccfea1d89  config-postmarketos-qcom-msm8994.aarch64
 4dc3de184eac5cfb593a308278e3a5ab27f5e94b5dec8b288c053070f788fdb8d8fad8628b5a996701eacc11b1015999b99f8d279b207e214dd0e63f97cfb4d6  0001-arm64-dts-qcom-msm8994-huawei-angler-Add-regulators.patch
-1293b1db2fa485f1e5fd11b6e44d71e42a3c6a2fc46b49498fc12c261729055c94edb0b081a8d0495658ba04353ac70c32377e5228c4ed2c1e43de321c628f78  0002-arm64-dts-qcom-msm8992-lg-h815.patch
 "

main/postmarketos-initramfs/00-default.modules

@@ -17,8 +17,10 @@ nls_cp437
 nls_iso8859_1
 nls_utf8
 uinput
-usb_f_rndis
+usb_f_acm
 usb_f_ncm
+usb_f_mass_storage
+usb_f_rndis
 usb-storage
 vfat
 xts

main/postmarketos-initramfs/APKBUILD

 # Maintainer: Caleb Connolly <caleb@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
-pkgver=3.4.3
+pkgver=3.4.4
 pkgrel=0
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
@@ -101,7 +101,7 @@ package() {
 }
 
 sha512sums="
-20bc7a21f4f59548b8179c5cb1fc2b3db64eb355988bce992db3bc4075d65b4135ff9dd7d754215d0402978811494449cce476a26cda6bb2f0f8b53ae8e36bd7  00-default.modules
+911ff425021fb59061cae182ddab3c6fd6e93fb126e2e45ccdb74f73b3d65b0f454f86a533364dc7cdc94f79538aec53a168f2d83c38218dc82a19cb0bf9b244  00-default.modules
 9c0e8f6f61d5da191e03a1aa9d5d0ceb5baf1eae6dbb9bfb0af59817783525119ac8394b135f303f7b6434a3eab0b49185fb90379e06823db847a4999c75ce33  00-initramfs-base.dirs
 c0233d22858a5901db64e1d2fe1f6d39a2e2cfd1b94a10932483f55fed9461e9b8aa2d73b154b9d99a7a8b49ee02abfbddfe917ce0c6d7576601ba2668589c01  00-initramfs-base.files
 d0f35562365756d93066ce45924d17fb347b54095179c3262daa2f073e12743505cd5d9372ad30485915ca754d95a8edba9a74314e7949e0b3cf6978a87d03a5  00-initramfs-extra-base.files