diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD
index 365d599d50f835ded7163e5dc83d0d292c71c100..959d50cbccc6ef6c26389d27c64cfb379351a877 100644
--- a/device/community/device-pine64-pinebookpro/APKBUILD
+++ b/device/community/device-pine64-pinebookpro/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=device-pine64-pinebookpro
pkgdesc="PINE64 Pinebook Pro"
-pkgver=9
-pkgrel=3
+pkgver=10
+pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="
- alsa-ucm-conf
+ alsa-ucm-conf>=1.2.7
linux-postmarketos-rockchip>=5.14
mesa-dri-gallium
nvme-cli
@@ -27,8 +27,6 @@ source="
70-edp-backlight.rules
mem_sleep.conf
nvme-powersave.initd
- ucm/rockchip,es8316-codec.conf
- ucm/HiFi
wlan-powersave-off.start
"
@@ -49,12 +47,6 @@ package() {
install -D -m644 "$srcdir"/mem_sleep.conf \
"$pkgdir"/etc/sysfs.d/mem_sleep.conf
- # Alsa usecase manager config
- install -D -m644 "$srcdir"/HiFi \
- "$pkgdir"/usr/share/alsa/ucm2/rockchip_es8316/HiFi
- install -D -m644 "$srcdir"/rockchip,es8316-codec.conf \
- "$pkgdir"/usr/share/alsa/ucm2/conf.d/simple-card/rockchip,es8316-codec.conf
-
install -D -m755 "$srcdir"/nvme-powersave.initd \
"$pkgdir"/etc/init.d/nvme-powersave
@@ -77,7 +69,5 @@ d3988fe83c54228d743f4a8c190e9530404a436a7fbc0b004bf20d3986b502d864717d8cc9c76812
6e9e9ef54ee9aa9491be6dc30451fdcd9038b0efeb959509f48626d97a1696ee81711a46510049557b73269ff48acc85fad6496c65451e2e24908241b7655444 70-edp-backlight.rules
bcae155e24a151d3c098833680b83b6004a329962f115480d560ebe19257eab87286b8a4c194e456c067ca54fb53e59a5a16b022cea13c11135b0855145db563 mem_sleep.conf
2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5 nvme-powersave.initd
-71a3ea790eedd02df2bcf2ba24cc41b376ad0a8a7d72b1ee2dd7a0f9d618243d214157046649583f790b388d8faef5a03fcd4306ff4a3319e418bb895be831bc rockchip,es8316-codec.conf
-558f08b56425e0ceeea8d4815eeb862a2b801ba1b26b4dc28f4d0ec991ed9dfef14113172a224191eb2de5d0b57a741e4c48f1307bda2a69595944bd58731be1 HiFi
0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3 wlan-powersave-off.start
"
diff --git a/device/community/device-pine64-pinebookpro/ucm/HiFi b/device/community/device-pine64-pinebookpro/ucm/HiFi
deleted file mode 100644
index d254d4fbbf528a56be7020070510376ea390b22f..0000000000000000000000000000000000000000
--- a/device/community/device-pine64-pinebookpro/ucm/HiFi
+++ /dev/null
@@ -1,61 +0,0 @@
-SectionVerb {
- EnableSequence [
- cset "name='Headphone Playback Volume' 0"
- cset "name='Headphone Mixer Volume' 100%"
- cset "name='DAC Playback Volume' 100%"
- cset "name='DAC Source Mux' LDATA TO LDAT, RDATA TO RDAC"
- cset "name='Left Headphone Mixer Left DAC Switch' on"
- cset "name='Left Headphone Mixer LLIN Switch' off"
- cset "name='Right Headphone Mixer Right DAC Switch' on"
- cset "name='Right Headphone Mixer RLIN Switch' off"
- ]
- DisableSequence [
- ]
-
- Value {
- PlaybackPCM "hw:${CardId},0"
- CapturePCM "hw:${CardId},0"
- }
-}
-
-SectionDevice."Speaker" {
- Comment "Internal speaker"
- EnableSequence [
- cset "name='Headphone Playback Volume' 0"
- cset "name='Headphone Mixer Volume' 100%"
- cset "name='Speaker Switch' on"
- ]
- DisableSequence [
- cset "name='Speaker Switch' off"
- ]
- Value {
- PlaybackVolume "DAC Playback Volume"
- PlaybackSwitch "Speaker Switch"
- PlaybackChannels 2
- PlaybackPriority 300
- PlaybackPCM "hw:${CardId},0"
- }
- ConflictingDevice [
- "Headphones"
- ]
-}
-SectionDevice."Headphones" {
- Comment "Headset"
- EnableSequence [
- cset "name='Headphone Playback Volume' 50%"
- cset "name='Headphone Mixer Volume' 100%"
- cset "name='Speaker Switch' off"
- ]
- DisableSequence [
- ]
- Value {
- PlaybackVolume "DAC Playback Volume"
- PlaybackChannels 2
- PlaybackPriority 500
- PlaybackPCM "hw:${CardId},0"
- JackControl "Headphones Jack"
- }
- ConflictingDevice [
- "Speaker"
- ]
-}
diff --git a/device/community/device-pine64-pinebookpro/ucm/rockchip,es8316-codec.conf b/device/community/device-pine64-pinebookpro/ucm/rockchip,es8316-codec.conf
deleted file mode 100644
index 92ee00dc0ec3cd958e11e777a5feeb28985a6fc0..0000000000000000000000000000000000000000
--- a/device/community/device-pine64-pinebookpro/ucm/rockchip,es8316-codec.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Syntax 2
-
-SectionUseCase."HiFi" {
- File "/rockchip_es8316/HiFi"
- Comment "Play high quality music"
-}