[SRU][F/E/OEM-B-OSP1][PATCH RESEND 0/3] alsa/sof: load different firmware on different platforms

Hui Wang hui.wang at canonical.com
Tue Mar 3 00:32:56 UTC 2020

BugLink: https://bugs.launchpad.net/bugs/1857409

Because we already merged the fix for #1861837, it is safe to merge
these patchset now, so I resend those patches.

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

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


More information about the kernel-team mailing list