Unverified Commit 93c964af authored by Mark Brown's avatar Mark Brown
Browse files

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

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

Some of the patches in this series for TigerLake and AlderLake
SoundWire/Bluetooth support were missed in a previous submission,
resend them as is, and add new patches for the CS42L42 machine driver.

Brent Lu (3):
  ASoC: Intel: maxim-common: support max98357a
  ASoC: Intel: add sof-cs42l42 machine driver
  ASoC: Intel: sof_rt5682: code refactor for max98357a

Libin Yang (1):
  ASoC: Intel: sof_sdw: add SOF_RT715_DAI_ID_FIX for AlderLake

Pierre-Louis Bossart (4):
  ASoC: Intel: sof_sdw: add mutual exclusion between PCH DMIC and RT715
  ASoC: Intel: boards: handle hda-dsp-common as a module
  ASoC: Intel: boards: create sof-maxim-common module
  ASoC: Intel: boards: remove .nonatomic for BE dailinks

Vamshi Krishna Gopal (2):
  ASoC: Intel: soc-acpi: add entries for i2s machines in ADL match table
  ASoC: Intel: boards: add support for adl boards in sof-rt5682

Yong Zhi (3):
  ASoC: Intel: Boards: tgl_max98373: Add BT offload support
  ASoC: Intel: sof_sdw: add support for Bluetooth offload
  ASoC: Intel: sof_rt5682: Enable Bluetooth offload on tgl and adl

 sound/soc/intel/boards/Kconfig                |  36 +-
 sound/soc/intel/boards/Makefile               |  30 +-
 sound/soc/intel/boards/bxt_da7219_max98357a.c |   1 +
 sound/soc/intel/boards/bxt_rt298.c            |   1 +
 sound/soc/intel/boards/bytcht_cx2072x.c       |   1 -
 sound/soc/intel/boards/bytcht_da7213.c        |   1 -
 sound/soc/intel/boards/bytcht_es8316.c        |   1 -
 sound/soc/intel/boards/bytcht_nocodec.c       |   1 -
 sound/soc/intel/boards/bytcr_rt5640.c         |   1 -
 sound/soc/intel/boards/bytcr_rt5651.c         |   1 -
 sound/soc/intel/boards/bytcr_wm5102.c         |   1 -
 sound/soc/intel/boards/cht_bsw_rt5645.c       |   1 -
 sound/soc/intel/boards/cht_bsw_rt5672.c       |   1 -
 sound/soc/intel/boards/cml_rt1011_rt5682.c    |   1 +
 sound/soc/intel/boards/ehl_rt5660.c           |   2 +-
 sound/soc/intel/boards/glk_rt5682_max98357a.c |   1 +
 sound/soc/intel/boards/hda_dsp_common.c       |   5 +
 sound/soc/intel/boards/skl_hda_dsp_generic.c  |   1 +
 sound/soc/intel/boards/sof_cs42l42.c          | 509 ++++++++++++++++++
 sound/soc/intel/boards/sof_da7219_max98373.c  |   1 +
 sound/soc/intel/boards/sof_maxim_common.c     |  84 ++-
 sound/soc/intel/boards/sof_maxim_common.h     |  14 +-
 sound/soc/intel/boards/sof_pcm512x.c          |   2 +-
 sound/soc/intel/boards/sof_rt5682.c           | 119 +++-
 sound/soc/intel/boards/sof_sdw.c              |  55 +-
 sound/soc/intel/boards/sof_sdw_common.h       |   8 +
 sound/soc/intel/boards/sof_sdw_max98373.c     |   4 +-
 sound/soc/intel/boards/sof_wm8804.c           |   1 -
 .../intel/common/soc-acpi-intel-adl-match.c   |  26 +
 .../intel/common/soc-acpi-intel-glk-match.c   |  10 +
 30 files changed, 861 insertions(+), 59 deletions(-)
 create mode 100644 sound/soc/intel/boards/sof_cs42l42.c

--
2.25.1
parents b63ecaea b70029ab

sound/soc/intel/boards/Kconfig

+35 −1
Original line number Diff line number Diff line
@@ -26,6 +26,12 @@ config SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES 
	  interface.

	  If unsure select N.



config SND_SOC_INTEL_HDA_DSP_COMMON

	tristate



config SND_SOC_INTEL_SOF_MAXIM_COMMON

	tristate



if SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_HASWELL_MACH
@@ -278,6 +284,7 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC 
	select SND_SOC_MAX98390

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON



config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	tristate
@@ -304,6 +311,7 @@ config SND_SOC_INTEL_BXT_RT298_MACH 
	select SND_SOC_RT298

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	   This adds support for ASoC machine driver for Broxton platforms

	   with RT286 I2S audio codec.
@@ -422,6 +430,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	   This adds support for ASoC machine driver for Geminilake platforms

	   with RT5682 + MAX98357A I2S audio codec.
@@ -437,6 +446,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH 
	depends on SND_HDA_CODEC_HDMI

	depends on GPIOLIB

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected

	help
@@ -461,18 +471,38 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with rt5682 codec.

	   Say Y if you have such a device.

	   If unsure select "N".



config SND_SOC_INTEL_SOF_CS42L42_MACH

	tristate "SOF with cs42l42 codec in I2S Mode"

	depends on I2C && ACPI

	depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\

		    (MFD_INTEL_LPSS || COMPILE_TEST))

	select SND_SOC_CS42L42

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with cs42l42 codec.

	   Say Y if you have such a device.

	   If unsure select "N".



config SND_SOC_INTEL_SOF_PCM512x_MACH

	tristate "SOF with TI PCM512x codec"

	depends on I2C && ACPI

	depends on (SND_SOC_SOF_HDA_AUDIO_CODEC && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_PCM512x_I2C

	help

	  This adds support for ASoC machine driver for SOF platforms
@@ -504,6 +534,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH 
	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	  This adds support for ASoC machine driver for SOF platform with

	  RT1011 + RT5682 I2S codec.
@@ -519,6 +550,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH 
	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_DA7219

	select SND_SOC_MAX98373_I2C

	select SND_SOC_DMIC
@@ -539,6 +571,7 @@ config SND_SOC_INTEL_EHL_RT5660_MACH 
	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT5660

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	help

	  This adds support for ASoC machine driver for Elkhart Lake

	  platform with RT5660 I2S audio codec.
@@ -566,6 +599,8 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT715_SDCA_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	help

	  Add support for Intel SoundWire-based platforms connected to

	  MAX98373, RT700, RT711, RT1308 and RT715
@@ -573,5 +608,4 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 


endif





endif ## SND_SOC_INTEL_MACH

sound/soc/intel/boards/Makefile

+19 −11
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ snd-soc-sst-haswell-objs := haswell.o 
snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o

snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o

snd-soc-sst-broadwell-objs := broadwell.o

snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o

snd-soc-sst-bxt-rt298-objs := bxt_rt298.o hda_dsp_common.o

snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o hda_dsp_common.o

snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o

snd-soc-sst-bxt-rt298-objs := bxt_rt298.o

snd-soc-sst-sof-pcm512x-objs := sof_pcm512x.o

snd-soc-sst-sof-wm8804-objs := sof_wm8804.o

snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o hda_dsp_common.o

snd-soc-sst-glk-rt5682_max98357a-objs := glk_rt5682_max98357a.o

snd-soc-sst-bytcr-rt5640-objs := bytcr_rt5640.o

snd-soc-sst-bytcr-rt5651-objs := bytcr_rt5651.o

snd-soc-sst-bytcr-wm5102-objs := bytcr_wm5102.o
@@ -19,28 +19,29 @@ snd-soc-sst-byt-cht-cx2072x-objs := bytcht_cx2072x.o 
snd-soc-sst-byt-cht-da7213-objs := bytcht_da7213.o

snd-soc-sst-byt-cht-es8316-objs := bytcht_es8316.o

snd-soc-sst-byt-cht-nocodec-objs := bytcht_nocodec.o

snd-soc-sof_rt5682-objs := sof_rt5682.o hda_dsp_common.o sof_maxim_common.o sof_realtek_common.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o hda_dsp_common.o

snd-soc-sof_rt5682-objs := sof_rt5682.o sof_realtek_common.o

snd-soc-sof_cs42l42-objs := sof_cs42l42.o

snd-soc-cml_rt1011_rt5682-objs := cml_rt1011_rt5682.o

snd-soc-kbl_da7219_max98357a-objs := kbl_da7219_max98357a.o

snd-soc-kbl_da7219_max98927-objs := kbl_da7219_max98927.o

snd-soc-kbl_rt5663_max98927-objs := kbl_rt5663_max98927.o

snd-soc-kbl_rt5663_rt5514_max98927-objs := kbl_rt5663_rt5514_max98927.o

snd-soc-kbl_rt5660-objs := kbl_rt5660.o

snd-soc-skl_rt286-objs := skl_rt286.o

snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o hda_dsp_common.o

snd-soc-skl_hda_dsp-objs := skl_hda_dsp_generic.o skl_hda_dsp_common.o

snd-skl_nau88l25_max98357a-objs := skl_nau88l25_max98357a.o

snd-soc-skl_nau88l25_ssm4567-objs := skl_nau88l25_ssm4567.o

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_da7219_max98373-objs := sof_da7219_max98373.o

snd-soc-ehl-rt5660-objs := ehl_rt5660.o

snd-soc-sof-sdw-objs += sof_sdw.o				\

			sof_sdw_max98373.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

			sof_sdw_dmic.o sof_sdw_hdmi.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH) += snd-soc-sof_cs42l42.o

obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o

obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o

obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
@@ -74,3 +75,10 @@ obj-$(CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH) += snd-soc-skl_hda_dsp.o 
obj-$(CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH) += snd-soc-sof_da7219_max98373.o

obj-$(CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH) += snd-soc-ehl-rt5660.o

obj-$(CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH) += snd-soc-sof-sdw.o



# common modules

snd-soc-intel-hda-dsp-common-objs := hda_dsp_common.o

obj-$(CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON) += snd-soc-intel-hda-dsp-common.o



snd-soc-intel-sof-maxim-common-objs += sof_maxim_common.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON) += snd-soc-intel-sof-maxim-common.o

sound/soc/intel/boards/bxt_da7219_max98357a.c

+1 −0
Original line number Diff line number Diff line
@@ -869,3 +869,4 @@ MODULE_LICENSE("GPL v2"); 
MODULE_ALIAS("platform:bxt_da7219_max98357a");

MODULE_ALIAS("platform:glk_da7219_max98357a");

MODULE_ALIAS("platform:cml_da7219_max98357a");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/bxt_rt298.c

+1 −0
Original line number Diff line number Diff line
@@ -667,3 +667,4 @@ MODULE_DESCRIPTION("Intel SST Audio for Broxton"); 
MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:bxt_alc298s_i2s");

MODULE_ALIAS("platform:glk_alc298s_i2s");

MODULE_IMPORT_NS(SND_SOC_INTEL_HDA_DSP_COMMON);

sound/soc/intel/boards/bytcht_cx2072x.c

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { 
					      | SND_SOC_DAIFMT_CBS_CFS,

		.init = byt_cht_cx2072x_init,

		.be_hw_params_fixup = byt_cht_cx2072x_fixup,

		.nonatomic = true,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),