Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xiaomi-santoni: update UCM to UCM2 and improvements (!1039)

Browse source 
Audio stopped working after alsa-lib-1.2.1, this patch fixes it
by adapting it to ucm2 format.

As well as some improvements to HiFi:
- Remove SpeakerMic as it was just HandsetMic without conflict
with Speaker
- Remove some unnecessary conflicts with ports
- Add input/output priorities

Co-Authored-By: Asriel Dreemurr <asriel.danctnix@gmail.com>
This commit is contained in:
Danct12 2020-03-06 14:02:36 +07:00 • committed by Minecrell
parent f332c7d29e
commit 4e794694a3
No known key found for this signature in database
GPG key ID: B77CE638A6C2E562
3 changed files with 16 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

10
device/device-xiaomi-santoni/APKBUILD
View file

@ -8,7 +8,7 @@
pkgname="device-xiaomi-santoni"
pkgdesc="Xiaomi Redmi 4X"
pkgver=0.5
pkgrel=4
pkgrel=5
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
@ -63,9 +63,9 @@ nonfree_firmware() {
# Install UCM files for santoni
install -Dm644 "$srcdir"/HiFi \
"$subpkgdir"/usr/share/alsa/ucm/msm8920-sku7-snd-card/HiFi
"$subpkgdir"/usr/share/alsa/ucm2/msm8920-sku7-snd-card/HiFi
install -Dm644 "$srcdir"/msm8920-sku7-snd-card.conf \
"$subpkgdir"/usr/share/alsa/ucm/msm8920-sku7-snd-card/msm8920-sku7-snd-card.conf
"$subpkgdir"/usr/share/alsa/ucm2/msm8920-sku7-snd-card/msm8920-sku7-snd-card.conf
install -Dm644 "$srcdir"/90-device-xiaomi-santoni-audio.rules \
"$subpkgdir"/etc/udev/rules.d/90-device-xiaomi-santoni-audio.rules
}
@ -109,8 +109,8 @@ sha512sums="dc68956408da82ac9775f23814fb6e1498e65a4c760ceda369a60a202cfc92ad2776
c4853babd5cd6371297e5e5d64364c064d540cd4beaba06d79b1001fe5c78fe3ee8bc5f6f4ba3e383743a09263028abc55f41bad45240b1c505e27ed087725c9 charging.sh
6012be4184af6c4f12f9b20a6f2d377ebd72b9b334df4fbb921ed9d8da865633631f77d19b02748ebee70442e2f3ffcb6af511ee5deaa40635bc53730c301076 discharging.sh
dc4bf7871307e659f220aebc3c9f7d74b861f46e1f3df1be37d724af984e46d91e553dbd36c2bd4482aa17dbe4d76d28dabe214952638f00830907466b110146 90-device-xiaomi-santoni-audio.rules
1d2f98a9570212d3026c9565754337574ae046ad4de90265029b7e4a7cd4a2df473ca18ea41d1730f0a01046b40d343446fc88f5d70a1050e0dc578ad460f941 HiFi
6cbe9079b6eb1fc889fbb13d8b3da620b39abde3e93e2301601e5416fda8b768aa11876238378af6571ddc3c4ce662dd49f1491cbe8b96153451ffdc7b761926 msm8920-sku7-snd-card.conf
3452fe367e7b199d610fb3d8e9113b35e04071afc7585080edb6fe584ecc29591d8f3ab53ed4583c1ccea5882aa51050d6e56a5db7ef88f6c9af648ba1ef88af HiFi
7c702cf159699cea761ce7cb1ca21b79c59ceb3cdf1e410b537c4aa3a5aaa3be171b4c5555a713ac7a0e0f6dc389680cd5368a7783d14025fdc14d5f27fb922b msm8920-sku7-snd-card.conf
14fbe0d7a1e96c87c54df12450bfc03bae8e2e2ea681649a9ef258498d54b3c130b29cd02cec86906f1445d26139dd0ce5dbb559724540dc6d0f038533ef4a3f deviceinfo
3db3ec596e159be926ea2b5b2496c18e9bc7be24a64a232a56c89a0c9ee710aa2efb2b6fa9fc08efa34759e8242e6c629d08a4ce688ec8aa125830717c191515 directfbrc
b634d13cac1f10535a31c142c7391986ab402ae9910d8093989920f4c2dbd63722ee8595f11962bffd9d314e2835a1ead955a91355856f044911ddcf1e428427 fb.modes"

60
device/device-xiaomi-santoni/ucm/HiFi
View file

@ -22,10 +22,7 @@ SectionVerb {
}
SectionDevice."Speaker" {
Comment "Speaker"
ConflictingDevice [
]
Comment "Internal speaker"
EnableSequence [
cdev "hw:msm8920sku7sndc"
@ -51,6 +48,7 @@ SectionDevice."Speaker" {
Value {
PlaybackChannels "2"
PlaybackPriority 300
}
}
@ -58,9 +56,6 @@ SectionDevice."Speaker" {
SectionDevice."Headphones" {
Comment "Headset"
ConflictingDevice [
]
EnableSequence [
cdev "hw:msm8920sku7sndc"
@ -89,18 +84,13 @@ SectionDevice."Headphones" {
Value {
PlaybackChannels "2"
PlaybackPriority 100
}
}
SectionDevice."Handset" {
Comment "Handset earpiece"
ConflictingDevice [
"Speaker"
"SpeakerMic"
"Headphones"
]
Comment "Earpiece speaker"
EnableSequence [
cdev "hw:msm8920sku7sndc"
@ -126,48 +116,15 @@ SectionDevice."Handset" {
Value {
PlaybackChannels "2"
PlaybackPriority 200
}
}
SectionDevice."HandsetMic" {
Comment "Handset microphone"
Comment "Internal Microphone"
ConflictingDevice [
"Speaker"
"SpeakerMic"
"HeadsetMic"
]
EnableSequence [
cdev "hw:msm8920sku7sndc"
cset "name='ADC1 Volume' 6"
cset "name='DEC1 MUX' ADC1"
cset "name='IIR1 INP1 MUX' DEC1"
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 1"
]
DisableSequence [
cdev "hw:msm8920sku7sndc"
cset "name='ADC1 Volume' 4"
cset "name='DEC1 MUX' ZERO"
cset "name='MultiMedia1 Mixer TERT_MI2S_TX' 0"
]
Value {
CaptureChannels "2"
}
}
SectionDevice."SpeakerMic" {
Comment "Handset microphone for speaker-mode"
ConflictingDevice [
"Handset"
"HandsetMic"
"HeadsetMic"
]
@ -189,17 +146,17 @@ SectionDevice."SpeakerMic" {
]
Value {
CapturePriority 500
CaptureChannels "2"
}
}
SectionDevice."HeadsetMic" {
Comment "Headset microphone"
Comment "Headset Microphone"
ConflictingDevice [
"HandsetMic"
"SpeakerMic"
]
EnableSequence [
@ -222,6 +179,7 @@ SectionDevice."HeadsetMic" {
]
Value {
CapturePriority 100
CaptureChannels "2"
}

2
device/device-xiaomi-santoni/ucm/msm8920-sku7-snd-card.conf
View file

@ -1,3 +1,5 @@
Syntax 2
SectionUseCase."HiFi" {
File "HiFi"
}