From fb42b3b601dc0890eb7b8dcd4ef9b1fd05c77b0f Mon Sep 17 00:00:00 2001
From: clayton craft <clayton@craftyguy.net>
Date: Sat, 7 Nov 2020 13:56:38 -0800
Subject: [PATCH] device-purism-librem5: upgrade to 1.8 (MR 1689)

        - Upgrade librem5-base config
        - add goodix touch input and edx touchscreen drivers to
          deviceinfo/initramfs
---
 device/community/device-purism-librem5/APKBUILD   | 8 ++++----
 device/community/device-purism-librem5/deviceinfo | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD
index 74185f0c9..2e1950eda 100644
--- a/device/community/device-purism-librem5/APKBUILD
+++ b/device/community/device-purism-librem5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.7
+pkgver=1.8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,7 @@ depends="
 	uboot-tools
 "
 makedepends="devicepkg-dev"
-_confver=25
+_confver=27
 _confdir=$srcdir/librem5-base-v$_confver
 source="
 	https://source.puri.sm/Librem5/librem5-base/-/archive/v$_confver/librem5-base-v$_confver.tar.gz
@@ -93,12 +93,12 @@ package() {
 
 	devicepkg_package $startdir $pkgname
 }
-sha512sums="f37d08f1a325cbf79870976da9893ac2f43713677d9048057deeff3aae282b630ceb8ebdd8874a6f631870a6ddbe889090fa5ee25cc91a23ffa3c603ead63114  librem5-base-v25.tar.gz
+sha512sums="d23e23a48bdea8df65b7df2475caa5b85c8e999c7dff1e48e359a8fb9166019c4c609b5855876f603d60a422e43a0378d4dbdd89c71b8f6ec054bb7f1dc59ca5  librem5-base-v27.tar.gz
 685ec71484a932c59f83f1039d4d18a010a5849342e96d9e15ae8ce64374aac15073f9c51d7d9f270c60e70d2ea15c685b8f528cdc40f991b093b9227cba6a48  00-kwin.sh
 9b4ecf6692db6d291799b2ebcdd7f3ceba52d657c01b40a15f4d819f1f9d2f0576bfcf94b1889da767d1757f3af86f4056160b9b31b1ecab0517acfb958f22a9  00-mesa.sh
 be0cf9f9e37c33d526fdf5fb61de1b42b3bb9309faf1feb0db51fa9639c3c0b35608977c898130ff60ebf2e8081ac36799b96c748b7efa9dcef7501753bc4890  70-gnss.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
-d0fcd8a2cd0c16d646e196a0d47001afa3bb922f4d1028b924e90df6396727a92f23a4a51834faa9b8674c21f76a9b1abb814a8751ce98776b50772eda69b2a5  deviceinfo
+26f2a0d4a4d65fae9ce922250e6902c32cff817e9f18c25983cd1ba17c21a48c5a81388ecd006367515c13836283dd7b6eb125d605340cf8807394b3f06384ad  deviceinfo
 d033df2b9125622c946af67dad83070473c86937b5825f57ad272c9145b594071dd6913949127803c45af4ea3226526551718d40739f9f1ee4bfe6446e62c856  flash_script.lst
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471  modules-load.d_librem5.conf
diff --git a/device/community/device-purism-librem5/deviceinfo b/device/community/device-purism-librem5/deviceinfo
index e27c8263b..3926e59e1 100644
--- a/device/community/device-purism-librem5/deviceinfo
+++ b/device/community/device-purism-librem5/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="purism-librem5"
 deviceinfo_year="2019"
 deviceinfo_dtb="freescale/imx8mq-librem5 freescale/imx8mq-librem5-r2 freescale/imx8mq-librem5-r3"
 deviceinfo_append_dtb="false"
-deviceinfo_modules_initfs="phy_fsl_imx8mq_usb dwc3 udc_core xhci_hcd xhci_plat_hcd tps6598x libcomposite"
+deviceinfo_modules_initfs="phy_fsl_imx8mq_usb dwc3 udc_core xhci_hcd xhci_plat_hcd tps6598x libcomposite goodix edt-ft5x06 led_bl"
 deviceinfo_arch="aarch64"
 
 # Device related