[RESEND,0/3] ASoC: Intel: simplify driver/card names for SOF/UCM integration

Message

Pierre-Louis Bossart June 17, 2020, 4:56 p.m. UTC

As suggested by Jaroslav, this patchset simplifies legacy cards
compiled with SOF: they now expose an 'SOF' driver name and an
'sof-bytcht <codec>' card name. UCM uses this driver name and
additionally checks for the card name to load a configuration shared
with the SST driver.

This patchset is just a rename with no functionality change. There is
no modification when SOF is not used, and Kconfig for SOF are disabled
when SST is enabled so no risk of interference.

This helps make 5.9 the first kernel version where SOF 'just
works'(tm) on legacy platforms with no additional configuration needed
(as is already the case with more recent HDaudio+DMIC platforms).

Thanks to Jaroslav for all the hard work on the alsa-lib/UCM side (the
majority of the configs are already merged in alsa-ucm-conf, only
minor updates are in-flight for max98090 and broadwell).

Patches sent initially on May 29, probably missed with the merge window.
No changes except for the addition of Jaroslav's Reviewed-by tag.

Pierre-Louis Bossart (3):
  ASoC: Intel: byt*: simplify card names for SOF uses
  ASoC: Intel: cht*: simplify card names for SOF uses
  ASoC: Intel: broadwell: simplify card names for SOF uses

 sound/soc/intel/boards/bdw-rt5650.c          | 12 +++++++++++-
 sound/soc/intel/boards/bdw-rt5677.c          | 12 +++++++++++-
 sound/soc/intel/boards/broadwell.c           | 12 +++++++++++-
 sound/soc/intel/boards/bytcht_cx2072x.c      | 12 +++++++++++-
 sound/soc/intel/boards/bytcht_da7213.c       | 12 +++++++++++-
 sound/soc/intel/boards/bytcht_es8316.c       | 12 +++++++++++-
 sound/soc/intel/boards/bytcr_rt5640.c        | 12 +++++++++++-
 sound/soc/intel/boards/bytcr_rt5651.c        | 12 +++++++++++-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c | 12 +++++++++++-
 sound/soc/intel/boards/cht_bsw_nau8824.c     | 12 +++++++++++-
 sound/soc/intel/boards/cht_bsw_rt5645.c      | 17 +++++++++++++++--
 sound/soc/intel/boards/cht_bsw_rt5672.c      | 12 +++++++++++-
 12 files changed, 136 insertions(+), 13 deletions(-)

Comments

Mark Brown June 18, 2020, 1:08 p.m. UTC | #1

On Wed, 17 Jun 2020 11:56:13 -0500, Pierre-Louis Bossart wrote:
> As suggested by Jaroslav, this patchset simplifies legacy cards
> compiled with SOF: they now expose an 'SOF' driver name and an
> 'sof-bytcht <codec>' card name. UCM uses this driver name and
> additionally checks for the card name to load a configuration shared
> with the SST driver.
> 
> This patchset is just a rename with no functionality change. There is
> no modification when SOF is not used, and Kconfig for SOF are disabled
> when SST is enabled so no risk of interference.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/3] ASoC: Intel: byt*: simplify card names for SOF uses
      commit: b4ecd58b01fbd9420bb3d8911c526dc877319df5
[2/3] ASoC: Intel: cht*: simplify card names for SOF uses
      commit: 7bfbddfc98414ab52803ffd26d0dc65328d373b1
[3/3] ASoC: Intel: broadwell: simplify card names for SOF uses
      commit: a5f610c0fa7ef819ab04a958dcde574c20b2f55b

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark