From 6bccb218e68591ccd517d4470e7b5b73253a6d18 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 24 Jun 2020 01:13:56 -0700
Subject: [PATCH] linux-purism-librem5: upgrade to 5.7.5+librem5.2 (MR 1368)

This upgrade includes a runtime PM fix for the SD card reader/usb
---
 .../community/linux-purism-librem5/APKBUILD   | 21 +++++++++++--------
 .../config-purism-librem5.aarch64             |  9 +++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/device/community/linux-purism-librem5/APKBUILD b/device/community/linux-purism-librem5/APKBUILD
index b34a89cca..70ff18bba 100644
--- a/device/community/linux-purism-librem5/APKBUILD
+++ b/device/community/linux-purism-librem5/APKBUILD
@@ -1,15 +1,18 @@
 # Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm64/configs/librem5-devkit_defconfig
+# Maintainer:  Clayton Craft <clayton@craftyguy.net>
 pkgname=linux-purism-librem5
-# <kernel ver>.<purism kernel release>
-pkgver=5.7.5
-_purismver=${pkgver}+librem5.1
+# Note: _p#, where # is the purism version, e.g. the '2' in 'librem5.2'
+pkgver=5.7.5_p2
 pkgrel=0
+_kernver=${pkgver%_p*}
+_purismrel=${pkgver#*_p}
+# <kernel ver>.<purism kernel release>
+_purismver=${_kernver}+librem5.$_purismrel
 pkgdesc="Purism Librem 5 phone kernel fork"
 arch="aarch64"
 _carch="arm64"
 _flavor="purism-librem5"
-url="https://kernel.org"
+url="https://source.puri.sm/Librem5/linux-next"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
 makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
@@ -17,7 +20,6 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
 
 # Source
 _repository="linux-next"
-# imx8-current-librem5 branch:
 # kconfig generated with: ARCH=arm64 make defconfig KBUILD_DEFCONFIG=librem5_defconfig
 _config="config-$_flavor.$arch"
 source="
@@ -35,7 +37,8 @@ prepare() {
 build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
+		LOCALVERSION=".$_purismrel"
 }
 
 package() {
@@ -47,5 +50,5 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
 
 }
-sha512sums="0faaf984589ad4916b577b6a9353b0be20c163b60d88b4af4c7191bc1c59c490d25664b06c2f42900c9296d98361d3d3ae95b5e494778e4355ecb2e7ad4ad12d  linux-purism-librem5-5.7.5+librem5.1.tar.gz
-4d1f3b99c1f6ce3f95eab375403c6c4ca1ebb7131379ef3355e583993940b537d5026c9283289c1f512f0bfdbfad05c3153b4d5374ef8f13af74926f473b252c  config-purism-librem5.aarch64"
+sha512sums="bcb77bf6efa55bf524f47482d34c24d17fcd069e8fbf011270d2aa34f7b643cecd998f75de00fcc0245d56877ae0cebd0a33deb9e35ab2838953219f966e9812  linux-purism-librem5-5.7.5+librem5.2.tar.gz
+d5eae3780f0068a2208f2dee673d920e3bf7955497e923ed9a546736bee3b009eb4017ee75ad77121a0cd8d21feac5e116de50212bb48356c947a93cbc766033  config-purism-librem5.aarch64"
diff --git a/device/community/linux-purism-librem5/config-purism-librem5.aarch64 b/device/community/linux-purism-librem5/config-purism-librem5.aarch64
index 0ae0ad7f6..64315d23f 100644
--- a/device/community/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/community/linux-purism-librem5/config-purism-librem5.aarch64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.7.0 Kernel Configuration
+# Linux/arm64 5.7.5 Kernel Configuration
 #
 
 #
@@ -1444,6 +1444,7 @@ CONFIG_PCI_XGENE_MSI=y
 # Generic Driver Options
 #
 CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_STANDALONE=y
@@ -2361,7 +2362,7 @@ CONFIG_LDISC_AUTOLOAD=y
 CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
+CONFIG_SERIAL_8250_16550A_VARIANTS=y
 # CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
@@ -3606,6 +3607,7 @@ CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
@@ -3699,7 +3701,8 @@ CONFIG_SND_PCI=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_6FIRE is not set