From 43af0245967278c7d7bc88c69f726a0883bc3741 Mon Sep 17 00:00:00 2001
From: InsanePrawn <insane.prawny@gmail.com>
Date: Tue, 10 May 2022 16:46:23 +0200
Subject: [PATCH] device/community:
 sdm845-{enchilada,fajita,beryllium,axolotl}: add appropiate charging drivers
 (MR 3127)

---
 device/community/device-oneplus-enchilada/APKBUILD   | 6 +++---
 device/community/device-oneplus-enchilada/deviceinfo | 2 +-
 device/community/device-oneplus-fajita/APKBUILD      | 6 +++---
 device/community/device-oneplus-fajita/deviceinfo    | 2 +-
 device/community/device-shift-axolotl/APKBUILD       | 5 +++--
 device/community/device-shift-axolotl/deviceinfo     | 2 +-
 device/community/device-xiaomi-beryllium/APKBUILD    | 6 +++---
 device/community/device-xiaomi-beryllium/deviceinfo  | 4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD
index f6d8937ffde..5c824aceec5 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=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -48,7 +48,7 @@ phosh() {
 }
 
 sha512sums="
-009e1cfc0ae2823bb82dbc39a1b9c1199e0e7691f0e95a6423bbfe941e07486297e0aad295f2ea44d43ed51b1440bf8e6a67867d0c1a6aad653399afbd006c1d  deviceinfo
+41059dc04ba4d155fedef3e470bfd6ea993d89418a13e25b8284dc98a4c90c61ae00101b9912161acaf4ac8b346d8efcf63894ce1ddb12224f19b9be69e0de87  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "
diff --git a/device/community/device-oneplus-enchilada/deviceinfo b/device/community/device-oneplus-enchilada/deviceinfo
index 788efa1f757..26433932e5d 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 qcom_spmi_fg qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_smb2 bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD
index 218e9522aa9..7040efd1e5c 100644
--- a/device/community/device-oneplus-fajita/APKBUILD
+++ b/device/community/device-oneplus-fajita/APKBUILD
@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -42,6 +42,6 @@ phosh() {
 }
 
 sha512sums="
-cd8b94751890fd8891e5eafbc4f668a068885d184ad9b93366c882cfafa798e4bc77fa548532796a278b5acdf15dbf1110a1a581823567deaa00b90a72796959  deviceinfo
+3417d0703f489453920afa68e5ce8b01128d75c1c8b4442612d9379de0edd01f4b90ab5dc8329cb5697b3bc9e230333c1c5f8f8b4a4500f45185d8f5aef2e13c  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
diff --git a/device/community/device-oneplus-fajita/deviceinfo b/device/community/device-oneplus-fajita/deviceinfo
index d1422e4bd65..e1fac167eb0 100644
--- a/device/community/device-oneplus-fajita/deviceinfo
+++ b/device/community/device-oneplus-fajita/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 qcom_spmi_fg qcom_spmi_haptics"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c qcom_fg qcom_smb2 bq27xxx_battery bq27xxx_battery_i2c qcom_spmi_haptics"
 deviceinfo_mesa_driver="msm"
diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD
index f70a15c14e8..d48c876b0c0 100644
--- a/device/community/device-shift-axolotl/APKBUILD
+++ b/device/community/device-shift-axolotl/APKBUILD
@@ -1,9 +1,10 @@
+
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Alexander Martinz <amartinz@shiftphones.com>
 
 pkgname=device-shift-axolotl
 pkgdesc="SHIFT6mq"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -49,6 +50,6 @@ phosh() {
 }
 
 sha512sums="
-07d778731a9f6be09bf45b98068b27ca2650f5de21745ea06c141542d1e6be578b2141ff03e72354e9363a0eaf0aa95505510bb033aa4e2b40144cec35b5bc3d  deviceinfo
+50de253cfcab3731ffa8ee4a67d7436ffa7fc17d59058137eed78b8359c158128dd073565dd4b8f5ada9e0f898ad4bad7c731a77feed6a652019c37023a02060  deviceinfo
 65f74d29ab318b23f7ac8923a3661f2c4130049273a8c6be234ed2c8e00810b6a1254b54cf0932e42850a6d48f821dcd038900fbb836feeddfab2759afffae38  phoc.ini
 "
diff --git a/device/community/device-shift-axolotl/deviceinfo b/device/community/device-shift-axolotl/deviceinfo
index 24329ff29b5..8849c76b96f 100644
--- a/device/community/device-shift-axolotl/deviceinfo
+++ b/device/community/device-shift-axolotl/deviceinfo
@@ -41,4 +41,4 @@ deviceinfo_flash_kernel_on_update="true"
 deviceinfo_rootfs_image_sector_size="4096"
 deviceinfo_super_partitions="/dev/sda7 /dev/sda7"
 
-deviceinfo_modules_initfs="focaltech_fts gpi i2c_qcom_geni qcom_smb2 qcom_spmi_fg qcom_spmi_haptics"
+deviceinfo_modules_initfs="focaltech_fts gpi i2c_qcom_geni qcom_smb2 qcom_fg qcom_spmi_haptics"
diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD
index 5d039309431..8bd3d66c742 100644
--- a/device/community/device-xiaomi-beryllium/APKBUILD
+++ b/device/community/device-xiaomi-beryllium/APKBUILD
@@ -4,8 +4,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
-pkgver=5
-pkgrel=1
+pkgver=6
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -66,7 +66,7 @@ phosh() {
 }
 
 sha512sums="
-29090e3d3fc16a752b33910abcfd8719af34bd257a7ca3cf25e9f1afc49e20582a7505bd7cd2ea2eb274c834eead277f31e5fb9384de8b444500518275e5a711  deviceinfo
+e997dda11ddd96167c1655712295fe320634a139cd502a795010d9516feee99f708270823a3db28dd14fcfbbe435ad1350e2a46922c2737a8e6e59524f74c7d2  deviceinfo
 e2e417169345c86a5dd34ac0afac4b2b983a755f4c7ba5698c385a01f96b9bd2c3ace1ce5a0569c121675e8b87e88e1cf5c648e995d9c50cba66e52bbc83753c  phoc.ini
 7f599f086dba97ac39ce98798969bc8e9c26dd3b062bb8f95852182df52814b70d49b701e27b43abeb3639b16ba053e416c14cf75e0bf4a9f2fe7c01fb0ac41c  q6voiced.conf
 "
diff --git a/device/community/device-xiaomi-beryllium/deviceinfo b/device/community/device-xiaomi-beryllium/deviceinfo
index ec32e0b1114..23543d49511 100644
--- a/device/community/device-xiaomi-beryllium/deviceinfo
+++ b/device/community/device-xiaomi-beryllium/deviceinfo
@@ -37,5 +37,5 @@ deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_sparse="true"
 
 # osk-sdl
-deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni nt36xxx"
-deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni focaltech_ft8719"
+deviceinfo_modules_initfs_tianma="gpi i2c_qcom_geni qcom_smb2 qcom_fg nt36xxx"
+deviceinfo_modules_initfs_ebbg="gpi i2c_qcom_geni qcom_smb2 qcom_fg focaltech_ft8719"
-- 
GitLab