[PATCH] ALSA: hda: Allow SST driver on SKL and KBL platforms with DMIC

[Cezary Rojewski]

On 2020-05-06 22:26, Pierre-Louis Bossart wrote:
> On 5/6/20 3:16 PM, Cezary Rojewski wrote:
>> Update intel-dspcfg with FLAG_SST_ONLY_IF_DMIC option and use it for
>> Skylake and Kabylake platforms when DMIC is present.
> 
> Sounds good Cezary but your changes will not apply on Takashi's for-5.8 
> tree, they will have a minor conflict with my SoundWire changes 
> submitted in early April.
> 
> ++<<<<<<< HEAD
>   +#define FLAG_SST                      BIT(0)
>   +#define FLAG_SOF                      BIT(1)
>   +#define FLAG_SOF_ONLY_IF_DMIC         BIT(16)
>   +#define FLAG_SOF_ONLY_IF_SOUNDWIRE    BIT(17)
>   +
>   +#define FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE (FLAG_SOF_ONLY_IF_DMIC | \
>   +                                          FLAG_SOF_ONLY_IF_SOUNDWIRE)
> ++=======
> + #define FLAG_SST              BIT(0)
> + #define FLAG_SOF              BIT(1)
> + #define FLAG_SST_ONLY_IF_DMIC BIT(15)
> + #define FLAG_SOF_ONLY_IF_DMIC BIT(16)
> ++>>>>>>> ALSA: hda: Allow SST driver on SKL and KBL platforms with DMIC
> 
> 

Indeed, thanks for heads up, Pierre! Fixed in v2.