| Message ID | 20201216153838.34945-1-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [alsa-ucm-conf,1/3] chtnau8824: Move DAC Channel Source selection to Speaker/Headphones EnableSeq | expand |
Hi, On 12/16/20 4:38 PM, Hans de Goede wrote: > Move DAC Channel Source selection to Speaker/Headphones EnableSeq. > > The main reason for doing this is to make it easier to allow using > variables, as the Speaker/Headphones conf files are evaluated after > the main HiFi.conf had a chance to set them. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> ping? It would be nice to get this series merged for proper SOF support. Maybe this got confused with my other UCM chtnau8824 series which I send 10 days before this one? That one did get merged, but this is a different series. Regards, Hans > --- > ucm2/codecs/nau8824/EnableSeq.conf | 3 --- > ucm2/codecs/nau8824/HeadPhones.conf | 2 ++ > ucm2/codecs/nau8824/MonoSpeaker.conf | 2 ++ > ucm2/codecs/nau8824/Speaker.conf | 2 ++ > 4 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/ucm2/codecs/nau8824/EnableSeq.conf b/ucm2/codecs/nau8824/EnableSeq.conf > index 3650d06..2595e5f 100644 > --- a/ucm2/codecs/nau8824/EnableSeq.conf > +++ b/ucm2/codecs/nau8824/EnableSeq.conf > @@ -1,7 +1,4 @@ > EnableSequence [ > - # Playback TDM configuration > - cset "name='DACL Channel Source' 0" > - cset "name='DACR Channel Source' 1" > # Input Configuration > cset "name='DMIC1 Enable Switch' off" > cset "name='DMIC2 Enable Switch' off" > diff --git a/ucm2/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf > index a807f84..46ec5d7 100644 > --- a/ucm2/codecs/nau8824/HeadPhones.conf > +++ b/ucm2/codecs/nau8824/HeadPhones.conf > @@ -12,6 +12,8 @@ SectionDevice."Headphones" { > ] > > EnableSequence [ > + cset "name='DACL Channel Source' 0" > + cset "name='DACR Channel Source' 1" > cset "name='Headphone Switch' on" > ] > > diff --git a/ucm2/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf > index 6b4ef8a..09edea5 100644 > --- a/ucm2/codecs/nau8824/MonoSpeaker.conf > +++ b/ucm2/codecs/nau8824/MonoSpeaker.conf > @@ -11,6 +11,8 @@ SectionDevice."Speaker" { > ] > > EnableSequence [ > + cset "name='DACL Channel Source' 0" > + cset "name='DACR Channel Source' 1" > # nau8824 mono speaker boards have the speaker on the right chan > cset "name='Speaker Left DACL Volume' 0" > cset "name='Speaker Left DACR Volume' 0" > diff --git a/ucm2/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf > index a995873..64d7eee 100644 > --- a/ucm2/codecs/nau8824/Speaker.conf > +++ b/ucm2/codecs/nau8824/Speaker.conf > @@ -11,6 +11,8 @@ SectionDevice."Speaker" { > ] > > EnableSequence [ > + cset "name='DACL Channel Source' 0" > + cset "name='DACR Channel Source' 1" > cset "name='Speaker Left DACL Volume' 1" > cset "name='Speaker Left DACR Volume' 0" > cset "name='Speaker Right DACL Volume' 0" >
Dne 17. 01. 21 v 17:52 Jaroslav Kysela napsal(a): > Dne 17. 01. 21 v 17:09 Hans de Goede napsal(a): >> Hi, >> >> On 12/16/20 4:38 PM, Hans de Goede wrote: >>> Move DAC Channel Source selection to Speaker/Headphones EnableSeq. >>> >>> The main reason for doing this is to make it easier to allow using >>> variables, as the Speaker/Headphones conf files are evaluated after >>> the main HiFi.conf had a chance to set them. >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> >> ping? It would be nice to get this series merged for proper SOF >> support. >> >> Maybe this got confused with my other UCM chtnau8824 series which >> I send 10 days before t > > Hi, > > Thanks for the reminder. I though that this one was resolved. I don't think > that we need the first change - the evaluation for If and Include sequences is > executed before SectionVerb {} parsing. So the If...Define.RightOutputChannel > should be valid for SectionVerb...Include...File > "/codecs/nau8824/EnableSeq.conf". The 'DACR Channel Source' control seems to > require a static settings so keeping it in the verb init sequence has sense. > > I applied the second (SST variable) patch for now. It's nice cleanup. Thanks. Hans, could you test https://github.com/alsa-project/alsa-ucm-conf/pull/74 ? Thank you, Jaroslav
diff --git a/ucm2/codecs/nau8824/EnableSeq.conf b/ucm2/codecs/nau8824/EnableSeq.conf index 3650d06..2595e5f 100644 --- a/ucm2/codecs/nau8824/EnableSeq.conf +++ b/ucm2/codecs/nau8824/EnableSeq.conf @@ -1,7 +1,4 @@ EnableSequence [ - # Playback TDM configuration - cset "name='DACL Channel Source' 0" - cset "name='DACR Channel Source' 1" # Input Configuration cset "name='DMIC1 Enable Switch' off" cset "name='DMIC2 Enable Switch' off" diff --git a/ucm2/codecs/nau8824/HeadPhones.conf b/ucm2/codecs/nau8824/HeadPhones.conf index a807f84..46ec5d7 100644 --- a/ucm2/codecs/nau8824/HeadPhones.conf +++ b/ucm2/codecs/nau8824/HeadPhones.conf @@ -12,6 +12,8 @@ SectionDevice."Headphones" { ] EnableSequence [ + cset "name='DACL Channel Source' 0" + cset "name='DACR Channel Source' 1" cset "name='Headphone Switch' on" ] diff --git a/ucm2/codecs/nau8824/MonoSpeaker.conf b/ucm2/codecs/nau8824/MonoSpeaker.conf index 6b4ef8a..09edea5 100644 --- a/ucm2/codecs/nau8824/MonoSpeaker.conf +++ b/ucm2/codecs/nau8824/MonoSpeaker.conf @@ -11,6 +11,8 @@ SectionDevice."Speaker" { ] EnableSequence [ + cset "name='DACL Channel Source' 0" + cset "name='DACR Channel Source' 1" # nau8824 mono speaker boards have the speaker on the right chan cset "name='Speaker Left DACL Volume' 0" cset "name='Speaker Left DACR Volume' 0" diff --git a/ucm2/codecs/nau8824/Speaker.conf b/ucm2/codecs/nau8824/Speaker.conf index a995873..64d7eee 100644 --- a/ucm2/codecs/nau8824/Speaker.conf +++ b/ucm2/codecs/nau8824/Speaker.conf @@ -11,6 +11,8 @@ SectionDevice."Speaker" { ] EnableSequence [ + cset "name='DACL Channel Source' 0" + cset "name='DACR Channel Source' 1" cset "name='Speaker Left DACL Volume' 1" cset "name='Speaker Left DACR Volume' 0" cset "name='Speaker Right DACL Volume' 0"
Move DAC Channel Source selection to Speaker/Headphones EnableSeq. The main reason for doing this is to make it easier to allow using variables, as the Speaker/Headphones conf files are evaluated after the main HiFi.conf had a chance to set them. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- ucm2/codecs/nau8824/EnableSeq.conf | 3 --- ucm2/codecs/nau8824/HeadPhones.conf | 2 ++ ucm2/codecs/nau8824/MonoSpeaker.conf | 2 ++ ucm2/codecs/nau8824/Speaker.conf | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-)