diff options
author | Jon Flatley <jflat@chromium.org> | 2019-07-09 18:00:42 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-07-16 18:00:09 -0700 |
commit | 050a8fef9dacd068999a7378ff7c769649ce465d (patch) | |
tree | 670d85187883a4a2bf6d288555a3572ebb0f10f1 /ucm-config | |
parent | 411b43c6da20258584ad209b2d978fbf1d6831b5 (diff) | |
download | adhd-050a8fef9dacd068999a7378ff7c769649ce465d.tar.gz |
auron: Move configs to overlays
Moves the audio configs for the auron variant boards to the overlays and
removes the configs for the dead auron base board.
BUG=b:133863113, b:133861656
TEST=./build_packages --board auron_paine && ./build_packages --board \
auron_yuna
Cq-Depend: chromium:1693880, chromium:1694361
Change-Id: Ib2f0d17a98c73ce08864d6083f284a3743e54931
Reviewed-on: https://chromium-review.googlesource.com/1693891
Tested-by: Jon Flatley <jflat@chromium.org>
Commit-Ready: Jon Flatley <jflat@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Curtis Malainey <cujomalainey@chromium.org>
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Diffstat (limited to 'ucm-config')
-rw-r--r-- | ucm-config/auron/HDA Intel PCH/HDA Intel PCH.conf | 6 | ||||
-rw-r--r-- | ucm-config/auron/HDA Intel PCH/HiFi.conf | 55 | ||||
-rw-r--r-- | ucm-config/auron_paine/HDA Intel PCH/HDA Intel PCH.conf | 6 | ||||
-rw-r--r-- | ucm-config/auron_paine/HDA Intel PCH/HiFi.conf | 90 | ||||
-rw-r--r-- | ucm-config/auron_yuna/HDA Intel PCH/HDA Intel PCH.conf | 6 | ||||
-rw-r--r-- | ucm-config/auron_yuna/HDA Intel PCH/HiFi.conf | 55 |
6 files changed, 0 insertions, 218 deletions
diff --git a/ucm-config/auron/HDA Intel PCH/HDA Intel PCH.conf b/ucm-config/auron/HDA Intel PCH/HDA Intel PCH.conf deleted file mode 100644 index aa3c8dd5..00000000 --- a/ucm-config/auron/HDA Intel PCH/HDA Intel PCH.conf +++ /dev/null @@ -1,6 +0,0 @@ -Comment "Auron internal card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff --git a/ucm-config/auron/HDA Intel PCH/HiFi.conf b/ucm-config/auron/HDA Intel PCH/HiFi.conf deleted file mode 100644 index 6174c0b9..00000000 --- a/ucm-config/auron/HDA Intel PCH/HiFi.conf +++ /dev/null @@ -1,55 +0,0 @@ -SectionVerb { - Value { - OutputDspName "speaker_eq" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Master Playback Switch' on" - cset "name='Headphone Playback Switch' off" - cset "name='Speaker Playback Switch' on" - - cset "name='Capture Switch' on" - cset "name='Capture Volume' 39" - cset "name='Mic Boost Volume' 2" - cset "name='Internal Mic Boost Volume' 1" - cset "name='Capture Source' 0" - ] - DisableSequence [ - ] -} - -SectionDevice."Headphone".0 { - Value { - JackName "Headphone Jack" - DspName "" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Speaker Playback Switch' off" - cset "name='Headphone Playback Switch' on" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Headphone Playback Switch' off" - cset "name='Speaker Playback Switch' on" - ] -} - -SectionDevice."Mic".0 { - Value { - JackName "Mic Jack" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Capture Source' 1" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Capture Source' 0" - ] -} diff --git a/ucm-config/auron_paine/HDA Intel PCH/HDA Intel PCH.conf b/ucm-config/auron_paine/HDA Intel PCH/HDA Intel PCH.conf deleted file mode 100644 index 7a62b05b..00000000 --- a/ucm-config/auron_paine/HDA Intel PCH/HDA Intel PCH.conf +++ /dev/null @@ -1,6 +0,0 @@ -Comment "Paine internal card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff --git a/ucm-config/auron_paine/HDA Intel PCH/HiFi.conf b/ucm-config/auron_paine/HDA Intel PCH/HiFi.conf deleted file mode 100644 index c10d41e4..00000000 --- a/ucm-config/auron_paine/HDA Intel PCH/HiFi.conf +++ /dev/null @@ -1,90 +0,0 @@ -SectionVerb { - Value { - InputDspName "dmic_eq" - OutputDspName "speaker_eq" - FullySpecifiedUCM "1" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Master Playback Switch' on" - cset "name='Headphone Playback Switch' off" - cset "name='Speaker Playback Switch' off" - - cset "name='Capture Switch' on" - cset "name='Capture Volume' 39" - cset "name='Mic Boost Volume' 2" - cset "name='Internal Mic Boost Volume' 1" - cset "name='Input Source' 1" - ] - DisableSequence [ - ] -} - -SectionDevice."Speaker".0 { - Value { - PlaybackPCM "hw:HDA Intel PCH,0" - MixerName "Master" - } - - EnableSequence [ - cdev "hw:PCH" - - cset "name='Speaker Playback Switch' on" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Speaker Playback Switch' off" - ] -} - -SectionDevice."Headphone".0 { - Value { - PlaybackPCM "hw:HDA Intel PCH,0" - JackName "Headphone Jack" - JackType "hctl" - MixerName "Master" - DspName "" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Headphone Playback Switch' on" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Headphone Playback Switch' off" - ] -} - -SectionDevice."Internal Mic" { - Value { - InputDspName "" - CapturePCM "hw:HDA Intel PCH,0" - } - EnableSequence [ - ] - DisableSequence [ - ] -} - -SectionDevice."Mic" { - Value { - CapturePCM "hw:HDA Intel PCH,0" - JackName "Mic Jack" - JackType "hctl" - DefaultNodeGain "-400" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Input Source' 0" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Input Source' 1" - ] -} diff --git a/ucm-config/auron_yuna/HDA Intel PCH/HDA Intel PCH.conf b/ucm-config/auron_yuna/HDA Intel PCH/HDA Intel PCH.conf deleted file mode 100644 index 5133a987..00000000 --- a/ucm-config/auron_yuna/HDA Intel PCH/HDA Intel PCH.conf +++ /dev/null @@ -1,6 +0,0 @@ -Comment "Yuna internal card" - -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff --git a/ucm-config/auron_yuna/HDA Intel PCH/HiFi.conf b/ucm-config/auron_yuna/HDA Intel PCH/HiFi.conf deleted file mode 100644 index 6174c0b9..00000000 --- a/ucm-config/auron_yuna/HDA Intel PCH/HiFi.conf +++ /dev/null @@ -1,55 +0,0 @@ -SectionVerb { - Value { - OutputDspName "speaker_eq" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Master Playback Switch' on" - cset "name='Headphone Playback Switch' off" - cset "name='Speaker Playback Switch' on" - - cset "name='Capture Switch' on" - cset "name='Capture Volume' 39" - cset "name='Mic Boost Volume' 2" - cset "name='Internal Mic Boost Volume' 1" - cset "name='Capture Source' 0" - ] - DisableSequence [ - ] -} - -SectionDevice."Headphone".0 { - Value { - JackName "Headphone Jack" - DspName "" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Speaker Playback Switch' off" - cset "name='Headphone Playback Switch' on" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Headphone Playback Switch' off" - cset "name='Speaker Playback Switch' on" - ] -} - -SectionDevice."Mic".0 { - Value { - JackName "Mic Jack" - } - EnableSequence [ - cdev "hw:PCH" - - cset "name='Capture Source' 1" - ] - DisableSequence [ - cdev "hw:PCH" - - cset "name='Capture Source' 0" - ] -} |