APPLIED[E]: [SRU][OEM-OSP1/E/unstable][PATCH 0/3] alsa/sof: load different firmware on different platforms

[Kleber Souza]

On 2020-01-07 14:23, Timo Aaltonen wrote:
> On 24.12.2019 9.08, Hui Wang wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1857409
>>
>> [Impact]
>> In our ubuntu kernel, the sof driver will load the sof-cnl.ri (firmware)
>> on all platforms, but mainline kernel already supported the multi
>> firmwares on differnt platforms, and OEM project needs us to
>> support the mutli-firmware names in the ubuntu kernel
>>
>> [Fix]
>> cherry-pick 3 upstream patches, then on cnl platforms, it will
>> load sof-cnl.ri, on cml platfomrs, it will load sof-cml.ri, on cfl
>> platforms, it will load sof-cfl.ri
>>
>>
>> [Test Case]
>> Prepare the firmware from https://github.com/thesofproject/linux-firmware
>> master branch, then boot the kernel with these patches.
>>
>> [Regression Risk]
>> Low, just let different platforms load differnt firmware, and these
>> patches are in the upstream kernel.
>>
>>
>>
>> Liam Girdwood (1):
>>   ASoC: SOF: Intel: Fix CFL and CML FW nocodec binary names.
>>
>> Pierre-Louis Bossart (2):
>>   ASoC: SOF: Intel: hda: use fallback for firmware name
>>   ASoC: Intel: acpi-match: split CNL tables in three
>>
>>  include/sound/soc-acpi-intel-match.h          |  2 +
>>  sound/soc/intel/common/Makefile               |  3 +-
>>  .../intel/common/soc-acpi-intel-cfl-match.c   | 18 ++++++
>>  .../intel/common/soc-acpi-intel-cml-match.c   | 56 +++++++++++++++++++
>>  .../intel/common/soc-acpi-intel-cnl-match.c   | 31 ----------
>>  sound/soc/sof/intel/hda.c                     | 11 +++-
>>  sound/soc/sof/sof-pci-dev.c                   |  8 +--
>>  7 files changed, 91 insertions(+), 38 deletions(-)
>>  create mode 100644 sound/soc/intel/common/soc-acpi-intel-cfl-match.c
>>  create mode 100644 sound/soc/intel/common/soc-acpi-intel-cml-match.c
>>
> 
> applied to osp1 oem-next, thanks
> 

Applied to eoan/linux.

Thanks,
Kleber