forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

pine64-pinephone: align more closely to ALSA UCM specification (MR 1204)

Browse source 
Some of the recommendations have changed upstream and a few devices
should be called differently now. The following changes are made:

  - Headphone -> Headphone*s*
    (29041c5220/include/use-case.h (L136))
  - DigitalMic -> Mic
    (1ad660ddee)
  - HeadsetMic -> Headset
    (29041c5220/include/use-case.h (L137))
  - Add .conf suffix for verb configurations
  - Set Playback/CaptureChannels as integer, not as string
  - Remove empty Enable/DisableSequence sections
    (d6a150d34f)
This commit is contained in:
Minecrell 2020-05-02 18:18:35 +02:00
parent 31804500cc
commit 94e11e17e9
No known key found for this signature in database
GPG key ID: B77CE638A6C2E562
4 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
device/testing/device-pine64-pinephone/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=device-pine64-pinephone pkgname=device-pine64-pinephone
pkgdesc="PINE64 PinePhone" pkgdesc="PINE64 PinePhone"
pkgver=0.2 pkgver=0.2
pkgrel=8 pkgrel=9
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -23,8 +23,8 @@ source="
gpsd_device-hook.sh gpsd_device-hook.sh
90-modem-eg25.rules 90-modem-eg25.rules
ucm/sun50i-a64-audio.conf ucm/sun50i-a64-audio.conf
ucm/HiFi ucm/HiFi.conf
ucm/VoiceCall ucm/VoiceCall.conf
eg25.initd eg25.initd
setup-modem-audio.sh setup-modem-audio.sh
setup-modem-audio.initd setup-modem-audio.initd
@ -58,10 +58,10 @@ package() {
# Alsa usecase manager config # Alsa usecase manager config
install -D -m644 "$srcdir"/sun50i-a64-audio.conf \ install -D -m644 "$srcdir"/sun50i-a64-audio.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/sun50i-a64-audio.conf "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/sun50i-a64-audio.conf
install -D -m644 "$srcdir"/HiFi \ install -D -m644 "$srcdir"/HiFi.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/HiFi "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/HiFi.conf
install -D -m644 "$srcdir"/VoiceCall \ install -D -m644 "$srcdir"/VoiceCall.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/VoiceCall "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audio/VoiceCall.conf
# Modem # Modem
install -Dm755 "$srcdir"/eg25.initd "$pkgdir"/etc/init.d/eg25 install -Dm755 "$srcdir"/eg25.initd "$pkgdir"/etc/init.d/eg25
@ -84,9 +84,9 @@ c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd91
1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd gpsd_pinephone.initd 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd gpsd_pinephone.initd
ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648 gpsd_device-hook.sh ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648 gpsd_device-hook.sh
aa0b7191548e89ddfc6cf5b1f637c7ee7ab4c2025cbfc6328e7e482e5b179ea072779ca332a18094e3d424708b923c2334210591fc369831426992f540c07abc 90-modem-eg25.rules aa0b7191548e89ddfc6cf5b1f637c7ee7ab4c2025cbfc6328e7e482e5b179ea072779ca332a18094e3d424708b923c2334210591fc369831426992f540c07abc 90-modem-eg25.rules
08a019cad26a8cb298e26ab5b9360b90b981d15f8562d434a00762e4ba14e16ae11cf5e516385aa5b428b0e8b310caee1e8ef7a40bafd66ffe8dde3026c6e17e sun50i-a64-audio.conf e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012 sun50i-a64-audio.conf
b93d06efb23ab3c715494d79533bdd3e09ebf49b2d2bea4bcaac2a980d33ffa8d6cbe5c6f0673aa63b0fc926e2c50858fb24f23ed1cbaaf715568c33caf983fc HiFi 03e2ed3a4212c0ed336586de38b4882c1bb640e04d34dc63ec218c80ff7046c19aaf82c8cdb48db4d3d42f6124addc16b689fd686a90a0f3174c586d1f50e6f2 HiFi.conf
6fc5b8eec52b6d81ff7ff57f96e66eb1f49ae61816ede80ae95c54d696bb25c8c4d9f7c44ea4bee3f7e2fa8e6f3a7a9b997ca9188ccf7f45e85f026b039f7ccd VoiceCall d44307c4cbd1fcd4846d30bc1e72800ebd4cbc43fe75e896a501dff06f1b3df21385a009ba5f81ed3f19a5e039bd082da3a88efdf3c034089c8fff3bc16e0a7a VoiceCall.conf
5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35 eg25.initd 5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35 eg25.initd
dc110f617efe28df3001630836c7df0cab20e74e99c4bb9d2c2f86367ae024dd30060e8c051c7be0e66e86f4656bef345189a6c13276808c4301d1a6deb8be7d setup-modem-audio.sh dc110f617efe28df3001630836c7df0cab20e74e99c4bb9d2c2f86367ae024dd30060e8c051c7be0e66e86f4656bef345189a6c13276808c4301d1a6deb8be7d setup-modem-audio.sh
dadfb8ceb7a82fd4a684a0fd4459bfdf0330fccc1d1781dd8549ee9ab5d571b97ee1e5b8dde66ec85e08db410e2d66e63f9da3d0c327ee80bd8303bf81d03eaf setup-modem-audio.initd" dadfb8ceb7a82fd4a684a0fd4459bfdf0330fccc1d1781dd8549ee9ab5d571b97ee1e5b8dde66ec85e08db410e2d66e63f9da3d0c327ee80bd8303bf81d03eaf setup-modem-audio.initd"

24
device/testing/device-pine64-pinephone/ucm/HiFi → device/testing/device-pine64-pinephone/ucm/HiFi.conf
View file

@ -39,8 +39,7 @@ SectionVerb {
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
] ]
DisableSequence [
]
Value { Value {
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
@ -62,7 +61,7 @@ SectionDevice."Speaker" {
Value { Value {
PlaybackVolume "Line Out Playback Volume" PlaybackVolume "Line Out Playback Volume"
PlaybackSwitch "Line Out Playback Switch" PlaybackSwitch "Line Out Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 300 PlaybackPriority 300
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
@ -82,15 +81,15 @@ SectionDevice."Earpiece" {
Value { Value {
PlaybackVolume "Earpiece Playback Volume" PlaybackVolume "Earpiece Playback Volume"
PlaybackSwitch "Earpiece Playback Switch" PlaybackSwitch "Earpiece Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 200 PlaybackPriority 200
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
} }
SectionDevice."DigitalMic" { SectionDevice."Mic" {
Comment "Internal Microphone" Comment "Internal Microphone"
ConflictingDevice [ ConflictingDevice [
"HeadsetMic" "Headset"
] ]
EnableSequence [ EnableSequence [
cset "name='Mic1 Capture Switch' on" cset "name='Mic1 Capture Switch' on"
@ -101,13 +100,13 @@ SectionDevice."DigitalMic" {
Value { Value {
CapturePriority 500 CapturePriority 500
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
CaptureChannels "2" CaptureChannels 2
} }
} }
SectionDevice."HeadsetMic" { SectionDevice."Headset" {
Comment "Headset Microphone" Comment "Headset Microphone"
ConflictingDevice [ ConflictingDevice [
"DigitalMic" "Mic"
] ]
EnableSequence [ EnableSequence [
cset "name='Mic2 Capture Switch' on" cset "name='Mic2 Capture Switch' on"
@ -118,10 +117,10 @@ SectionDevice."HeadsetMic" {
Value { Value {
CapturePriority 100 CapturePriority 100
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
CaptureChannels "2" CaptureChannels 2
} }
} }
SectionDevice."Headphone" { SectionDevice."Headphones" {
Comment "Headset" Comment "Headset"
EnableSequence [ EnableSequence [
cset "name='AIF1 DA0 Stereo Playback Route' Stereo" cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
@ -136,9 +135,8 @@ SectionDevice."Headphone" {
Value { Value {
PlaybackVolume "Headphone Playback Volume" PlaybackVolume "Headphone Playback Volume"
PlaybackSwitch "Headphone Playback Switch" PlaybackSwitch "Headphone Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 100 PlaybackPriority 100
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
} }

24
device/testing/device-pine64-pinephone/ucm/VoiceCall → device/testing/device-pine64-pinephone/ucm/VoiceCall.conf
View file

@ -41,8 +41,7 @@ SectionVerb {
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off" cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
] ]
DisableSequence [
]
Value { Value {
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
@ -64,7 +63,7 @@ SectionDevice."Speaker" {
Value { Value {
PlaybackVolume "Line Out Playback Volume" PlaybackVolume "Line Out Playback Volume"
PlaybackSwitch "Line Out Playback Switch" PlaybackSwitch "Line Out Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 300 PlaybackPriority 300
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
@ -84,15 +83,15 @@ SectionDevice."Earpiece" {
Value { Value {
PlaybackVolume "Earpiece Playback Volume" PlaybackVolume "Earpiece Playback Volume"
PlaybackSwitch "Earpiece Playback Switch" PlaybackSwitch "Earpiece Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 500 PlaybackPriority 500
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
} }
SectionDevice."DigitalMic" { SectionDevice."Mic" {
Comment "Internal Microphone" Comment "Internal Microphone"
ConflictingDevice [ ConflictingDevice [
"HeadsetMic" "Headset"
] ]
EnableSequence [ EnableSequence [
cset "name='Mic1 Capture Switch' on" cset "name='Mic1 Capture Switch' on"
@ -103,13 +102,13 @@ SectionDevice."DigitalMic" {
Value { Value {
CapturePriority 200 CapturePriority 200
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
CaptureChannels "2" CaptureChannels 2
} }
} }
SectionDevice."HeadsetMic" { SectionDevice."Headset" {
Comment "Headset Microphone" Comment "Headset Microphone"
ConflictingDevice [ ConflictingDevice [
"DigitalMic" "Mic"
] ]
EnableSequence [ EnableSequence [
cset "name='Mic2 Capture Switch' on" cset "name='Mic2 Capture Switch' on"
@ -120,10 +119,10 @@ SectionDevice."HeadsetMic" {
Value { Value {
CapturePriority 100 CapturePriority 100
CapturePCM "hw:${CardId},0" CapturePCM "hw:${CardId},0"
CaptureChannels "2" CaptureChannels 2
} }
} }
SectionDevice."Headphone" { SectionDevice."Headphones" {
Comment "Headset" Comment "Headset"
EnableSequence [ EnableSequence [
cset "name='AIF1 DA0 Stereo Playback Route' Stereo" cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
@ -138,9 +137,8 @@ SectionDevice."Headphone" {
Value { Value {
PlaybackVolume "Headphone Playback Volume" PlaybackVolume "Headphone Playback Volume"
PlaybackSwitch "Headphone Playback Switch" PlaybackSwitch "Headphone Playback Switch"
PlaybackChannels "2" PlaybackChannels 2
PlaybackPriority 100 PlaybackPriority 100
PlaybackPCM "hw:${CardId},0" PlaybackPCM "hw:${CardId},0"
} }
} }

5
device/testing/device-pine64-pinephone/ucm/sun50i-a64-audio.conf
View file

@ -1,12 +1,11 @@
Syntax 2 Syntax 2
SectionUseCase."HiFi" { SectionUseCase."HiFi" {
File "HiFi" File "HiFi.conf"
Comment "Play HiFi quality music" Comment "Play HiFi quality music"
} }
SectionUseCase."Voice Call" { SectionUseCase."Voice Call" {
File "VoiceCall" File "VoiceCall.conf"
Comment "Make a phone call" Comment "Make a phone call"
} }