From 96179b88df2a83c82e9477da3e0a02278f737c8b Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sat, 19 Nov 2022 00:20:34 +0100
Subject: [PATCH] testing/linux-postmarketos-qcom-msm8953: support Moto G6 &
 FP3 touchscreen (MR 3651)

Upgrade to a newer 5.18.3 commit that adds this support, and enable the
relevant kconfig options.
---
 device/testing/linux-postmarketos-qcom-msm8953/APKBUILD   | 8 ++++----
 .../config-postmarketos-qcom-msm8953.aarch64              | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD
index 5f0e813bc..77c255561 100644
--- a/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8953/APKBUILD
@@ -4,7 +4,7 @@
 _flavor="postmarketos-qcom-msm8953"
 pkgname=linux-$_flavor
 pkgver=5.18.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mainline kernel fork for Qualcomm MSM8953 devices"
 arch="aarch64"
 url="https://github.com/msm8953-mainline/linux"
@@ -25,7 +25,7 @@ makedepends="
 
 _carch="arm64"
 # Source
-_commit="649f00020e253e8f84f2df66efaff07c6c49e815"
+_commit="57f6fd0feb9b81ab5fda48e47e9a7f01d39be243"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/msm8953-mainline/linux/archive/$_commit.tar.gz
 	config-$_flavor.$arch
@@ -56,6 +56,6 @@ package() {
 		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
 sha512sums="
-ba6c5b0ab6020891d14b85688e27a251bbf4a74e73ee1630cb3d6ba967444ac4de8b51cc04aeeb2246e33883068c1a23ce0b764d2a18fd378da8c2b7badeaf84  linux-postmarketos-qcom-msm8953-649f00020e253e8f84f2df66efaff07c6c49e815.tar.gz
-0f6327f8ae860bf4fb09d1df4f135524a87546c956eeb708ec0bc2b886ff4db06e6f1d3611080337de59ec53eb3434c122116fe4c2de21a83c36a8a4f0189674  config-postmarketos-qcom-msm8953.aarch64
+63493a9551ddb3bc8ffb7a3ced99860c6630f79e1b4705b793767e0ea5668ba0c7438d3acf79092fc84390d80490252dfe391610571c47a304f5f78bf409460d  linux-postmarketos-qcom-msm8953-57f6fd0feb9b81ab5fda48e47e9a7f01d39be243.tar.gz
+b982f2eb79b2a72e4fbe71c263d16056398a3eddd1a19e8f062d2d39cf34d0743e3b50c61cebe8cef41293d09c9fbf75f8e5580b8fedd8f018fb98b1acbad198  config-postmarketos-qcom-msm8953.aarch64
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64 b/device/testing/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64
index 66d61b8a2..de2b4f133 100644
--- a/device/testing/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64
+++ b/device/testing/linux-postmarketos-qcom-msm8953/config-postmarketos-qcom-msm8953.aarch64
@@ -2,9 +2,9 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.18.3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.1.1_git20220630-r5) 12.1.1 20220630"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 12.2.1_git20220924-r4) 12.2.1 20220924"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=120101
+CONFIG_GCC_VERSION=120201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
 CONFIG_AS_VERSION=23900
@@ -2137,6 +2137,7 @@ CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
+CONFIG_TOUCHSCREEN_HIMAX_HX83112B=m
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
@@ -3150,6 +3151,7 @@ CONFIG_DRM_PANEL_MIPI_DSI_COMMON=m
 CONFIG_DRM_PANEL_SAMSUNG_S6E3FA7_AMS4604NL01=m
 CONFIG_DRM_PANEL_BOE_BS052FHM_A00_6C01=m
 CONFIG_DRM_PANEL_TIANMA_TL052VDXP02=m
+CONFIG_DRM_PANEL_TIANMA_TL057FVXP01=m
 CONFIG_DRM_PANEL_TIANMA_622_V0=m
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set