From 4cff95a5bbe04fee9bb7714cd0ec8caa39b9abe3 Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Mon, 6 Jul 2020 17:25:32 +0200
Subject: [PATCH] main/linux-postmarketos-allwinner: upgrade to
 5.7.0_git20200705 (MR 1397)

This adds panel stability patches and enables more resolutions on
the hdmi port of the A64.
---
 main/linux-postmarketos-allwinner/APKBUILD     |  8 ++++----
 .../config-postmarketos-allwinner.aarch64      | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD
index 06d8084c9..5937f01c4 100644
--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@@ -1,7 +1,7 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.7.0_git20200704
+pkgver=5.7.0_git20200705
 pkgrel=0
 arch="aarch64"
 pkgdesc="Kernel fork with Pine64 patches"
@@ -9,7 +9,7 @@ url="https://gitlab.com/pine64-org/linux/"
 license="GPL-2.0-only"
 makedepends="devicepkg-dev perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev openssl-dev file bison flex rsync xz"
 options="!strip !check !tracedeps pmb:cross-native pmb:kconfigcheck-anbox"
-_commit="b7b625b8b43859aa1c46d34106541eb5cda373a5"
+_commit="c3e42484fd1be12ef573bc77f91626ccb7efd1ad"
 source="$pkgname-$_commit.tar.gz::https://gitlab.com/pine64-org/linux/-/archive/$_commit/linux-$_commit.tar.gz
 	config-$_flavor.aarch64
 	disable-power-save.patch
@@ -64,7 +64,7 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 
-sha512sums="99adf9816c40691ebe2213f16c4c3ccbefdc564974115482f772ff3252fcb4b419f63368964e999a946997ce90e0e339fbe1653a4bc4c2cee69f51fd528175d9  linux-postmarketos-allwinner-b7b625b8b43859aa1c46d34106541eb5cda373a5.tar.gz
-8bf4c9811e8e4abef7210567c5901efc9a8a80a8434289b9c92d0d3755508c246f13e00f1c83d83b69dafb61336d5e0a9e671ab5341bbba77e9269d7fdb100f5  config-postmarketos-allwinner.aarch64
+sha512sums="3655b68deffcdd2384f900354695098d85a646ef55b581406d734ef27511f3cc6bd5084b5524955ca3536aed38375f07f0500d465faeb162cd13fd220281a494  linux-postmarketos-allwinner-c3e42484fd1be12ef573bc77f91626ccb7efd1ad.tar.gz
+d3d73ddfa5d1611731a29c6b5af13849380d3f78d398d63851a96a1aadd230c17570089cf5967612000edf1a72e82a520169e1be30662d873eb575017f471ef5  config-postmarketos-allwinner.aarch64
 3c0d9d282a36a5f6a442b434839d77851f9b20185725cb73aee88e6e209c68fd3d71df8e2a36ffcdb605c47f86df5dbcda5d00353c75c23303861936196924e0  disable-power-save.patch
 c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch"
diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
index ed5906b9c..cf4080162 100644
--- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
+++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
@@ -529,6 +529,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 #
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
+# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
 CONFIG_ARM_SCPI_CPUFREQ=y
 # CONFIG_QORIQ_CPUFREQ is not set
 # end of CPU Frequency scaling
@@ -2388,23 +2389,24 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_W83627HF is not set
 # CONFIG_SENSORS_W83627EHF is not set
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THERMAL_WRITABLE_TRIPS is not set
+CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
+CONFIG_THERMAL_GOV_BANG_BANG=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
 CONFIG_CPU_FREQ_THERMAL=y
-# CONFIG_CLOCK_THERMAL is not set
-# CONFIG_DEVFREQ_THERMAL is not set
+CONFIG_CLOCK_THERMAL=y
+CONFIG_DEVFREQ_THERMAL=y
 CONFIG_THERMAL_EMULATION=y
 # CONFIG_THERMAL_MMIO is not set
 # CONFIG_QORIQ_THERMAL is not set
@@ -4817,7 +4819,7 @@ CONFIG_ANDROID_BINDER_IPC_SELFTEST=y
 CONFIG_NVMEM=y
 # CONFIG_NVMEM_SYSFS is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
-# CONFIG_NVMEM_SUNXI_SID is not set
+CONFIG_NVMEM_SUNXI_SID=y
 
 #
 # HW tracing support