device-xiaomi-surya: support more panels, fix deps and modules-initfs (MR 6195)

modules-initfs: Add touchscreen and panels, drop gpi and spi

1. Add the touchscreen (nt36xxx-spi), panels (panel-huaxing-nt36672c,
panel_tianma_nt36672c) and wled to modules-initfs, as these drivers
have been switched to modules.

2. Drop GPI and SPI from the module list as they have been configured
as built-in within the kernel.

Refine nonfree firmware dependencies:

1. Removed the common GPU firmware package from soc-qcom-sm7150 and
subsequently re-added it to firmware-xiaomi-surya in earlier commits.
We now ensure the GPU ZAP firmware is installed by adding
firmware-xiaomi-surya-gpu as a dependency to nonfree_firmware.

2. Incorporated firmware-xiaomi-surya-sensors into nonfree_firmware,
following its prior inclusion in firmware-xiaomi-surya.

3. Extended the integration of the soc-qcom-sm7150-libssc-180-degrees
udev rule into nonfree_firmware, building on its earlier addition to
soc-qcom-sm7150.

4. Install firmware unconditionally and provide a path for hexagonfs.

The Xiaomi POCO X3 NFC (xiaomi-surya) has two possible panel variants:
Huaxing and Tianma. The kernel dts file has been split to accommodate
these variants. Update the device package to enable panel selection
during the pmbootstrap init.

Co-authored-by: Jens Reidel <adrian@travitia.xyz>
Signed-off-by: Danila Tikhonov <danila@jiaxyga.com>

device/testing/device-xiaomi-surya/APKBUILD

@@ -4,54 +4,57 @@
 
 pkgname=device-xiaomi-surya
 pkgdesc="Xiaomi POCO X3 NFC"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-postmarketos-qcom-sm7150
+	firmware-xiaomi-surya
 	make-dynpart-mappings
 	mkbootimg
 	postmarketos-base
 	soc-qcom-sm7150
+	soc-qcom-sm7150-libssc-180-degrees
 "
 makedepends="devicepkg-dev"
+replaces="hexagonrpcd-openrc"
+subpackages="
+	$pkgname-kernel-huaxing:kernel_huaxing
+	$pkgname-kernel-tianma:kernel_tianma
+"
 source="
 	deviceinfo
+	hexagonrpcd.confd
 	modules-initfs
 "
 
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-
 build() {
 	devicepkg_build $startdir $pkgname
 }
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+}
+
+kernel_huaxing() {
+	pkgdesc="Huaxing Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for Modem, WiFi, Touchscreen, etc."
-	depends="
-		firmware-xiaomi-surya-adsp
-		firmware-xiaomi-surya-cdsp
-		firmware-xiaomi-surya-initramfs
-		firmware-xiaomi-surya-ipa
-		firmware-xiaomi-surya-modem
-		firmware-xiaomi-surya-touchscreen
-		firmware-xiaomi-surya-venus
-		firmware-xiaomi-surya-wlan
-		soc-qcom-sm7150-nonfree-firmware
-		"
-	mkdir "$subpkgdir"
+kernel_tianma() {
+	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Xiaomi POCO X3 NFC wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_POCO_X3_NFC_(xiaomi-surya)"
+	depends="linux-postmarketos-qcom-sm7150"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
 sha512sums="
-391e4b0a14d5321cbe59c0e6077cdadf0775bb7d08f3f4c9708499f2e44c6ac17180ead27d5029902a70f66249011c216102821e0c6cd5c8175d7439f4da9ee4  deviceinfo
-6d86b9211d4adf237ef2961f304655331287c186bba56b1af32185401b01b506949557ce6e70dc70e3c9997b4f5684c9f4cdfd11c79ccbc7a869147b6fb9bb53  modules-initfs
+09cca64d70ab5b9350d4ca645d8f868906b5a9e90d7fd75bf7b9769b7b9ba18f98526675af2cf01b6369c1f36abf8ce47aea9fde6195927bb7735b151cf51bba  deviceinfo
+09fa0696c5d6bba9640fb74d2e5bf1200aab54a7282f3957c02a1c38a7e9d6d3d9d2d278c48d24678c7573382e1a3df6470fd6d1ca4b153dc8d4033eb5a4ea4a  hexagonrpcd.confd
+bbf608bff748964e7154f9681a8b7a84a88c42035e9aa854d1b9a7d25f92b2f36bedb575ce411673f27f3e8c618034b55b8c1d083d2b07e445699f34edc55993  modules-initfs
 "

device/testing/device-xiaomi-surya/deviceinfo

@@ -7,7 +7,8 @@ deviceinfo_name="Xiaomi POCO X3 NFC"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-surya"
 deviceinfo_year="2020"
-deviceinfo_dtb="qcom/sm7150-xiaomi-surya"
+deviceinfo_dtb_huaxing="qcom/sm7150-xiaomi-surya-huaxing"
+deviceinfo_dtb_tianma="qcom/sm7150-xiaomi-surya-tianma"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 deviceinfo_flash_kernel_on_update="true"

device/testing/device-xiaomi-surya/hexagonrpcd.confd

+# Xiaomi POCO X3 (NFC) specific hexagonrpcd firmware directory
+hexagonrpcd_fw_dir="/usr/share/qcom/sm7150/Xiaomi/surya"

device/testing/device-xiaomi-surya/modules-initfs

-gpi
-spi-geni-qcom
+nt36xxx-spi
+panel_huaxing_nt36672c
+panel_tianma_nt36672c
+qcom_wled