From c62080643bb7ea77d28cf4dda11974e3f4b70328 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Wed, 12 Jun 2019 14:37:13 -0700 Subject: ucm-config: remove Dell-WD15-Dock ALSA lib upstream now maintains ucm files for this dock, lets upstream what we have and carry any local patches we have to on top of ALSA lib. This will also allow us to uprev ALSA since currently adhd conflicts with it. Added README explaining reasoning behind leaving dead symlinks in the repo versus adding them to the overlay. BUG=b:132848755 TEST=emerge and don't conflict with ALSA 1.1.8 Cq-Depend: chromium:1658664 Change-Id: I31f5a52f37e0cafd983249619074ca8f04c27d5d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/1657029 Reviewed-by: Curtis Malainey Reviewed-by: Dylan Reid Tested-by: Curtis Malainey Commit-Queue: Jason Clinton --- .../Dell-WD15-Dock/Dell-WD15-Dock.conf | 5 --- ucm-config/for_all_boards/Dell-WD15-Dock/HiFi.conf | 43 ---------------------- ucm-config/for_all_boards/README | 8 ++++ 3 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 ucm-config/for_all_boards/Dell-WD15-Dock/Dell-WD15-Dock.conf delete mode 100644 ucm-config/for_all_boards/Dell-WD15-Dock/HiFi.conf create mode 100644 ucm-config/for_all_boards/README diff --git a/ucm-config/for_all_boards/Dell-WD15-Dock/Dell-WD15-Dock.conf b/ucm-config/for_all_boards/Dell-WD15-Dock/Dell-WD15-Dock.conf deleted file mode 100644 index 290758a3..00000000 --- a/ucm-config/for_all_boards/Dell-WD15-Dock/Dell-WD15-Dock.conf +++ /dev/null @@ -1,5 +0,0 @@ -Comment "USB-audio on Dell docking station" -SectionUseCase."HiFi" { - File "HiFi.conf" - Comment "Default" -} diff --git a/ucm-config/for_all_boards/Dell-WD15-Dock/HiFi.conf b/ucm-config/for_all_boards/Dell-WD15-Dock/HiFi.conf deleted file mode 100644 index 9b122582..00000000 --- a/ucm-config/for_all_boards/Dell-WD15-Dock/HiFi.conf +++ /dev/null @@ -1,43 +0,0 @@ -SectionVerb { - Value { - FullySpecifiedUCM "1" - } - EnableSequence [ - cdev "hw:Dock" - ] - DisableSequence [ - ] -} - -SectionDevice."Dock Headphone".0 { - Comment "Headphone" - - Value { - PlaybackPCM "hw:Dock,0" - JackType "always" - } -} - -SectionDevice."Dock Line Out".0 { - Value { - PlaybackPCM "hw:Dock,1" - JackType "always" - } - EnableSequence [ - cdev "hw:Dock" - cset "name='Line Playback Switch' on" - ] - DisableSequence [ - cdev "hw:Dock" - cset "name='Line Playback Switch' off" - ] -} - -SectionDevice."Dock Microphone".0 { - Comment "Microphone" - - Value { - CapturePCM "hw:Dock,0" - JackType "always" - } -} diff --git a/ucm-config/for_all_boards/README b/ucm-config/for_all_boards/README new file mode 100644 index 00000000..b5384358 --- /dev/null +++ b/ucm-config/for_all_boards/README @@ -0,0 +1,8 @@ +Regarding the two dead sym links WD15 Dock and WD19 Dock + +ALSA has added a ucm for the ucm the sym links they point to and the ucm +has been patched in the chromiumos overlay. Unfortunately the alsa-lib +installs via Makefile and make HATES files with spaces, so we are keeping +the sym links here (even though they appear dead) they are NOT. Once +deployed with alsa-lib 1.1.8 they will have a proper target on a dut. + -- cgit v1.2.3