conf/ucm: ROCKCHIP-I2S: add Rockchip I2S UCM config.

Taken from the ChromeOS sources, this configuration was tested on Veyron
Jerry based Chromebook from Google.

[Added missing Makefile changes by tiwai]

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/configure.ac b/configure.ac
index 28fcd24..ff340a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -658,6 +658,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
          src/conf/ucm/PAZ00/Makefile \
          src/conf/ucm/GoogleNyan/Makefile \
          src/conf/ucm/broadwell-rt286/Makefile \
+         src/conf/ucm/ROCKCHIP-I2S/Makefile \
          src/conf/topology/Makefile \
          src/conf/topology/broadwell/Makefile \
          modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \

diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index e6a6325..d1d51e5 100644 (file)
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 ROCKCHIP-I2S

diff --git a/src/conf/ucm/ROCKCHIP-I2S/HiFi.conf b/src/conf/ucm/ROCKCHIP-I2S/HiFi.conf
new file mode 100644 (file)
index 0000000..7bfe995
--- /dev/null
+++ b/src/conf/ucm/ROCKCHIP-I2S/HiFi.conf
@@ -0,0 +1,94 @@
+SectionVerb {
+       Value {
+               OutputDspName "speaker_eq"
+               MinBufferLevel "512"
+       }
+
+       EnableSequence [
+               cdev "hw:ROCKCHIPI2S"
+
+               cset "name='Left Speaker Mixer Left DAC Switch' on"
+               cset "name='Right Speaker Mixer Right DAC Switch' on"
+               cset "name='Headphone Left Switch' off"
+               cset "name='Headphone Right Switch' off"
+               cset "name='Digital EQ 3 Band Switch' off"
+               cset "name='Digital EQ 5 Band Switch' off"
+               cset "name='Digital EQ 7 Band Switch' off"
+               cset "name='Biquad Switch' off"
+               cset "name='Filter Mode' Music"
+               cset "name='ADC Oversampling Rate' 0"
+
+               cset "name='DMIC Mux' DMIC"
+               cset "name='MIC2 Mux' IN34"
+               cset "name='Right ADC Mixer MIC2 Switch' on"
+               cset "name='Left ADC Mixer MIC2 Switch' on"
+               cset "name='MIC2 Volume' 20"
+               cset "name='Headset Mic Switch' off"
+               cset "name='Int Mic Switch' on"
+
+               cset "name='ADCR Boost Volume' 4"
+               cset "name='ADCL Boost Volume' 4"
+               cset "name='ADCR Volume' 11"
+               cset "name='ADCL Volume' 11"
+
+               cset "name='Left Speaker Mixer Left DAC Switch' on"
+               cset "name='Right Speaker Mixer Right DAC Switch' on"
+               cset "name='Speaker Left Mixer Volume' 2"
+               cset "name='Speaker Right Mixer Volume' 2"
+               cset "name='Record Path DC Blocking' on"
+               cset "name='Playback Path DC Blocking' on"
+
+               cset "name='Speaker Left Switch' on"
+               cset "name='Speaker Right Switch' on"
+               cset "name='Speaker Switch' on"
+       ]
+
+       DisableSequence [
+       ]
+}
+
+SectionDevice."Headphone".0 {
+       Value {
+               JackName "ROCKCHIP-I2S Headset Jack"
+               OutputDspName ""
+       }
+
+       EnableSequence [
+               cdev "hw:ROCKCHIPI2S"
+
+               cset "name='Speaker Switch' off"
+               cset "name='Headphone Left Switch' on"
+               cset "name='Headphone Right Switch' on"
+       ]
+       DisableSequence [
+               cdev "hw:ROCKCHIPI2S"
+
+               cset "name='Headphone Left Switch' off"
+               cset "name='Headphone Right Switch' off"
+               cset "name='Speaker Switch' on"
+       ]
+}
+
+SectionDevice."Mic".0 {
+       Value {
+               JackName "ROCKCHIP-I2S Headset Jack"
+       }
+
+       EnableSequence [
+               cdev "hw:ROCKCHIPI2S"
+
+               cset "name='Int Mic Switch' off"
+               cset "name='DMIC Mux' ADC"
+               cset "name='Headset Mic Switch' on"
+               cset "name='Record Path DC Blocking' on"
+       ]
+
+       DisableSequence [
+               cdev "hw:ROCKCHIPI2S"
+
+               cset "name='Headset Mic Switch' off"
+               cset "name='DMIC Mux' DMIC"
+               cset "name='Int Mic Switch' on"
+               cset "name='Record Path DC Blocking' off"
+       ]
+}

diff --git a/src/conf/ucm/ROCKCHIP-I2S/Makefile.am b/src/conf/ucm/ROCKCHIP-I2S/Makefile.am
new file mode 100644 (file)
index 0000000..485a740
--- /dev/null
+++ b/src/conf/ucm/ROCKCHIP-I2S/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/ROCKCHIP-I2S
+ucm_DATA = ROCKCHIP-I2S.conf HiFi.conf
+EXTRA_DIST = $(ucm_DATA)

diff --git a/src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf b/src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf
new file mode 100644 (file)
index 0000000..0c399b0
--- /dev/null
+++ b/src/conf/ucm/ROCKCHIP-I2S/ROCKCHIP-I2S.conf
@@ -0,0 +1,6 @@
+Comment "Rockchip card"
+
+SectionUseCase."HiFi" {
+       File "HiFi.conf"
+       Comment "Default"
+}