diff --git a/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD b/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
index 4d396f0bc3090692bbf9647991494d6d1e0956ee..1d25e889e578be2078732d7b3ca5957de52a7205 100644
--- a/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
_flavor="postmarketos-qcom-msm89x7"
pkgname=linux-postmarketos-qcom-msm89x7
-pkgver=6.13
-pkgrel=1
+pkgver=6.13.6
+pkgrel=0
pkgdesc="Mainline kernel fork for Qualcomm QM215/MSM8917/MSM8937/MSM8940 devices"
arch="aarch64"
_carch="arm64"
@@ -24,7 +24,7 @@ makedepends="
postmarketos-installkernel
python3
"
-_tag="$pkgver-r1"
+_tag="$pkgver-r0"
_config="config-$_flavor.$arch"
source="
$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -57,6 +57,6 @@ package() {
"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
}
sha512sums="
-38ec04021e99c17a7d173848fe323140b3bea3544b9f69044c9a0ef67718af68826578ddffe5dc2a4fb47c0593675e20167d785f22aa64b60b44c35814dd2bf9 linux-postmarketos-qcom-msm89x7-v6.13-r1.tar.gz
-0b41690bf7c015c221dea92e7fc34a13241319cf47b7ba9408665018a9da4887dade42dbd206e4f59f126b6e16b15164396ebcd7677facf2bb45e9a8ea597ec9 config-postmarketos-qcom-msm89x7.aarch64
+91535b9e15b269409d1e328e17611ca4e79e7c45b392f74a52d9391ce583ae48ef55857c20512d9ecc3a9efe6a0f680d6c7ccd9b2cd626d6bc56d97927845fc4 linux-postmarketos-qcom-msm89x7-v6.13.6-r0.tar.gz
+017138d5e74e99695422b6dfae94cda2e1679749f17f624a75d6989e73b2cc1d557dcac6d3a2504942ad43196a7521ca8b662b9abf4b090c20c6e9d939e6a4c7 config-postmarketos-qcom-msm89x7.aarch64
"
diff --git a/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64 b/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
index e161b6d07c8545b4bbbe395bfa0260f29886d38d..664abca71b3e3ca10994c31b142309d9aff67620 100644
--- a/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
+++ b/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.13.0 Kernel Configuration
+# Linux/arm64 6.13.6 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
CONFIG_CC_IS_GCC=y
@@ -929,6 +929,7 @@ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y
CONFIG_ARCH_HAS_PTE_DEVMAP=y
CONFIG_ZONE_DMA=y
CONFIG_ZONE_DMA32=y
+CONFIG_VMAP_PFN=y
CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
CONFIG_ARCH_HAS_PKEYS=y
CONFIG_VM_EVENT_COUNTERS=y
@@ -1624,7 +1625,6 @@ CONFIG_ARM_CCI400_COMMON=y
# CONFIG_ARM_SCPI_PROTOCOL is not set
# CONFIG_ARM_FFA_TRANSPORT is not set
# CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
CONFIG_ARM_PSCI_FW=y
# CONFIG_ARM_PSCI_CHECKER is not set
@@ -2787,7 +2787,7 @@ CONFIG_BATTERY_MAX17042=m
# CONFIG_CHARGER_DETECTOR_MAX14656 is not set
# CONFIG_CHARGER_MAX77976 is not set
# CONFIG_CHARGER_QCOM_SMBB is not set
-CONFIG_SMB1360=m
+CONFIG_SMB1360=y
# CONFIG_SMB1360_DEBUG is not set
CONFIG_BATTERY_PM8916_BMS_VM=m
CONFIG_CHARGER_PM8916_LBC=m
@@ -3535,8 +3535,8 @@ CONFIG_VIDEO_GC5035=m
# CONFIG_VIDEO_OV5645 is not set
# CONFIG_VIDEO_OV5647 is not set
# CONFIG_VIDEO_OV5648 is not set
-# CONFIG_VIDEO_OV5670 is not set
-# CONFIG_VIDEO_OV5675 is not set
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
# CONFIG_VIDEO_OV5693 is not set
# CONFIG_VIDEO_OV5695 is not set
# CONFIG_VIDEO_OV64A40 is not set
@@ -3556,6 +3556,7 @@ CONFIG_VIDEO_GC5035=m
# CONFIG_VIDEO_RDACM21 is not set
# CONFIG_VIDEO_RJ54N1 is not set
# CONFIG_VIDEO_S5C73M3 is not set
+CONFIG_VIDEO_S5K2XX=m
# CONFIG_VIDEO_S5K5BAF is not set
# CONFIG_VIDEO_S5K6A3 is not set
# CONFIG_VIDEO_VGXY61 is not set
@@ -5055,7 +5056,7 @@ CONFIG_QCOM_BAM_DMA=y
#
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
+CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
# CONFIG_DMABUF_SELFTESTS is not set
@@ -5089,7 +5090,6 @@ CONFIG_VHOST_MENU=y
# CONFIG_STAGING is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
-# CONFIG_CZNIC_PLATFORMS is not set
# CONFIG_MELLANOX_PLATFORM is not set
CONFIG_SURFACE_PLATFORMS=y
CONFIG_ARM64_PLATFORM_DEVICES=y
@@ -6099,7 +6099,6 @@ CONFIG_ARM_GIC_V3=y
CONFIG_ARM_GIC_V3_ITS=y
CONFIG_IRQ_MSI_LIB=y
# CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
# CONFIG_XILINX_INTC is not set
CONFIG_PARTITION_PERCPU=y
# CONFIG_QCOM_PDC is not set
diff --git a/device/testing/soc-qcom-msm89x7/51-qcom.conf b/device/testing/soc-qcom-msm89x7/51-qcom.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e92726f64df435833be84bf0a979f57c5c5aede9
--- /dev/null
+++ b/device/testing/soc-qcom-msm89x7/51-qcom.conf
@@ -0,0 +1,26 @@
+monitor.alsa.rules = [
+ {
+ matches = [
+ {
+ # Matches all sources
+ node.name = "~alsa_input.*"
+ },
+ {
+ # Matches all sinks
+ node.name = "~alsa_output.*"
+ }
+ ]
+ actions = {
+ update-props = {
+ audio.format = "S16LE"
+ audio.rate = 48000
+ api.alsa.period-size = 4096
+ api.alsa.period-num = 6
+ api.alsa.headroom = 512,
+ # session.suspend-timeout-seconds = 0
+ # dither.method = "wannamaker3", # add dither of desired shape
+ # dither.noise = 2, # add additional bits of noise
+ }
+ }
+ }
+]
diff --git a/device/testing/soc-qcom-msm89x7/APKBUILD b/device/testing/soc-qcom-msm89x7/APKBUILD
index 05097d2df335b659f14d4a9ab917f506d0e69438..7f3432cab495cc2d51a3c172c5dfd7b92ae375c1 100644
--- a/device/testing/soc-qcom-msm89x7/APKBUILD
+++ b/device/testing/soc-qcom-msm89x7/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Barnabas Czeman <barnabas.czeman@postmarketos.org>
pkgname=soc-qcom-msm89x7
pkgdesc="Common package for Qualcomm MSM89x7 devices"
-pkgver=3
+pkgver=4
pkgrel=0
url="https://postmarketos.org"
license="BSD-3-Clause"
@@ -21,10 +21,13 @@ _ucm_commit="6078de44affd1023c1ba4f71ef1e21468e3282e9"
source="
$pkgname-$_ucm_commit.tar.gz::https://github.com/msm89x7-mainline/alsa-ucm-conf/archive/$_ucm_commit.tar.gz
adreno-quirks.sh
+ 51-qcom.conf
"
package() {
mkdir -p $pkgdir
+ install -Dm644 "$srcdir"/51-qcom.conf \
+ -t "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d
}
ucm() {
@@ -47,4 +50,5 @@ gpu() {
sha512sums="
b3cc3ad65cf5d3fd956f4d24f36fc4324e4ee676a0cdda99f213f90c6a854b1eb9d3333402e05e1b861e404f31c72b4d5a219b6bcb6170bacedc938657e9a7c4 soc-qcom-msm89x7-6078de44affd1023c1ba4f71ef1e21468e3282e9.tar.gz
1deebe2d0ecfd1022d3f068faf8412edd6c6cf309c0472788620778a04c274187d01204b0c39c6dd5fddd1d5beaa36f2ca693b7af0a8fb9d2c27ea1f6d696ef1 adreno-quirks.sh
+28c14f47eaedec577d152001c51753537c98f267ac4a0acf78a304efebe5f6a1b4dc6d501497da9a0a925806a1d9c80b25e001cf9b1eb21efa22cd6a41ff753b 51-qcom.conf
"