At Tue, 23 Sep 2014 19:53:43 +0400, zombah wrote:
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
Thanks, applied.
Takashi
configure.ac | 1 + src/conf/ucm/Makefile.am | 2 +- src/conf/ucm/PAZ00/HiFi.conf | 45 +++++++++++++++++++++++++++++ src/conf/ucm/PAZ00/Makefile.am | 4 +++ src/conf/ucm/PAZ00/PAZ00.conf | 39 +++++++++++++++++++++++++ src/conf/ucm/PAZ00/Record.conf | 65 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 src/conf/ucm/PAZ00/HiFi.conf create mode 100644 src/conf/ucm/PAZ00/Makefile.am create mode 100644 src/conf/ucm/PAZ00/PAZ00.conf create mode 100644 src/conf/ucm/PAZ00/Record.conf
diff --git a/configure.ac b/configure.ac index b8353a0..734163c 100644 --- a/configure.ac +++ b/configure.ac @@ -653,6 +653,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/PandaBoardES/Makefile \ src/conf/ucm/SDP4430/Makefile \ src/conf/ucm/tegraalc5632/Makefile \
src/conf/ucm/PAZ00/Makefile \diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index e089dde..bde89df 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 0000000..275516d --- /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 speakercset "name='Int Spk Switch' off"# Headphonescset "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"# Headphonescset "name='Headphone Playback Switch' off"cset "name='HPL Mix DACL2HP Playback Switch' off"cset "name='HPR Mix DACR2HP Playback Switch' off"# Internal speakercset "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 0000000..1bf98a6 --- /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 0000000..8b9d904 --- /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 volumescset "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 0000000..568e2fb --- /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 speakercset "name='Int Spk Switch' off"# Internal miccset "name='DMIC En Capture Switch' off"# Headphonescset "name='Headphone Playback Switch' on"cset "name='HPL Mix DACL2HP Playback Switch' on"cset "name='HPR Mix DACR2HP Playback Switch' on"# External mincset "name='Left Capture Mix MIC12REC_L Capture Switch' on"- ]
- DisableSequence [
cdev "hw:PAZ00"# Headphonescset "name='Headphone Playback Switch' off"cset "name='HPL Mix DACL2HP Playback Switch' off"cset "name='HPR Mix DACR2HP Playback Switch' off"# External miccset "name='Left Capture Mix MIC12REC_L Capture Switch' on"# Internal speakercset "name='Int Spk Switch' on"# Internal miccset "name='DMIC En Capture Switch' on"- ]
+}
2.0.1
Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel