[PATCH] ASoC: Intel: boards: Add CML_RT1015 m/c driver

[Pierre-Louis Bossart]

On 10/16/20 11:04 AM, Mark Brown wrote:
> On Sat, Oct 17, 2020 at 12:02:24AM +0800, matsufan at gmail.com wrote:
> 
>> +<<<<<<< HEAD
>>   obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH) += snd-soc-cml_rt1011_rt5682.o
>> +=======
>> +obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH) += cml_rt1011_rt5682.o
>> +obj-$(CONFIG_SND_SOC_INTEL_SOF_CML_RT1015_RT5682_MACH) += cml_rt1015_rt5682.o
>> +>>>>>>> 955c356... CHROMIUM: ASoC: Intel: boards: Add CML_RT1015 m/c driver
> 
> There's an unresolved conflict here :/

Was this patch shared on the mailing list? I don't see it in my inbox 
and in the archives?

At any rate, I am not hot on adding yet another machine driver just to 
change an amplifier version. It's really horrible to maintain all of 
these permutations by code duplication.

Adding a variant in a existing machine driver is a much better idea, and 
pretty much all new machine drivers follow this model. You could either 
rename the existing driver as cml_rt101x_rt5682 or use sof_rt5682.

Thanks
-Pierre