From 5684f6e5a88d1726a8dc3274bd44e4205fb1554a Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Mon, 1 May 2023 15:19:23 +0200
Subject: [PATCH] device-shift-axolotl: add accelerometer mount matrix (MR
 4050)

SHIFT6mq accelerometer is mounted differently than the screen,
adjust it with a mount matrix. This way, screen rotations follow
the actual screen rotation by the user.
---
 .../device-shift-axolotl/81-libssc-shift-axolotl.rules   | 4 ++++
 device/community/device-shift-axolotl/APKBUILD           | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 device/community/device-shift-axolotl/81-libssc-shift-axolotl.rules

diff --git a/device/community/device-shift-axolotl/81-libssc-shift-axolotl.rules b/device/community/device-shift-axolotl/81-libssc-shift-axolotl.rules
new file mode 100644
index 000000000..89b5bfd0d
--- /dev/null
+++ b/device/community/device-shift-axolotl/81-libssc-shift-axolotl.rules
@@ -0,0 +1,4 @@
+# iio-sensor-proxy with libssc: accelerometer mount matrix
+
+SUBSYSTEM=="misc", KERNEL=="fastrpc-*", ENV{ACCEL_MOUNT_MATRIX}+="-1, 0, 0; 0, -1, 0; 0, 0, -1"
+
diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD
index 80658b551..ad9bb49ea 100644
--- a/device/community/device-shift-axolotl/APKBUILD
+++ b/device/community/device-shift-axolotl/APKBUILD
@@ -4,8 +4,8 @@
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=12
-pkgrel=3
+pkgver=13
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -26,6 +26,7 @@ source="
 	deviceinfo
 	modules-initfs
 	q6voiced.conf
+	81-libssc-shift-axolotl.rules
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -42,11 +43,12 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
-	depends="firmware-shift-sdm845 firmware-shift-sdm845-initramfs
+	depends="firmware-shift-sdm845>=20230815-r2 firmware-shift-sdm845-initramfs
 		 soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
 }
 
 pmtest() {
@@ -61,4 +63,5 @@ sha512sums="
 e3f8a8d556a3c3134791693f2003aa64465b6971f7e353f547d6f1cbe3a0a0225a225e40ee4dbed951c0fa67f5a4636fd15953f6a3fe23d4f098fa1d39baa8f5  deviceinfo
 4dc84207c5ca84b33b74139c8b0c9ce5baa8bcb1068df9943c478c02abcf8daccb88e06af63f120a434a115e277008e899305bd5239d8669436cb269889040e9  modules-initfs
 2a3cbdad5aa91181d24a4e56e63986af6accf887c64fa4d1b6ddad1926e29050243c4b1e2fd892d38ca7c16e24dff8545a16552e5749ae31b6d01bf428468e51  q6voiced.conf
+3bd3a82b88a7aca4e2df2f5522cee7a98d017994f1dc1a965a7e386be9c17632b9cdbe013feb737dec12e99d74f54a9e4599144193bb57ec18e6d6a18c94cf1f  81-libssc-shift-axolotl.rules
 "