device/testing/device-asus-grouper/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-asus-grouper
 pkgdesc="Google Nexus 7 2012 (grouper)"
 pkgver=2
-pkgrel=7
+pkgrel=8
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -35,5 +35,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="2b185066b549d8d3dbd931e9f28d3b064b0ed4b468a40d2f1c855c5cade8a145d34a6900a83ac3393cd8ddf6558b29589c9a721db6087ebe3851e8f4b24019a2  deviceinfo
+sha512sums="8df34852eb0d9e1a33dc14cfc8f6f37819b8e70ed9be4b21fb6b1a3d15b7eb28460f16022f316fc39a0d3624d0a7d357dd8635283c697a05f41ca43fac8d1965  deviceinfo
 6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini"

device/testing/device-asus-grouper/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="Google Nexus 7 2012 Wifi"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-grouper"
 deviceinfo_year="2012"
-deviceinfo_dtb="tegra30-asus-nexus7-grouper"
+deviceinfo_dtb="tegra30-asus-nexus7-grouper-E1565"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"

device/testing/device-asus-tilapia/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-asus-tilapia
 pkgdesc="Google Nexus 7 2012 (tilapia)"
 pkgver=0
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -35,5 +35,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="e206394aefe46550833f253b8075861b76149a99b1e96125105b94f7df37993f39202aaae038b1085e3ff136321bfde1913cc5f86650727497ae6f96daaa6ea9  deviceinfo
+sha512sums="762a6dbb2f3e6f87e46fbcf8e689a2e2b4dbbb63f52896a184800d77629acc5d461aefbe756d97f238e9b84351b2c0eb1676bed2a14fb765da5fc2b94ee392c5  deviceinfo
 6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini"

device/testing/device-asus-tilapia/deviceinfo

@@ -6,7 +6,7 @@ deviceinfo_name="Google Nexus 7 2012 GSM"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-tilapia"
 deviceinfo_year="2012"
-deviceinfo_dtb="tegra30-asus-nexus7-tilapia"
+deviceinfo_dtb="tegra30-asus-nexus7-tilapia-E1565"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"

device/testing/linux-asus-grouper/APKBUILD

 # Maintainer: David Heidelberg <david@ixit.cz>
 _flavor=asus-grouper
-_commit="fadacdcb9e5b60f6547c37f519d1851cb2f90edb"
+_commit="e87ec80ef138eefb741b4b01079eda9fcdc9c8cf"
 _config="config-$_flavor.armv7"
 
 pkgname=linux-asus-grouper
-pkgver=5.6.0_rc2
-pkgrel=1
+pkgver=5.9.0_rc2
+pkgrel=0
 arch="armv7"
 pkgdesc="Nexus 7 grouper/tilapia (2012) kernel fork, close to mainline"
 url="https://postmarketos.org"
@@ -23,6 +23,8 @@ _carch="arm"
 _ksrcdir="$srcdir/linux-$_commit"
 
 prepare() {
+	default_prepare
+
 	mkdir -p "$srcdir"/build
 	cp -v "$srcdir"/$_config "$srcdir"/build/.config
 	make -C "$_ksrcdir" O="$srcdir"/build ARCH="$_carch" \
@@ -56,5 +58,5 @@ package() {
 		INSTALL_MOD_PATH="$pkgdir" \
 		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
 }
-sha512sums="22cdafad7888f3267fbd92cdb46d67390c89c9e2b433faaef591ca576bc88b4f51157495948a049f1be6b98a6eacc71ed7253033e98bc708a35e3c62f4f4cf90  linux-asus-grouper-5.6.0_rc2-fadacdcb9e5b60f6547c37f519d1851cb2f90edb.tar.gz
-293290400eb1d30fd381006290ee891f1cb369ee2ad090ba6fc1e90005ecb6c555d763f1c600867a7832d414e8f7c51e195981fc9eba290f87fad9411b80799a  config-asus-grouper.armv7"
+sha512sums="fdbcd1396576b6949f75302828147a1416ab46e0686f3d66e53173b3e765387df3776ba7313f35268aef77495d22d5c41abd0e396e71316bb65de8f0f088515f  linux-asus-grouper-5.9.0_rc2-e87ec80ef138eefb741b4b01079eda9fcdc9c8cf.tar.gz
+1c51cef41f1665ab029dcac868b4a6233a413d76ff2d78af853d602b351ce15fef8d40aae7a2b10b74cc5006a5c6ddae41b547396416fdba4059173d71ba9712  config-asus-grouper.armv7"

main/linux-postmarketos-allwinner/APKBUILD

@@ -2,7 +2,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=5.7.0_git20200705
-pkgrel=1
+pkgrel=2
 arch="aarch64"
 pkgdesc="Kernel fork with Pine64 patches"
 url="https://gitlab.com/pine64-org/linux/"
@@ -14,6 +14,7 @@ source="$pkgname-$_commit.tar.gz::https://gitlab.com/pine64-org/linux/-/archive/
 	config-$_flavor.aarch64
 	disable-power-save.patch
 	touch-dts.patch
+	convergence.patch
 	"
 
 subpackages="$pkgname-dev"
@@ -67,4 +68,5 @@ dev() {
 sha512sums="3655b68deffcdd2384f900354695098d85a646ef55b581406d734ef27511f3cc6bd5084b5524955ca3536aed38375f07f0500d465faeb162cd13fd220281a494  linux-postmarketos-allwinner-c3e42484fd1be12ef573bc77f91626ccb7efd1ad.tar.gz
 3a77fb1493fa82760cecfb1a6c1496da03bec2b24feaef4f950f08e50b9fc0ef5b5f2c11b1bbef192fd0a1d7298e92032c1931ceb44e752eef33b0822514b04d  config-postmarketos-allwinner.aarch64
 3c0d9d282a36a5f6a442b434839d77851f9b20185725cb73aee88e6e209c68fd3d71df8e2a36ffcdb605c47f86df5dbcda5d00353c75c23303861936196924e0  disable-power-save.patch
-c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch"
+c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch
+ace7821ed3f31681aaf8cc983df155f98c01343d908cec1d32fcfd28999bbd9727ecca173a4b31026c966c6bf762f60549c3b09f7d7f8de74900271a7ad78d1a  convergence.patch"

main/linux-postmarketos-allwinner/convergence.patch

+Sloppy patch that makes the displayport alt-mode output signal work on
+the PinePhone convergence edition. Proper fix is in the 5.8 tree
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+index 1c555456be1e..2cd3b7bd4175 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -712,3 +712,27 @@ usb0_drd_sw: endpoint {
+ 		};
+ 	};
+ };
++
++&hdmi {
++	hvcc-supply = <&reg_dldo1>;
++	status = "okay";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
++/ {
++	hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++};

main/mobile-config-firefox/APKBUILD

+# Maintainer: Oliver Smith <ollieparaoid@postmarketos.org>
 pkgname=mobile-config-firefox
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Firefox tweaks for mobile and privacy"
 url="https://gitlab.com/postmarketOS/mobile-config-firefox"
 source="

main/msm-fb-refresher/APKBUILD

 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=msm-fb-refresher
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Display refresher for Qualcomm devices"
 arch="all"
 url="https://github.com/AsteroidOS/msm-fb-refresher"
@@ -35,6 +35,6 @@ package() {
 		"$initfsdir/files/00-msm-fb-refresher.files"
 }
 sha512sums="5e2920cf86f2e373e2411a89cf3ac6745af042ff7d91ae581f26b72772bc9ab621ea4154bc33ef57dce0c04ba3f88ee3b9f98c2a17b2579df368b0929cf0bfa7  msm-fb-refresher-0.2.tar.gz
-5820e02dcb1cd927bcd6c8548307936a12f0dde1b92f15a931134b8d4a41f4b5e8811c6969d9b11a6a31d40da218b24ee274614936f6e50bcd6e794346f99c13  msm-fb-refresher.init
+e4dc12848d5615ff758ad3ba4165bef5501c92350f46072d30d9924821bf63ad89fe69e78f248562c8377d537bf8c3cefd275130a97040741bd80ff32a1838a3  msm-fb-refresher.init
 1b6168037293db465a5a55d5c263cb60ac46cccb601329b193110bbdffc23207b3d38419d2ad128020bf4ddbcdb868e8fa2f561764adf02c7db0526b0177ee5a  00-msm-fb-refresher.sh
 906c0d672682a9f0e3e8e07e207a557b8a1659e2e6021cb95c4b9886aed3b9ea477638c00ce9e4193b52dcfab7da317d9840cc576f29c7c7158cc11fd368be84  00-msm-fb-refresher.files"

main/msm-fb-refresher/msm-fb-refresher.init

 #!/sbin/openrc-run
 
-cmd=/usr/sbin/msm-fb-refresher
-cmd_args="--loop"
-pid=/run/msm-fb-refresher.pid
+command="/usr/sbin/msm-fb-refresher"
+command_args="--loop"
+supervisor="supervise-daemon"
 
 depend() {
 	after bootmisc
 }
-
-start() {
-	ebegin "Starting msm-fb-refresher"
-	start-stop-daemon --start --exec $cmd --background \
-		--pidfile $pid --make-pidfile -- $cmd_args
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping msm-fb-refresher"
-	start-stop-daemon --stop --exec $cmd
-	eend $?
-}
-
-restart() {
-	stop
-	start
-}

temp/u-boot-pinephone/0001-Set-RAM-clock-back-to-552.patch

+This is being upstreamed, https://gitlab.com/pine64-org/u-boot/-/merge_requests/3
+
+From 74ec7d4ab140e88158212f4e565dc7ab22d5d4f0 Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Wed, 2 Sep 2020 11:13:50 +0200
+Subject: [PATCH] Set RAM clock back to 552
+
+Any higher will cause random freezes. We've experienced this in the past
+and now I've been experiencing it with a 1.2a device. Decreasing it back
+to 552 fixed the issue for me.
+---
+ configs/pinephone_defconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/pinephone_defconfig b/configs/pinephone_defconfig
+index 1ffd495d79..9268a861bf 100644
+--- a/configs/pinephone_defconfig
++++ b/configs/pinephone_defconfig
+@@ -3,7 +3,7 @@ CONFIG_ARCH_SUNXI=y
+ CONFIG_SPL=y
+ CONFIG_MACH_SUN50I=y
+ CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
+-CONFIG_DRAM_CLK=624
++CONFIG_DRAM_CLK=552
+ CONFIG_DRAM_ZQ=3881949
+ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+ # CONFIG_VIDEO_DE2 is not set
+-- 
+2.28.0
+

temp/u-boot-pinephone/APKBUILD

 # U-boot with patches to make the PinePhone boot faster and have control over the ddr clock speed
 pkgname=u-boot-pinephone
 pkgver=2020.07_git20200803
-pkgrel=0
+pkgrel=1
 # Last commit from "crust" branch, as used in "crust-meta":
 # https://gitlab.com/pine64-org/crust-meta/-/blob/8886bcc829179bf77216fade71f0ede9bd014e67/Makefile#L78
 _commit="5433de221199bd5458f3ef71a8366f8031b61cb1"
@@ -15,6 +15,7 @@ options="!check"
 source="https://gitlab.com/pine64-org/u-boot/-/archive/$_commit/u-boot-$_commit.tar.gz
 	update-u-boot
 	0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch
+	0001-Set-RAM-clock-back-to-552.patch
 	"
 builddir="$srcdir/u-boot-$_commit"
 
@@ -40,4 +41,5 @@ package() {
 
 sha512sums="89cf93893e5cd9a3ecebdcc1e6dc28e6c2bb58aef7d18371e06e85d197d0d4fbdced5856349fdca35b97ad2d55a87d5fe2eaec8d5d2019f29e6a3af62d737ab0  u-boot-5433de221199bd5458f3ef71a8366f8031b61cb1.tar.gz
 4a3a1772a7309d44e7977dee4aca499d5c79675d99cda1395d8765abb415b8456260c7a989650f0bd2dfda0377af2346917fbcbf3e356a36265ed07e161ddc3b  update-u-boot
-7369f4d1f28d1ec2adf9640636940b3672eb5d4573160f2906451778369b67a02d4a684fb81246b3e2b9983acf0c9632b1c880f7d77c850a00a41080fca65481  0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch"
+7369f4d1f28d1ec2adf9640636940b3672eb5d4573160f2906451778369b67a02d4a684fb81246b3e2b9983acf0c9632b1c880f7d77c850a00a41080fca65481  0001-sunxi-support-asymmetric-dual-rank-DRAM-on-A64-R40.patch
+e412f968e9107b5d2c7282135fe343fd27c2ae9830344e367c2ee9ee4b0ba7be8b305356468011a4f04cf0d81e908827d7d3ddfd23f9c107ba5c91170503601c  0001-Set-RAM-clock-back-to-552.patch"