Unverified Commit aafdeba5 authored Aug 24, 2020 by Mark Brown

Merge series "ASoC: Intel: machine driver updates for 5.10" from Pierre-Louis...

Merge series "ASoC: Intel: machine driver updates for 5.10" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

This series updates the tables used to select SoundWire configurations
for CometLake and TigerLake, and adds support for SDCA (SoundWire
Device Class for Audio) codecs in the common machine driver. These
codec drivers are still being tested on early silicon/boards and will
be contributed at a later time.

For TigerLake Chromebooks a new DMI quirk is added, as well as a means
to override the topology names. A pm_runtime fix is also provided to
deal with playback/capture dependencies with an amplifier w/
feedback. I also included a minor codec correction for the TGL
amplifier.

Bard Liao (5):
  ASoC: Intel: modify SoundWire version id in acpi match table
  ASoC: Intel: sof_sdw: check SoundWire version when matching codec
  ASoC: Intel: sof_sdw: rename id as part_id
  ASoC: Intel: sof_sdw: add rt711 rt1316 rt714 SDCA codec support.
  ASoC: Intel: sof_sdw: clean-up inclusion of header files

Pierre-Louis Bossart (5):
  ASoC: Intel: soc-acpi: cnl: add support for rt5682 on SoundWire link2
  ASoC: Intel: sof-soundwire: add support for rt5682 on link2
  ASoC: Intel: soc-acpi: mirror CML and TGL configurations
  ASoC: Intel: soc-acpi: add support for SDCA boards
  ASoC: codecs: max98373-sdw: add missing test on resume

Rander Wang (2):
  ASoC: Intel: tgl_max98373: fix a runtime pm issue in multi-thread case
  ASoC: Intel: sof_sdw: Add support for product Ripto

Sathyanarayana Nujella (2):
  ASoC: Intel: sof_rt5682: override quirk data for tgl_max98373_rt5682
  ASoC: SOF: Add topology filename override based on dmi data match

 sound/soc/codecs/max98373-sdw.c               |   3 +
 sound/soc/intel/boards/Kconfig                |   3 +
 sound/soc/intel/boards/Makefile               |   7 +-
 sound/soc/intel/boards/sof_maxim_common.c     |   7 +-
 sound/soc/intel/boards/sof_rt5682.c           |  13 ++
 sound/soc/intel/boards/sof_sdw.c              |  98 +++++++---
 sound/soc/intel/boards/sof_sdw_common.h       |  22 ++-
 sound/soc/intel/boards/sof_sdw_dmic.c         |   1 +
 sound/soc/intel/boards/sof_sdw_max98373.c     |   2 +
 sound/soc/intel/boards/sof_sdw_rt1308.c       |   2 +
 sound/soc/intel/boards/sof_sdw_rt1316.c       | 113 ++++++++++++
 sound/soc/intel/boards/sof_sdw_rt5682.c       |   2 +
 sound/soc/intel/boards/sof_sdw_rt700.c        |   2 +
 sound/soc/intel/boards/sof_sdw_rt711.c        |   2 +
 sound/soc/intel/boards/sof_sdw_rt711_sdca.c   | 174 ++++++++++++++++++
 sound/soc/intel/boards/sof_sdw_rt715_sdca.c   |  42 +++++
 .../intel/common/soc-acpi-intel-cml-match.c   |  79 +++++++-
 .../intel/common/soc-acpi-intel-cnl-match.c   |  33 +++-
 .../intel/common/soc-acpi-intel-icl-match.c   |  10 +-
 .../intel/common/soc-acpi-intel-tgl-match.c   | 165 ++++++++++++++++-
 sound/soc/sof/intel/hda.c                     |   8 +-
 sound/soc/sof/sof-pci-dev.c                   |  24 +++
 22 files changed, 764 insertions(+), 48 deletions(-)
 create mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c
 create mode 100644 sound/soc/intel/boards/sof_sdw_rt711_sdca.c
 create mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c

base-commit: fcea8b02
--
2.25.1

parents c1e47e89 3f2c6564

sound/soc/codecs/max98373-sdw.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -256,6 +256,9 @@ static __maybe_unused int max98373_resume(struct device *dev)
		struct max98373_priv *max98373 = dev_get_drvdata(dev);
		unsigned long time;

		if (!max98373->hw_init)
		return 0;

		if (!slave->unattach_request)
		goto regmap_sync;

sound/soc/intel/boards/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -569,9 +569,12 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
		select SND_SOC_MAX98373_SDW
		select SND_SOC_RT700_SDW
		select SND_SOC_RT711_SDW
		select SND_SOC_RT711_SDCA_SDW
		select SND_SOC_RT1308_SDW
		select SND_SOC_RT1308
		select SND_SOC_RT1316_SDW
		select SND_SOC_RT715_SDW
		select SND_SOC_RT715_SDCA_SDW
		select SND_SOC_RT5682_SDW
		select SND_SOC_DMIC
		help

sound/soc/intel/boards/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -35,9 +35,10 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o hda_dsp_common.o
		snd-soc-ehl-rt5660-objs := ehl_rt5660.o hda_dsp_common.o
		snd-soc-sof-sdw-objs += sof_sdw.o \
		sof_sdw_max98373.o \
		sof_sdw_rt711.o sof_sdw_rt700.o \
		sof_sdw_rt1308.o sof_sdw_rt715.o \
		sof_sdw_rt5682.o \
		sof_sdw_rt1308.o sof_sdw_rt1316.o \
		sof_sdw_rt5682.o sof_sdw_rt700.o \
		sof_sdw_rt711.o sof_sdw_rt711_sdca.o \
		sof_sdw_rt715.o sof_sdw_rt715_sdca.o \
		sof_maxim_common.o \
		sof_sdw_dmic.o sof_sdw_hdmi.o hda_dsp_common.o
		obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

sound/soc/intel/boards/sof_maxim_common.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -66,6 +66,10 @@ int max98373_trigger(struct snd_pcm_substream *substream, int cmd)
		int j;
		int ret = 0;

		/* set spk pin by playback only */
		if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
		return 0;

		for_each_rtd_codec_dais(rtd, j, codec_dai) {
		struct snd_soc_component *component = codec_dai->component;
		struct snd_soc_dapm_context *dapm =
		@@ -86,9 +90,6 @@ int max98373_trigger(struct snd_pcm_substream *substream, int cmd)
		case SNDRV_PCM_TRIGGER_STOP:
		case SNDRV_PCM_TRIGGER_SUSPEND:
		case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
		/* Make sure no streams are active before disable pin */
		if (snd_soc_dai_active(codec_dai) != 1)
		break;
		ret = snd_soc_dapm_disable_pin(dapm, pin_name);
		if (!ret)
		snd_soc_dapm_sync(dapm);

sound/soc/intel/boards/sof_rt5682.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
		.driver_data = (void *)(SOF_RT5682_MCLK_EN \|
		SOF_RT5682_SSP_CODEC(0)),
		},
		{
		.callback = sof_rt5682_quirk_cb,
		.matches = {
		DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"),
		},
		.driver_data = (void *)(SOF_RT5682_MCLK_EN \|
		SOF_RT5682_SSP_CODEC(0) \|
		SOF_SPEAKER_AMP_PRESENT \|
		SOF_MAX98373_SPEAKER_AMP_PRESENT \|
		SOF_RT5682_SSP_AMP(2) \|
		SOF_RT5682_NUM_HDMIDEV(4)),
		},
		{}
		};