From 54df00f45641358632c9828e565055af3da908d2 Mon Sep 17 00:00:00 2001 From: David Ward Date: Sat, 27 Feb 2021 09:45:39 -0500 Subject: [PATCH 1/2] broadwell-rt286, bdw-rt5677: Fix comment at top of file Signed-off-by: David Ward --- ucm2/bdw-rt5677/HiFi.conf | 2 +- ucm2/broadwell-rt286/HiFi.conf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ucm2/bdw-rt5677/HiFi.conf b/ucm2/bdw-rt5677/HiFi.conf index a514cf5e..8ea5f0b1 100644 --- a/ucm2/bdw-rt5677/HiFi.conf +++ b/ucm2/bdw-rt5677/HiFi.conf @@ -1,4 +1,4 @@ -# Use case Configuration for sof-bdw-rt5677 +# Use case Configuration for bdw-rt5677 # command-line sequence to switch playback/capture # alsaucm -c bdw-rt5677 set _verb HiFi # alsaucm -c bdw-rt5677 set _verb HiFi set _enadev Headphones diff --git a/ucm2/broadwell-rt286/HiFi.conf b/ucm2/broadwell-rt286/HiFi.conf index 1dca382a..1da92110 100644 --- a/ucm2/broadwell-rt286/HiFi.conf +++ b/ucm2/broadwell-rt286/HiFi.conf @@ -1,5 +1,4 @@ -# Use case Configuration for Nexus 7 -# Adapted to Ubuntu Touch by David Henningsson +# Use case Configuration for broadwell-rt286 SectionDevice."Speaker" { Comment "Speakers" From 95dd6ea147d9f9306c11a84e55d078902ba89172 Mon Sep 17 00:00:00 2001 From: David Ward Date: Sat, 27 Feb 2021 09:45:39 -0500 Subject: [PATCH 2/2] broadwell-rt286, bdw-rt5677: Fix inconsistency in card detection This file is only read when the driver name is 'SOF'. Other entries in this file do not check if a card name contains the 'sof-' prefix. Adjust these new entries for Broadwell cards so they are consistent. This conveniently provides a workaround for a bug in kernel 5.10+: https://bugzilla.kernel.org/show_bug.cgi?id=211985 It happens to let the catpt driver work in kernels where this bug is present for Broadwell cards. This is possible because the SOF driver and catpt driver share the same use case configuration for the card. Signed-off-by: David Ward --- ucm2/SOF/HiFi.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ucm2/SOF/HiFi.conf b/ucm2/SOF/HiFi.conf index adf8cc54..bcd4f376 100644 --- a/ucm2/SOF/HiFi.conf +++ b/ucm2/SOF/HiFi.conf @@ -92,7 +92,7 @@ If.bdw_rt286 { Condition { Type String Haystack "${CardName}" - Needle "sof-bdw rt286" + Needle "bdw rt286" } True.Include.main.File "/broadwell-rt286/HiFi.conf" } @@ -101,7 +101,7 @@ If.bdw_rt5677 { Condition { Type String Haystack "${CardName}" - Needle "sof-bdw rt5677" + Needle "bdw rt5677" } True.Include.main.File "/bdw-rt5677/HiFi.conf" }