]> git.alsa-project.org Git - alsa-ucm-conf.git/commitdiff
ucm2: Rockchip: rk817: Add ALSA UCM support
authorChris Morgan <macromorgan@hotmail.com>
Fri, 24 Feb 2023 19:33:20 +0000 (13:33 -0600)
committerJaroslav Kysela <perex@perex.cz>
Thu, 2 Mar 2023 13:37:34 +0000 (14:37 +0100)
Add ALSA-UCM support for the Rockchip RK817 audio codec. This codec
is typically configured either with an internal or external amplifier
as reflected by the longname. This configuration has been tested on
the Anbernic RG353P (rk817_ext) and the Odroid Go Advance (rk817_int).

Changes from V1:
 - Use a constant to control if the output mux is set to HP or SPK.

Link: https://lore.kernel.org/alsa-devel/20230224193320.1503-1-macroalpha82@gmail.com/
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
ucm2/Rockchip/rk817-sound/HiFi.conf [new file with mode: 0644]
ucm2/Rockchip/rk817-sound/rk817-sound.conf [new file with mode: 0644]
ucm2/conf.d/simple-card/rk817_ext.conf [new symlink]
ucm2/conf.d/simple-card/rk817_int.conf [new symlink]

diff --git a/ucm2/Rockchip/rk817-sound/HiFi.conf b/ucm2/Rockchip/rk817-sound/HiFi.conf
new file mode 100644 (file)
index 0000000..8d90567
--- /dev/null
@@ -0,0 +1,68 @@
+Define.pbk_mux "SPK"
+
+If.1 {
+       Condition {
+               Type ControlExists
+               Control "name='Internal Speakers Switch'"
+       }
+
+       True {
+               Define.pbk_mux "HP"
+               SectionDevice."Speaker".EnableSequence [
+                       cset "name='Internal Speakers Switch' on"
+               ]
+
+               SectionDevice."Speaker".DisableSequence [
+                       cset "name='Internal Speakers Switch' off"
+               ]
+       }
+}
+
+SectionDevice."Speaker" {
+       Comment "Internal Speaker"
+
+       EnableSequence [
+               cset "name='Playback Mux' ${var:pbk_mux}"
+       ]
+
+       Value {
+               PlaybackMixerElem "Master Playback Volume"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+       }
+
+       ConflictingDevice [
+               "Headphones"
+       ]
+}
+
+SectionDevice."Mic" {
+       Comment "Microphone"
+
+       Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureMixerElem "Mic Capture Gain"
+               CaptureMasterElem "Master Capture Volume"
+       }
+}
+
+SectionDevice."Headphones" {
+       Comment "Headphones"
+
+       EnableSequence [
+               cset "name='Playback Mux' HP"
+       ]
+
+       Value {
+               PlaybackMixerElem "Master Playback Volume"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+               JackControl "Headphones Jack"
+               JackHWMute "Speaker"
+       }
+
+       ConflictingDevice [
+               "Speaker"
+       ]
+}
diff --git a/ucm2/Rockchip/rk817-sound/rk817-sound.conf b/ucm2/Rockchip/rk817-sound/rk817-sound.conf
new file mode 100644 (file)
index 0000000..90ec794
--- /dev/null
@@ -0,0 +1,6 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+       File "/Rockchip/rk817-sound/HiFi.conf"
+       Comment "Play HiFi quality music"
+}
diff --git a/ucm2/conf.d/simple-card/rk817_ext.conf b/ucm2/conf.d/simple-card/rk817_ext.conf
new file mode 120000 (symlink)
index 0000000..6fa8db7
--- /dev/null
@@ -0,0 +1 @@
+../../Rockchip/rk817-sound/rk817-sound.conf
\ No newline at end of file
diff --git a/ucm2/conf.d/simple-card/rk817_int.conf b/ucm2/conf.d/simple-card/rk817_int.conf
new file mode 120000 (symlink)
index 0000000..6fa8db7
--- /dev/null
@@ -0,0 +1 @@
+../../Rockchip/rk817-sound/rk817-sound.conf
\ No newline at end of file