From 1eb794e1242a39a0b6db877d63d48caa20a02449 Mon Sep 17 00:00:00 2001
From: Robert Eckelmann <longnoserob@postmarketos.org>
Date: Mon, 6 May 2024 13:43:02 +0900
Subject: [PATCH] device-xiaomi-beryllium: add sensor support (MR 5099)

---
 .../81-libssc-xiaomi-beryllium.rules          |  3 +++
 .../device-xiaomi-beryllium/APKBUILD          | 24 +++++++++++++++----
 ...mi-beryllium-nonfree-firmware.post-install |  2 ++
 ...mi-beryllium-nonfree-firmware.post-upgrade |  1 +
 .../device-xiaomi-beryllium/hexagonrpcd.confd |  2 ++
 5 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 device/community/device-xiaomi-beryllium/81-libssc-xiaomi-beryllium.rules
 create mode 100644 device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-install
 create mode 120000 device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-upgrade
 create mode 100644 device/community/device-xiaomi-beryllium/hexagonrpcd.confd

diff --git a/device/community/device-xiaomi-beryllium/81-libssc-xiaomi-beryllium.rules b/device/community/device-xiaomi-beryllium/81-libssc-xiaomi-beryllium.rules
new file mode 100644
index 000000000..2bad47308
--- /dev/null
+++ b/device/community/device-xiaomi-beryllium/81-libssc-xiaomi-beryllium.rules
@@ -0,0 +1,3 @@
+# 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-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD
index ad7be0709..0298b1da4 100644
--- a/device/community/device-xiaomi-beryllium/APKBUILD
+++ b/device/community/device-xiaomi-beryllium/APKBUILD
@@ -3,8 +3,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=10
-pkgrel=4
+pkgver=11
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,9 +24,11 @@ subpackages="
 
 source="
 	deviceinfo
+	hexagonrpcd.confd
 	modules-initfs.ebbg
 	modules-initfs.tianma
 	q6voiced.conf
+	81-libssc-xiaomi-beryllium.rules
 "
 
 build() {
@@ -38,12 +40,22 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU, venus, modem firmware"
-	depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware
-		 soc-qcom-sdm845-modem"
+	pkgdesc="GPU, venus, modem and sensor firmware"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		firmware-xiaomi-beryllium
+		soc-qcom-sdm845-nonfree-firmware
+		soc-qcom-sdm845-modem
+		hexagonrpcd
+	"
+	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"
 
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	install -Dm644 81-libssc-xiaomi-beryllium.rules \
+		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 kernel_tianma() {
@@ -60,7 +72,9 @@ kernel_ebbg() {
 
 sha512sums="
 3d6247e3d1d045fea5cec78dd2a41b4cf81a84fa27550e9502d44152fbfa8246302d5ecb52837a05652a599a6e11dd87acf656b2235dff9dd0717cedb7afd8ab  deviceinfo
+52079045a0c1f48628d891bf8867f5c1802152fce8e2c4bd787630f1f5e4c9b386bfc373e464cb053688350ac678dbc3c407a76a31a1ae700ca67764d0d384f1  hexagonrpcd.confd
 cab76675b9c48eb1ce0691b31667d17ee73ecf21439a7f7c9c2ba96344e3bf4ad713ebc685298d6e32ad589ba26f429cd6b0d200338b50d136ad1a29758e4214  modules-initfs.ebbg
 175a7d859956a029b91a1105b93c4113b07ab5cfe932294dd369808059ed03471625f64ce90e5146a65c0bb26417470d8f7c02e48dfacf2d016ce5b2c28cee76  modules-initfs.tianma
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
+2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-xiaomi-beryllium.rules
 "
diff --git a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-install b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-install
new file mode 100644
index 000000000..5cf61f597
--- /dev/null
+++ b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+rc-update add hexagonrpcd-sdsp
diff --git a/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-upgrade b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-upgrade
new file mode 120000
index 000000000..0c195cd76
--- /dev/null
+++ b/device/community/device-xiaomi-beryllium/device-xiaomi-beryllium-nonfree-firmware.post-upgrade
@@ -0,0 +1 @@
+device-xiaomi-beryllium-nonfree-firmware.post-install
\ No newline at end of file
diff --git a/device/community/device-xiaomi-beryllium/hexagonrpcd.confd b/device/community/device-xiaomi-beryllium/hexagonrpcd.confd
new file mode 100644
index 000000000..eb638560d
--- /dev/null
+++ b/device/community/device-xiaomi-beryllium/hexagonrpcd.confd
@@ -0,0 +1,2 @@
+# Xiaomi Poco F1 specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sdm845/Xiaomi/beryllium"