From 8d534e86cb6df0abc80993be3dc5ab293e5437f2 Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb@connolly.tech>
Date: Sat, 7 Aug 2021 16:08:50 +0100
Subject: [PATCH] device-oneplus-enchilada: 5.14 and phosh changes (MR 2416)

Fix deviceinfo to reference the new names for fg and haptics modules.

Bump phosh scaling to 3.0
---
 device/community/device-oneplus-enchilada/APKBUILD     | 8 ++++----
 device/community/device-oneplus-enchilada/deviceinfo   | 2 +-
 device/community/device-oneplus-enchilada/rootston.ini | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD
index b10d331f2..4e0a6c2e0 100644
--- a/device/community/device-oneplus-enchilada/APKBUILD
+++ b/device/community/device-oneplus-enchilada/APKBUILD
@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,6 +42,6 @@ phosh() {
 }
 
 sha512sums="
-b38f2d938dc71a7aaeccd53bea01f02eba45a451d705c3020b0b759a75fb2df65b00fad479916d12249b0b79f0637bafa36b2808e6878e1bb1d0c794e9405baf  deviceinfo
-035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+009e1cfc0ae2823bb82dbc39a1b9c1199e0e7691f0e95a6423bbfe941e07486297e0aad295f2ea44d43ed51b1440bf8e6a67867d0c1a6aad653399afbd006c1d  deviceinfo
+9fef488a655fcbad4fb28c11d7d6cbe385096e766cd99ca59802f1dbc4e3c99dac0ff682549e02fac0b73f7e95db953f3a87c453d1b19b229785e4ffeec515ed  rootston.ini
 "
diff --git a/device/community/device-oneplus-enchilada/deviceinfo b/device/community/device-oneplus-enchilada/deviceinfo
index d703a2c71..788efa1f7 100644
--- a/device/community/device-oneplus-enchilada/deviceinfo
+++ b/device/community/device-oneplus-enchilada/deviceinfo
@@ -39,5 +39,5 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg pmi8998_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_spmi_fg qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
diff --git a/device/community/device-oneplus-enchilada/rootston.ini b/device/community/device-oneplus-enchilada/rootston.ini
index 9a6e8784c..709f3bec3 100644
--- a/device/community/device-oneplus-enchilada/rootston.ini
+++ b/device/community/device-oneplus-enchilada/rootston.ini
@@ -2,4 +2,4 @@
 # Overwrites values set in /usr/share/phosh/phoc.ini
 
 [output:DSI-1]
-scale = 2.5
+scale = 3.0