diff options
author | zombah <zombah@gmail.com> | 2014-09-23 19:53:43 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-07 18:13:27 +0200 |
commit | 24b4e86ddc512acb6b26f97cb958d59586482fb7 (patch) | |
tree | d738aa51a0cd2f9b31b6092ad9cd5802d9745a6b /src/conf | |
parent | 7c1f36dbcbe8d60c6f90cbcf7e2e801cacbcd535 (diff) | |
download | alsa-lib-24b4e86ddc512acb6b26f97cb958d59586482fb7.tar.gz |
conf/ucm: PAZ00: add Toshiba AC100/Dynabook AZ new config
Recent mainline kernels threat Toshiba AC100 audio hardware as hw:PAZ00
vs old hw:tegraalc5632.
This patch adds config files for new hw name and include them to
makefiles.
Signed-off-by: zombah <zombah@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src/conf')
-rw-r--r-- | src/conf/ucm/Makefile.am | 2 | ||||
-rw-r--r-- | src/conf/ucm/PAZ00/HiFi.conf | 45 | ||||
-rw-r--r-- | src/conf/ucm/PAZ00/Makefile.am | 4 | ||||
-rw-r--r-- | src/conf/ucm/PAZ00/PAZ00.conf | 39 | ||||
-rw-r--r-- | src/conf/ucm/PAZ00/Record.conf | 65 |
5 files changed, 154 insertions, 1 deletions
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index e089dde7..bde89dfe 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -1 +1 @@ -SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 +SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 diff --git a/src/conf/ucm/PAZ00/HiFi.conf b/src/conf/ucm/PAZ00/HiFi.conf new file mode 100644 index 00000000..275516d6 --- /dev/null +++ b/src/conf/ucm/PAZ00/HiFi.conf @@ -0,0 +1,45 @@ +SectionVerb { + EnableSequence [ + cdev "hw:PAZ00" + + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + ] + DisableSequence [ + cset "name='Speaker Playback Switch' off" + cset "name='Int Spk Switch' off" + cset "name='Speaker Mix DAC2SPK Playback Switch' off" + ] +} + +SectionDevice."Headset".0 { + Comment "3.5mm Headset" + + Value { + JackName "Paz00 Headset Jack" + } + + EnableSequence [ + cdev "hw:PAZ00" + + # Internal speaker + cset "name='Int Spk Switch' off" + + # Headphones + cset "name='Headphone Playback Switch' on" + cset "name='HPL Mix DACL2HP Playback Switch' on" + cset "name='HPR Mix DACR2HP Playback Switch' on" + ] + DisableSequence [ + cdev "hw:PAZ00" + + # Headphones + cset "name='Headphone Playback Switch' off" + cset "name='HPL Mix DACL2HP Playback Switch' off" + cset "name='HPR Mix DACR2HP Playback Switch' off" + + # Internal speaker + cset "name='Int Spk Switch' on" + ] +} diff --git a/src/conf/ucm/PAZ00/Makefile.am b/src/conf/ucm/PAZ00/Makefile.am new file mode 100644 index 00000000..1bf98a67 --- /dev/null +++ b/src/conf/ucm/PAZ00/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/PAZ00 +ucm_DATA = PAZ00.conf HiFi.conf Record.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/PAZ00/PAZ00.conf b/src/conf/ucm/PAZ00/PAZ00.conf new file mode 100644 index 00000000..8b9d9043 --- /dev/null +++ b/src/conf/ucm/PAZ00/PAZ00.conf @@ -0,0 +1,39 @@ +Comment "PAZ00 alc5632" + +ValueDefaults { + PlaybackCTL "hw:0" + CaptureCTL "hw:0" +} + +SectionDefaults [ + cdev "hw:PAZ00" + + cset "name='Master Playback Switch' on" + cset "name='Master Playback Volume' 44,44" + cset "name='Headphone Playback Volume' 21,21" + cset "name='Speaker Playback Volume' 21,21" + cset "name='SpeakerOut Mux' 2" + cset "name='SpeakerOut N Mux' LN/-R" + cset "name='AB-D Amp Mux' 0" + cset "name='Left Headphone Mux' 1" + cset "name='Right Headphone Mux' 1" + cset "name='DMIC Boost Capture Volume' 4" + cset "name='Rec Capture Volume' 24" + + # Fix external mic record volumes + cset "name='Mic 1 Boost Volume' 0" + cset "name='Mic 2 Boost Volume' 0" + cset "name='Mic1 Playback Volume' 0" + cset "name='Mic2 Playback Volume' 0" + cset "name='Rec Capture Volume' 0" +] + +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Music playback" +} + +SectionUseCase."Record" { + File "Record.conf" + Comment "Playback and capture" +} diff --git a/src/conf/ucm/PAZ00/Record.conf b/src/conf/ucm/PAZ00/Record.conf new file mode 100644 index 00000000..568e2fbd --- /dev/null +++ b/src/conf/ucm/PAZ00/Record.conf @@ -0,0 +1,65 @@ +SectionVerb { + EnableSequence [ + cdev "hw:PAZ00" + + cset "name='Speaker Playback Switch' on" + cset "name='Int Spk Switch' on" + cset "name='Speaker Mix DAC2SPK Playback Switch' on" + + cset "name='DMICL Mix DMICL2ADC Capture Switch' on" + cset "name='DMIC En Capture Switch' on" + cset "name='DMIC PreFilter Capture Switch' on" + ] + DisableSequence [ + cset "name='Speaker Playback Switch' off" + cset "name='Int Spk Switch' off" + cset "name='Speaker Mix DAC2SPK Playback Switch' off" + + cset "name='DMICL Mix DMICL2ADC Capture Switch' off" + cset "name='DMIC En Capture Switch' off" + cset "name='DMIC PreFilter Capture Switch' off" + ] +} + +SectionDevice."Headset".0 { + Comment "3.5mm Headset" + + Value { + JackName "Paz00 Headset Jack" + } + + EnableSequence [ + cdev "hw:PAZ00" + + # Internal speaker + cset "name='Int Spk Switch' off" + + # Internal mic + cset "name='DMIC En Capture Switch' off" + + # Headphones + cset "name='Headphone Playback Switch' on" + cset "name='HPL Mix DACL2HP Playback Switch' on" + cset "name='HPR Mix DACR2HP Playback Switch' on" + + # External min + cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" + ] + DisableSequence [ + cdev "hw:PAZ00" + + # Headphones + cset "name='Headphone Playback Switch' off" + cset "name='HPL Mix DACL2HP Playback Switch' off" + cset "name='HPR Mix DACR2HP Playback Switch' off" + + # External mic + cset "name='Left Capture Mix MIC12REC_L Capture Switch' on" + + # Internal speaker + cset "name='Int Spk Switch' on" + + # Internal mic + cset "name='DMIC En Capture Switch' on" + ] +} |