From 9bc99167c336ce99112ae7c1a2bb58aed7fe2b3d Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 7 Feb 2024 10:41:52 +0100
Subject: [PATCH] linux-postmarketos-qcom-msm8974: enable new community kconfig
 options (MR 4803)

---
 .../linux-postmarketos-qcom-msm8974/APKBUILD  |  4 +--
 .../config-postmarketos-qcom-msm8974.armv7    | 25 +++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD b/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD
index 92cfbadc7..e28f008b5 100644
--- a/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm8974/APKBUILD
@@ -5,7 +5,7 @@ _config="config-$_flavor.$CARCH"
 
 pkgname=linux-$_flavor
 pkgver=6.7.0
-pkgrel=0
+pkgrel=1
 _tag="v${pkgver/_/-}-msm8974"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm MSM8974 devices"
 arch="armv7"
@@ -61,5 +61,5 @@ package() {
 
 sha512sums="
 b635fe71bf699c56c4ff99a786eee1543759a981be5a281f61802a01b406a3b38b478475d8d6f5cdd3f8375f144078694f5a59ca77a67d803ab5e9009b86a986  linux-v6.7.0-msm8974.tar.gz
-a1dca9850d785234757b824c1a6219f060c63f169ce95e407bd97d81263cf14b80f354445a913f28e100e9b6d17eea3ae7901c40044d2ce6c65ade7380c24fe7  config-postmarketos-qcom-msm8974.armv7
+518d6d2b33f91cde2f40b6c764fcbb2a405da867527e0544987c4c9e3088697af61f5b0c14036b65d80b5864be8fc51570ea35882c9a7b73fba2b78ebb5af889  config-postmarketos-qcom-msm8974.armv7
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7 b/device/testing/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7
index e25dc576e..0386018d7 100644
--- a/device/testing/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7
+++ b/device/testing/linux-postmarketos-qcom-msm8974/config-postmarketos-qcom-msm8974.armv7
@@ -150,7 +150,8 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 #
 # Scheduler features
 #
-# CONFIG_UCLAMP_TASK is not set
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
 # end of Scheduler features
 
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
@@ -168,6 +169,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_SCHED_MM_CID=y
+CONFIG_UCLAMP_TASK_GROUP=y
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
@@ -781,7 +783,7 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_ARCH_HAS_BINFMT_FLAT=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
-# CONFIG_BINFMT_MISC is not set
+CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # end of Executable file formats
 
@@ -1024,7 +1026,7 @@ CONFIG_NFT_NAT=m
 # CONFIG_NFT_QUOTA is not set
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
-# CONFIG_NFT_COMPAT is not set
+CONFIG_NFT_COMPAT=m
 # CONFIG_NFT_HASH is not set
 CONFIG_NFT_FIB=m
 # CONFIG_NFT_FIB_INET is not set
@@ -3786,6 +3788,8 @@ CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
 CONFIG_SND_PCM_ELD=y
 CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
 # CONFIG_SND_OSSEMUL is not set
@@ -3872,7 +3876,18 @@ CONFIG_SND_PCI=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_ARM is not set
 # CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
+# CONFIG_SND_BCD2000 is not set
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
@@ -4121,7 +4136,7 @@ CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
 # CONFIG_HIDRAW is not set
-# CONFIG_UHID is not set
+CONFIG_UHID=m
 CONFIG_HID_GENERIC=y
 
 #