diff options
author | Jaroslav Kysela <perex@perex.cz> | 2020-06-25 17:09:56 +0200 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2020-06-25 17:14:34 +0200 |
commit | 634e84bb5f5630140c3be4eb30347de2af44128c (patch) | |
tree | 4217f5186fa2a9f90315ba7f4da3d7e3f1edc85e /ucm2 | |
parent | 8069e4df01bd5d18b78110e0aa3f0f149683f62a (diff) |
Pandaboard(ES): move to OMAP/abe-twl6040 tree
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'ucm2')
-rw-r--r-- | ucm2/OMAP/abe-twl6040/FMAnalog.conf (renamed from ucm2/PandaBoard/FMAnalog.conf) | 4 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/HiFi.conf (renamed from ucm2/PandaBoard/HiFi.conf) | 4 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/HiFiLP.conf (renamed from ucm2/PandaBoard/HiFiLP.conf) | 4 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/Record.conf (renamed from ucm2/PandaBoardES/Record.conf) | 3 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/Voice.conf (renamed from ucm2/PandaBoard/Voice.conf) | 4 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/VoiceCall.conf (renamed from ucm2/PandaBoard/VoiceCall.conf) | 4 | ||||
-rw-r--r-- | ucm2/OMAP/abe-twl6040/abe-twl6040.conf (renamed from ucm2/PandaBoard/PandaBoard.conf) | 18 | ||||
-rw-r--r-- | ucm2/PandaBoard/Record.conf | 47 | ||||
-rw-r--r-- | ucm2/PandaBoardES/FMAnalog.conf | 45 | ||||
-rw-r--r-- | ucm2/PandaBoardES/HiFi.conf | 56 | ||||
-rw-r--r-- | ucm2/PandaBoardES/HiFiLP.conf | 46 | ||||
-rw-r--r-- | ucm2/PandaBoardES/PandaBoardES.conf | 43 | ||||
-rw-r--r-- | ucm2/PandaBoardES/Voice.conf | 46 | ||||
-rw-r--r-- | ucm2/PandaBoardES/VoiceCall.conf | 67 | ||||
l--------- | ucm2/module/snd_soc_omap_abe_twl6040.conf | 1 |
15 files changed, 22 insertions, 370 deletions
diff --git a/ucm2/PandaBoard/FMAnalog.conf b/ucm2/OMAP/abe-twl6040/FMAnalog.conf index 1764de9..fa81977 100644 --- a/ucm2/PandaBoard/FMAnalog.conf +++ b/ucm2/OMAP/abe-twl6040/FMAnalog.conf @@ -1,4 +1,4 @@ -# Use case Configurationfor TI PandaBoard HiFi Music +# Use case Configurationfor TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -24,7 +24,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Analog Left Capture Route' 2" diff --git a/ucm2/PandaBoard/HiFi.conf b/ucm2/OMAP/abe-twl6040/HiFi.conf index 5420fa6..597c326 100644 --- a/ucm2/PandaBoard/HiFi.conf +++ b/ucm2/OMAP/abe-twl6040/HiFi.conf @@ -1,4 +1,4 @@ -# Use case Configuration for TI PandaBoard HiFi Music +# Use case Configuration for TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -33,7 +33,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Headset Left Playback' 1" diff --git a/ucm2/PandaBoard/HiFiLP.conf b/ucm2/OMAP/abe-twl6040/HiFiLP.conf index 45c8289..481f238 100644 --- a/ucm2/PandaBoard/HiFiLP.conf +++ b/ucm2/OMAP/abe-twl6040/HiFiLP.conf @@ -1,4 +1,4 @@ -# Use case Configuration for TI PandaBoard HiFi Music +# Use case Configuration for TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -25,7 +25,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Headset Left Playback' 1" diff --git a/ucm2/PandaBoardES/Record.conf b/ucm2/OMAP/abe-twl6040/Record.conf index 15cb311..042e5ce 100644 --- a/ucm2/PandaBoardES/Record.conf +++ b/ucm2/OMAP/abe-twl6040/Record.conf @@ -1,3 +1,4 @@ +# Use case Configuration for TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -25,7 +26,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Analog Left Capture Route' 0" diff --git a/ucm2/PandaBoard/Voice.conf b/ucm2/OMAP/abe-twl6040/Voice.conf index 59cf13c..3eaffb4 100644 --- a/ucm2/PandaBoard/Voice.conf +++ b/ucm2/OMAP/abe-twl6040/Voice.conf @@ -1,4 +1,4 @@ -# Use case Configuration for TI PandaBoard HiFi Music +# Use case Configuration for TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -25,7 +25,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Headset Left Playback' 1" diff --git a/ucm2/PandaBoard/VoiceCall.conf b/ucm2/OMAP/abe-twl6040/VoiceCall.conf index e92af35..4e82e7a 100644 --- a/ucm2/PandaBoard/VoiceCall.conf +++ b/ucm2/OMAP/abe-twl6040/VoiceCall.conf @@ -1,4 +1,4 @@ -# Use case Configuration for TI PandaBoard HiFi Music +# Use case Configuration for TI PandaBoard(ES) HiFi Music # By Liam Girdwood <lrg@slimlogic.co.uk> SectionVerb { @@ -38,7 +38,7 @@ SectionVerb { } SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" + Comment "3.5mm Headset" EnableSequence [ cset "name='Analog Left Capture Route' 0" diff --git a/ucm2/PandaBoard/PandaBoard.conf b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf index b7fbba1..199408f 100644 --- a/ucm2/PandaBoard/PandaBoard.conf +++ b/ucm2/OMAP/abe-twl6040/abe-twl6040.conf @@ -1,43 +1,43 @@ -# UCM configuration for PandaBoard +# UCM configuration for PandaBoard(ES) Syntax 2 SectionUseCase."Record" { - File "Record.conf" + File "/OMAP/abe-twl6040/Record.conf" Comment "Record" } SectionUseCase."HiFi" { - File "HiFi.conf" + File "/OMAP/abe-twl6040/HiFi.conf" Comment "Play HiFi quality Music" } SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" + File "/OMAP/abe-twl6040/HiFiLP.conf" Comment "Play HiFi quality Music in Low Power Mode" } SectionUseCase."Voice" { - File "Voice.conf" + File "/OMAP/abe-twl6040/Voice.conf" Comment "Playback Voice quality" } SectionUseCase."Voice_Low_Power" { - File "Voice.conf" + File "/OMAP/abe-twl6040/Voice.conf" Comment "Playback Voice quality in Low Power Mode" } SectionUseCase."Voice_Call" { - File "VoiceCall.conf" + File "/OMAP/abe-twl6040/VoiceCall.conf" Comment "Capture and Playback in Voice quality" } SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" + File "/OMAP/abe-twl6040/VoiceCall.conf" Comment "Capture and Playback in Voice quality" } SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" + File "/OMAP/abe-twl6040/FMAnalog.conf" Comment "Capture FM Analog Radio" } diff --git a/ucm2/PandaBoard/Record.conf b/ucm2/PandaBoard/Record.conf deleted file mode 100644 index 4a3e477..0000000 --- a/ucm2/PandaBoard/Record.conf +++ /dev/null @@ -1,47 +0,0 @@ -# Use case Configuration for TI PandaBoard HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - DisableSequence [ - # No more AMIC PDM Switch in current kernels - #cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } - -} - -SectionDevice."Headset" { - Comment "PandaBoard 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff --git a/ucm2/PandaBoardES/FMAnalog.conf b/ucm2/PandaBoardES/FMAnalog.conf deleted file mode 100644 index e7eef1f..0000000 --- a/ucm2/PandaBoardES/FMAnalog.conf +++ /dev/null @@ -1,45 +0,0 @@ -# Use case Configurationfor TI PandaBoardES HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='MUX_UL00' 9" - cset "name='MUX_UL01' 10" - cset "name='Capture Volume' 4" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='MUX_UL00' 0" - cset "name='MUX_UL01' 0" - cset "name='Capture Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 2" - cset "name='Analog Right Capture Route' 2" - cset "name='Capture Preamplifier Volume' 2" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } -} diff --git a/ucm2/PandaBoardES/HiFi.conf b/ucm2/PandaBoardES/HiFi.conf deleted file mode 100644 index 99b3cb4..0000000 --- a/ucm2/PandaBoardES/HiFi.conf +++ /dev/null @@ -1,56 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId}" - # PlaybackVolume "name='DL1 Media Playback Volume' 90,90" - # PlaybackSwitch "name='DL1 PDM Switch' 1" - } -} diff --git a/ucm2/PandaBoardES/HiFiLP.conf b/ucm2/PandaBoardES/HiFiLP.conf deleted file mode 100644 index ccde316..0000000 --- a/ucm2/PandaBoardES/HiFiLP.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Multimedia' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Media Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Multimedia' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Media Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Music" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},6" - } -} diff --git a/ucm2/PandaBoardES/PandaBoardES.conf b/ucm2/PandaBoardES/PandaBoardES.conf deleted file mode 100644 index 946c2cf..0000000 --- a/ucm2/PandaBoardES/PandaBoardES.conf +++ /dev/null @@ -1,43 +0,0 @@ -# UCM configuration for PandaBoardES - -Syntax 2 - -SectionUseCase."Record" { - File "Record.conf" - Comment "Record" -} - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Play HiFi quality Music" -} - -SectionUseCase."HiFi_Low_Power" { - File "HiFiLP.conf" - Comment "Play HiFi quality Music in Low Power Mode" -} - -SectionUseCase."Voice" { - File "Voice.conf" - Comment "Playback Voice quality." -} - -SectionUseCase."Voice_Low_Power" { - File "Voice.conf" - Comment "Playback Voice quality in Low Power Mode" -} - -SectionUseCase."Voice_Call" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."Voice_Call_IP" { - File "VoiceCall.conf" - Comment "Capture and Playback in Voice quality" -} - -SectionUseCase."FM_Analog_Radio" { - File "FMAnalog.conf" - Comment "Capture FM Analog Radio" -} diff --git a/ucm2/PandaBoardES/Voice.conf b/ucm2/PandaBoardES/Voice.conf deleted file mode 100644 index b290d75..0000000 --- a/ucm2/PandaBoardES/Voice.conf +++ /dev/null @@ -1,46 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='SDT DL Volume' 120" - ] - - DisableSequence [ - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff --git a/ucm2/PandaBoardES/VoiceCall.conf b/ucm2/PandaBoardES/VoiceCall.conf deleted file mode 100644 index ce3991b..0000000 --- a/ucm2/PandaBoardES/VoiceCall.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Use case Configuration for TI PandaBoardES HiFi Music -# By Liam Girdwood <lrg@slimlogic.co.uk> - -SectionVerb { - EnableSequence [ - cset "name='AMIC_UL PDM Switch' 1" - cset "name='Sidetone Mixer Capture' 1" - cset "name='MUX_VX0' 9" - cset "name='MUX_VX1' 10" - cset "name='DL1 Mixer Voice' 1" - cset "name='Sidetone Mixer Playback' 1" - cset "name='DL1 PDM Switch' 1" - cset "name='DL1 Voice Playback Volume' 90,90" - cset "name='Capture Volume' 4" - cset "name='Capture Mixer Voice Capture' 90,90" - cset "name='SDT DL Volume' 120" - ] - - - DisableSequence [ - cset "name='AMIC_UL PDM Switch' 0" - cset "name='Sidetone Mixer Capture' 0" - cset "name='MUX_VX0' 0" - cset "name='MUX_VX1' 0" - cset "name='DL1 Mixer Voice' 0" - cset "name='Sidetone Mixer Playback' 0" - cset "name='DL1 PDM Switch' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='Capture Volume' 0" - cset "name='DL1 Voice Playback Volume' 0,0" - cset "name='SDT DL Volume' 0" - ] - - # Optional TQ and ALSA PCMs - Value { - TQ "Voice" - } -} - -SectionDevice."Headset" { - Comment "PandaBoardES 3.5mm Headset" - - EnableSequence [ - cset "name='Analog Left Capture Route' 0" - cset "name='Analog Right Capture Route' 0" - cset "name='Capture Preamplifier Volume' 2" - cset "name='Headset Left Playback' 1" - cset "name='Headset Right Playback' 1" - cset "name='Headset Playback Volume' 13" - ] - - DisableSequence [ - cset "name='Analog Left Capture Route' 3" - cset "name='Analog Right Capture Route' 3" - cset "name='Capture Preamplifier Volume' 0" - cset "name='Headset Right Playback' 0" - cset "name='Headset Left Playback' 0" - cset "name='Headset Playback Volume' 0" - ] - - Value { - CapturePriority 100 - CapturePCM "hw:${CardId},2" - PlaybackPriority 100 - PlaybackPCM "hw:${CardId},2" - } -} diff --git a/ucm2/module/snd_soc_omap_abe_twl6040.conf b/ucm2/module/snd_soc_omap_abe_twl6040.conf new file mode 120000 index 0000000..0e70a9e --- /dev/null +++ b/ucm2/module/snd_soc_omap_abe_twl6040.conf @@ -0,0 +1 @@ +../OMAP/abe-twl6040/abe-twl6040.conf
\ No newline at end of file |