.ci/lib/check_changed_aports_versions.py

@@ -16,8 +16,7 @@ import pmb.parse
 import pmb.parse.version
 import pmb.helpers.logging
 
-
-def get_package_version(args, package, revision, check=True):
+def get_package_contents(args, package, revision, check=True):
     # Redirect stderr to /dev/null, so git doesn't complain about files not
     # existing in upstream branch for new packages
     stderr = None
@@ -40,6 +39,11 @@ def get_package_version(args, package, revision, check=True):
             handle.write(apkbuild_content)
         parsed = pmb.parse.apkbuild(tempdir + "/APKBUILD", False, False)
 
+    return parsed
+
+
+def get_package_version(args, package, revision, check=True):
+    parsed = get_package_contents(args, package, revision, check)
     return parsed["pkgver"] + "-r" + parsed["pkgrel"]
 
 
@@ -112,6 +116,40 @@ def check_versions(args, packages):
                 print(f"- {package}: {head} (HEAD) (new package)")
             continue
 
+        # Check pkgver follows expected format for device packages
+        pkgver = head.rpartition('-r')[0]
+        if package.startswith('device-') and not pkgver.isdigit():
+            print(f" - {package}: invalid pkgver \"{pkgver}\""
+                  "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+            error = True
+
+        # Additional checks for device packages
+        if package.startswith('device-'):
+            head_parsed = get_package_contents(args, package, "HEAD", False)
+            upstream_parsed = get_package_contents(args, package, commit, False)
+
+            # checksums did not change
+            if head_parsed["sha512sums"] == upstream_parsed["sha512sums"]:
+                # Check that pkgver did not change
+                if head_parsed["pkgver"] != upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should not change when package source checksums did not change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # We do not check for a bumped pkgrel, because not everything
+                # needs it, e.g: pmb_recommends
+            # checksums changed
+            else:
+                # Check that pkgrel was reset to 0
+                if head_parsed["pkgrel"] != "0":
+                    print(f" - {package}: pkgrel should be 0 when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+                # Check that pkgver was changed
+                if head_parsed["pkgver"] == upstream_parsed["pkgver"]:
+                    print(f" - {package}: pkgver should change when package source checksums change."
+                          "See: https://wiki.postmarketos.org/wiki/Packaging#device_packages_and_other_packages_without_sources")
+                    error = True
+
         # Compare head and upstream versions
         result = pmb.parse.version.compare(head, upstream)
         if result != 1:

.ci/testcases/add_pmbootstrap_to_import_path/__init__.py

@@ -15,6 +15,13 @@ def path_pmbootstrap():
         code from there.
         returns: pmbootstrap installation folder
     """
+    
+    if path:= os.environ.get("PMBOOTSTRAP_PATH"):
+        if os.path.exists(path):
+            return path
+        else:
+            print("WARNING: PMBOOTSTRAP_PATH is invalid, trying to detect correct path...")
+
     # This variable is set by pmbootstrap 1.52 and later
     # If it's undefined, try to find 'pmbootstrap' in path
     bin = os.environ.get("PMBOOTSTRAP_CMD") or shutil.which("pmbootstrap")

device/main/device-pine64-pinephone/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Arnav Singh <me@arnavion.dev>
 # Co-Maintainer: Jan Jasper de Kroon <jajadekroon@gmail.com>
 pkgname=device-pine64-pinephone
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
@@ -29,7 +29,7 @@ depends="
 	eg25-manager
 	eg25-manager-openrc
 	iw
-	linux-postmarketos-allwinner>=6.8
+	linux-postmarketos-allwinner>=5.14
 	mesa-egl
 	postmarketos-base
 	u-boot-pinephone>=2021.01_git20201228-r2
@@ -270,9 +270,9 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5
 1f573b4a6686dac30b6e20507ec6590764a9e9e60c5373bda3838b1f25370b447a3220670710c43a64eb518a4aa54d4ab3beb942513ef269e596a73653c6528e  sun50i-a64-psci.dts
 3c5c7cb57dee019fbc53b40023097f39be08bbaabd111d9d0b71c2d6190280bcbc54a98506cce5640aa064747d6eeb63a9bc3defdddf41ddc16c123112ad35ee  uboot-script.cmd
 f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409  uboot-user.cmd
-e6eff26432814240ba1a5ba32426e4bb0156421c7fad34a978025cb5114523ce9447a4d7fc5a1d19941ef7ca5169927bbb976a39ba0771f76b55d0dd59af64d1  HiFi.conf
+f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd  HiFi.conf
 4b0c51ab169aebe8177c5c43eba41afa90370098a5a54e710d17e97ec1651869a20cb5d780a6132028c864916609e3b4f4a13158835310d0441bdb4915872372  PinePhone.conf
-1a2e84251e06720b75c56bcd45588a44161609ce5f1f7eef61d62c91c1d8d0741ac5d8cec7b4692e8de6c9435f276240ac7e558d777c9f61370632bae3454604  VoiceCall.conf
+e093f71c37370927468de35a987150a3db3e1cc1c76c144bf58918a09c688c3da84303b5533241e691a6aa0758589e2a6498b1097974117782e909f0bbc6bf71  VoiceCall.conf
 43f67e94491791685cdbb4874bb3034b1d297bdf3d23e7405c45ba8c58de72b4fb6a9943b79f46ef7b8f4dbc4d9db254ebec8eb3453d720a5a8fad277c6a9d88  ppkb.sh
 bb11151e246d16e071761ebb35ca7f8b8cedbad8366e9bac6aed30554a795877cc9dccbe69ecca4b19b6f72bd87e613705f3ae4f2f40d2f9c2d09cc179999d59  sway-pinephone-keyboard.conf
 a7b49a638f664f7682ce6b00eb4d1ae26a429e89354056de05fb49d25fc9555d7f80e6d8f4b0a250878a4e7823860fd156068ed6604ce6cf58badef45c545161  x11-pinephone-keyboard.conf

device/main/device-pine64-pinephone/ucm/HiFi.conf

@@ -137,6 +137,6 @@ SectionDevice."Headphones" {
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
-		JackControl "1c22e00.codec-jack Jack"
+		JackControl "Headphone Jack"
 	}
 }

device/main/device-pine64-pinephone/ucm/VoiceCall.conf

@@ -142,6 +142,6 @@ SectionDevice."Headphones" {
 		PlaybackChannels 2
 		PlaybackPriority 500
 		PlaybackPCM "hw:${CardId},0"
-		JackControl "1c22e00.codec-jack Jack"
+		JackControl "Headphone Jack"
 	}
 }

device/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch

-From 21791c33d282103db5b219d696ac9366d0b61017 Mon Sep 17 00:00:00 2001
+From faf5874c12ec57232e5389691d12db1a945629bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index b4b26a51e237..d83ff6eaf752 100644
+index 41ce680e5f8d..6740e6a97161 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -1,6 +1,8 @@
@@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.44.0
+2.31.1
 

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

-From b8eb420ae85c75a211f1970f6dcb7f732e19138d 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,7 +10,7 @@ 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 d83ff6eaf752..61a84673519a 100644
+index df6eaa6f60..15e3339c90 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.2.dtb
@@ -23,7 +23,7 @@ index d83ff6eaf752..61a84673519a 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.44.0
+2.43.0
 

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

-From 905753f51ef380bff83325f9e4df863ed18f640b 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 ohci1
+Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
 
-ohci1 is the low-speed variant of the usb port.
-Original patch by Icenowy Zheng.
+Fix the accelerometer (BMA223). ohci1 is the low-speed variant of the usb
+port. Original patch by Icenowy Zheng.
 
 Cherry picked from here, but this isn't the original patch either:
 https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030b3236
 ---
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 4 ++++
- 1 file changed, 4 insertions(+)
+ .../boot/dts/allwinner/sun50i-a64-pinetab.dts      | 14 +++++++++++++-
+ 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 37466d70bb25..29e527e499db 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
-@@ -311,6 +311,10 @@ &ohci0 {
+@@ -237,7 +237,15 @@ &i2c0_pins {
+ &i2c1 {
+ 	status = "okay";
+ 
+-	/* TODO: add Bochs BMA223 accelerometer here */
++	bma223@18 {
++		compatible = "bosch,bma223", "bosch,bma222e";
++		reg = <0x18>;
++		interrupt-parent = <&pio>;
++		interrupts = <7 5 IRQ_TYPE_LEVEL_HIGH>; /* PH5 */
++		mount-matrix = "0", "-1", "0",
++			       "-1", "0", "0",
++			       "0", "0", "-1";
++	};
+ };
+ 
+ &lradc {
+@@ -303,6 +311,10 @@ &ohci0 {
  	status = "okay";
  };
  
@@ -28,5 +45,5 @@ index 37466d70bb25..29e527e499db 100644
  	status = "okay";
  };
 -- 
-2.44.0
+2.43.0
 

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

+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
+
+---
+ .../arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 13 +++++++++++++
+ 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 26ca14a664..ffb36f69f5 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+@@ -514,6 +514,19 @@ &uart0 {
+ 	status = "okay";
+ };
+ 
++&uart1 {
++        pinctrl-names = "default";
++        pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
++        status = "okay";
++
++        bluetooth {
++                compatible = "realtek,rtl8723cs-bt";
++                reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
++                device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
++                host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
++        };
++};
++
+ &usb_otg {
+ 	dr_mode = "otg";
+ 	status = "okay";
+-- 
+2.43.0
+

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

-From 519162978ba8641c53c7d3ea5fa62f53ac3b6793 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
 
 ---
- arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 11 ++++++-----
+ 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 29e527e499db..230eedb39d50 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
-@@ -494,13 +494,13 @@ &sound {
+@@ -487,19 +487,20 @@ hdmi_out_con: endpoint {
+ 
+ &sound {
+ 	status = "okay";
++	simple-audio-card,name = "PineTab";
+ 	simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
+ 	simple-audio-card,widgets = "Microphone", "Internal Microphone Left",
+ 				    "Microphone", "Internal Microphone Right",
  				    "Headphone", "Headphone Jack",
  				    "Speaker", "Internal Speaker";
  	simple-audio-card,routing =
@@ -31,5 +38,5 @@ index 29e527e499db..230eedb39d50 100644
  			"ADCR", "Right ADC",
  			"Internal Microphone Left", "MBIAS",
 -- 
-2.44.0
+2.43.0
 

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

-From 510eef292daa3ec6ddd5c2ace74051261789fe93 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,7 +11,7 @@ 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 0530881d8401..144f1eca9f8d 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
 @@ -87,28 +87,6 @@ &reg_drivevbus {
@@ -55,7 +55,7 @@ index 0530881d8401..144f1eca9f8d 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 053e4add9973..78982fe051de 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
 @@ -101,29 +101,6 @@ &sgm3140 {
@@ -97,7 +97,7 @@ index 053e4add9973..78982fe051de 100644
 +	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 ec4927dfe9dc..57b651d695af 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
 @@ -93,29 +93,6 @@ &sgm3140 {
@@ -139,7 +139,7 @@ index ec4927dfe9dc..57b651d695af 100644
 +	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 70a2c4ffb839..862c45e8199b 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
 @@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
@@ -169,5 +169,5 @@ index 70a2c4ffb839..862c45e8199b 100644
  		regulator-max-microvolt = <3500000>;
  		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.44.0
+2.43.0
 

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

-From 78dfe5ffe430f911b46b78c5aa260910fd50a048 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 d493ee735c73..61a815c6aad9 100644
+index 9367a4572d..62cdd63859 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2300,6 +2300,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
+@@ -2213,6 +2213,30 @@ static const struct panel_desc hannstar_hsd101pww2 = {
  	.connector_type = DRM_MODE_CONNECTOR_LVDS,
  };
  
@@ -42,7 +42,7 @@ index d493ee735c73..61a815c6aad9 100644
  static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -4462,6 +4486,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 d493ee735c73..61a815c6aad9 100644
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
 -- 
-2.44.0
+2.43.0
 

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

-From 190989087e4a6a775b3cdab450301b7c9ef75f5c 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
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
  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 7c7fb94d2153..097614b95ff2 100644
+index 7c7fb94d21..097614b95f 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
 @@ -110,6 +110,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
@@ -23,7 +23,7 @@ index 7c7fb94d2153..097614b95ff2 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..4fcba20ffe48
+index 0000000000..4fcba20ffe
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun6i-a31s-goclever-gcta741l.dts
 @@ -0,0 +1,103 @@
@@ -131,5 +131,5 @@ index 000000000000..4fcba20ffe48
 +	status = "okay";
 +};
 -- 
-2.44.0
+2.43.0
 

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

-From 6d8af54e0b572979c4cfa9e28fe8a4e323216846 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 61a815c6aad9..c6da37c2baa8 100644
+index 62cdd63859..a11265c813 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -2220,6 +2220,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,
  };
  
@@ -42,7 +42,7 @@ index 61a815c6aad9..c6da37c2baa8 100644
  static const struct display_timing hannstar_hsd070pww1_timing = {
  	.pixelclock = { 64300000, 71100000, 82000000 },
  	.hactive = { 1280, 1280, 1280 },
-@@ -4474,6 +4498,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 61a815c6aad9..c6da37c2baa8 100644
  		.compatible = "hannstar,hsd070pww1",
  		.data = &hannstar_hsd070pww1,
 -- 
-2.44.0
+2.43.0
 

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

-From 607e3136666df284b89a060d6fdcacb6e61f8fbe 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
@@ -10,7 +10,7 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
  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 097614b95ff2..902b8f6752a0 100644
+index 097614b95f..902b8f6752 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
 @@ -36,6 +36,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
@@ -23,7 +23,7 @@ index 097614b95ff2..902b8f6752a0 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..5f17902410c1
+index 0000000000..5f17902410
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun4i-a10-lark-freeme-70-2s.dts
 @@ -0,0 +1,246 @@
@@ -274,5 +274,5 @@ index 000000000000..5f17902410c1
 +	status = "okay";
 +};
 -- 
-2.44.0
+2.43.0
 

device/main/linux-postmarketos-allwinner/0010-eMMC-workaround.patch → device/main/linux-postmarketos-allwinner/0011-sunxi-mmc-h6-fix.patch

-From ba65a79fd88287bd8acf9e96593b2045b47b0884 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,7 +9,7 @@ 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 e9370c736497..a4abd589e95d 100644
+index e9370c7364..a4abd589e9 100644
 --- a/drivers/mmc/host/sunxi-mmc.c
 +++ b/drivers/mmc/host/sunxi-mmc.c
 @@ -1436,15 +1436,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev)
@@ -34,5 +34,5 @@ index e9370c736497..a4abd589e95d 100644
  
  	ret = mmc_of_parse(mmc);
 -- 
-2.44.0
+2.43.0
 

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

-From d56368fa74d6df080b918b01515aef4f519f02fe 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,7 +10,7 @@ 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 218c26c59429..a424eded0016 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
 @@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
@@ -34,5 +34,5 @@ index 218c26c59429..a424eded0016 100644
  };
  
 -- 
-2.44.0
+2.43.0
 

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

+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
+ Modem"
+
+This reverts commit 62867934f6251349e1352a345f827ba8de514a36.
+---
+ drivers/usb/core/quirks.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index 7e42d7322e..15e9bd180a 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -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 },
+ 
+-	/* Quectel EG25G Modem */
+-	{ USB_DEVICE(0x2c7c, 0x0125), .driver_info = USB_QUIRK_RESET },
+-
+ 	{ }  /* terminating entry must be last */
+ };
+ 
+-- 
+2.43.0
+

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

+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
+
+This avoids the issue where the PPP modem does not reset correctly on resume,
+causing issues with incoming calls on suspend.
+
+Noted here: https://github.com/the-modem-distro/pinephone_modem_sdk/issues/97
+
+This is part of a larger patch:
+https://github.com/Quectel-Community/meta-quectel-community/commit/24adef2128f79b4d31490634438a917b3df462e2#diff-45dc5960ca2f1ef57139fe751587b3b043de9cca5864e2801210c00e75bd0780
+
+However the rest of the patch is not needed/already upstreamed.
+---
+ drivers/usb/serial/option.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 72390dbf07..71a2d6d61b 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -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/0012-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch → device/main/linux-postmarketos-allwinner/0015-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch

-From 991a3d5522ca1c623eba4c1a16351ecf1d7fba44 Mon Sep 17 00:00:00 2001
+From 8edf667c34a621274fc684b4f002b80937b5d4c8 Mon Sep 17 00:00:00 2001
 From: Denis Burkov <hitechshell@mail.ru>
 Date: Mon, 11 Mar 2024 18:23:39 +0500
 Subject: [PATCH] ARM: dts: allwinner: sun5i-a13-pocketbook-614-plus: Add
@@ -11,10 +11,10 @@ Subject: [PATCH] ARM: dts: allwinner: sun5i-a13-pocketbook-614-plus: Add
  create mode 100644 arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
 
 diff --git a/arch/arm/boot/dts/allwinner/Makefile b/arch/arm/boot/dts/allwinner/Makefile
-index 902b8f6752a0..f7eb88a5709b 100644
+index 7c7fb94d2..c9945b6df 100644
 --- a/arch/arm/boot/dts/allwinner/Makefile
 +++ b/arch/arm/boot/dts/allwinner/Makefile
-@@ -62,6 +62,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
+@@ -61,6 +61,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
  	sun5i-a13-olinuxino.dtb \
  	sun5i-a13-olinuxino-micro.dtb \
  	sun5i-a13-pocketbook-touch-lux-3.dtb \
@@ -22,7 +22,7 @@ index 902b8f6752a0..f7eb88a5709b 100644
  	sun5i-a13-q8-tablet.dtb \
  	sun5i-a13-utoo-p66.dtb \
  	sun5i-gr8-chip-pro.dtb \
-@@ -83,6 +84,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
+@@ -82,6 +83,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \
  	sun5i-a13-olinuxino.dtb \
  	sun5i-a13-olinuxino-micro.dtb \
  	sun5i-a13-pocketbook-touch-lux-3.dtb \
@@ -32,7 +32,7 @@ index 902b8f6752a0..f7eb88a5709b 100644
  	sun5i-gr8-chip-pro.dtb \
 diff --git a/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
 new file mode 100644
-index 000000000000..cad9ce5f2a6f
+index 000000000..cad9ce5f2
 --- /dev/null
 +++ b/arch/arm/boot/dts/allwinner/sun5i-a13-pocketbook-614-plus.dts
 @@ -0,0 +1,254 @@
@@ -291,5 +291,5 @@ index 000000000000..cad9ce5f2a6f
 +	status = "okay";
 +};
 -- 
-2.44.0
+2.43.0