[SRU][H][PATCH 1/1] UBUNTU: [Config] enable soundwire audio mach driver

[Hui Wang]

On 5/28/21 6:40 PM, Kleber Souza wrote:
> Hi Hui,
>
> When running 'fakeroot debian/rules updateconfigs' after applying your
> patch I had to do the following changes:
>
> On 14.05.21 06:06, Hui Wang wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1921632
>>
>> The soundwire audio driver in the kernel could work on some Dell cml
>> machines, so enable the machine driver and some needed codec driver.
>>
>> Signed-off-by: Hui Wang <hui.wang at canonical.com>
>> ---
>>   debian.master/config/annotations          | 8 +++++++-
>>   debian.master/config/config.common.ubuntu | 5 ++++-
>>   2 files changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/debian.master/config/annotations 
>> b/debian.master/config/annotations
>> index 8c01bb96351c..991fdbf7a448 100644
>> --- a/debian.master/config/annotations
>> +++ b/debian.master/config/annotations
>> @@ -8463,6 +8463,7 @@ CONFIG_SND_SOC_PCM5102A policy<{'amd64': 'm', 
>> 'arm64': '
>>   CONFIG_SND_SOC_PCM512x_I2C policy<{'amd64': 'm', 'arm64': 'm', 
>> 'armhf': 'm', 'ppc64el': 'm'}>
>>   CONFIG_SND_SOC_PCM512x_SPI policy<{'amd64': 'm', 'arm64': 'm', 
>> 'armhf': 'm', 'ppc64el': 'm'}>
>>   CONFIG_SND_SOC_RK3328 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 
>> 'm', 'ppc64el': 'm'}>
>> +CONFIG_SND_SOC_RT1308 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 
>> 'm', 'ppc64el': 'm'}>
>
> This config can't be selected on arches other than amd64. I have
> set the annotation as '-' for non-amd64.
>
>> CONFIG_SND_SOC_RT1308_SDW policy<{'amd64': 'm', 'arm64': 'm', 
>> 'armhf': 'm', 'ppc64el': 'm'}>
>>   CONFIG_SND_SOC_RT5616 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 
>> 'm', 'ppc64el': 'm'}>
>>   CONFIG_SND_SOC_RT5631 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 
>> 'm', 'ppc64el': 'm'}>
>> @@ -8572,7 +8573,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC 
>> mark<ENFORCED> note<deprecated>
>>     # Menu: Device Drivers >> Sound card support >> Advanced Linux 
>> Sound Architecture >> ALSA for SoC audio support >> Intel ASoC SST 
>> drivers >> Intel Machine drivers
>>   CONFIG_SND_SOC_INTEL_MACH policy<{'amd64': 'y'}>
>> -CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES policy<{'amd64': 'n'}>
>> +CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES policy<{'amd64': 'y'}>
>>   CONFIG_SND_SOC_INTEL_HASWELL_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH policy<{'amd64': 'm'}>
>> @@ -8593,6 +8594,7 @@ 
>> CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_BXT_RT298_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH policy<{'amd64': 'm'}>
>> +CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH 
>> policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH policy<{'amd64': 'm'}>
>> @@ -8608,6 +8610,10 @@ 
>> CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH policy<{'amd64': 'm'}>
>>   CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH policy<{'amd64': 'm'}>
>>   +#
>> +CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES mark<ENFORCED> 
>> note<LP:1921632>
>> +CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH mark<ENFORCED> note<LP:1921632>
>> +
>>   # Menu: Device Drivers >> Sound card support >> Advanced Linux 
>> Sound Architecture >> ALSA for SoC audio support >> 
>> STMicroelectronics STM32 SOC audio support
>>     # Menu: Device Drivers >> Sound card support >> Advanced Linux 
>> Sound Architecture >> ALSA for SoC audio support >> SoC Audio for 
>> Freescale CPUs
>> diff --git a/debian.master/config/config.common.ubuntu 
>> b/debian.master/config/config.common.ubuntu
>> index f44deabacf1d..e3a0f55cf1ad 100644
>> --- a/debian.master/config/config.common.ubuntu
>> +++ b/debian.master/config/config.common.ubuntu
>> @@ -8346,6 +8346,7 @@ CONFIG_REGMAP_IRQ=y
>>   CONFIG_REGMAP_SCCB=m
>>   CONFIG_REGMAP_SLIMBUS=m
>>   CONFIG_REGMAP_SOUNDWIRE=m
>> +CONFIG_REGMAP_SOUNDWIRE_MBQ=m
>
> This config can't be selected and gets removed from the config file.
>
> I amended your commit to make these two changes. Please let us know
> if a different solution should be applied.
>
Thanks for your changes, the changes are fine. The  codec driver RT1308 
is only used on Intel AMD64; the REGMAP_SOUNDWIRE_MBQ is only used on 
soundwire sdca audio designs, I didn't notice that the kernel 5.11 
doesn't support sound sdca audio machine drivers yet.

thanks.

Hui.

>
> Thanks,
> Kleber