Unverified Commit 59960e67 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: machine driver updates for 6.5 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

An unusually large set of patches to deal with new SoundWire-based
platforms.

The bulk of the patches addresses support for MTL using RT712, RT713,
MAX98363, CS42L42 jack codec and amplifiers. The sof_sdw machine
driver had to be updated to remove limitations on number of codecs per
links, dai types, dai naming, etc. We also moved parts of the Realtek
and Maxim support in common code to avoid duplication.

Community users also reported two Dell SKUs which were not supported
in the mainline due to hardware permutations.
parents c7e076de a0503817

sound/soc/intel/boards/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -662,11 +662,14 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST

	depends on SOUNDWIRE

	select SND_SOC_MAX98363

	select SND_SOC_MAX98373_I2C

	select SND_SOC_MAX98373_SDW

	select SND_SOC_RT700_SDW

	select SND_SOC_RT711_SDW

	select SND_SOC_RT711_SDCA_SDW

	select SND_SOC_RT712_SDCA_SDW

	select SND_SOC_RT712_SDCA_DMIC_SDW

	select SND_SOC_RT1308_SDW

	select SND_SOC_RT1308

	select SND_SOC_RT1316_SDW
@@ -674,6 +677,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	select SND_SOC_RT715_SDW

	select SND_SOC_RT715_SDCA_SDW

	select SND_SOC_RT5682_SDW

	select SND_SOC_CS42L42_SDW

	select SND_SOC_DMIC

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

sound/soc/intel/boards/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -37,11 +37,13 @@ snd-soc-sof_da7219_max98373-objs := sof_da7219_max98373.o 
snd-soc-ehl-rt5660-objs := ehl_rt5660.o

snd-soc-sof-ssp-amp-objs := sof_ssp_amp.o

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

			sof_sdw_max98373.o sof_sdw_rt_amp.o	\

			sof_sdw_maxim.o sof_sdw_rt_amp.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_sdw_dmic.o sof_sdw_hdmi.o

			sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o	\

			sof_sdw_rt712_sdca.o sof_sdw_rt715.o	\

			sof_sdw_rt715_sdca.o sof_sdw_dmic.o	\

			sof_sdw_cs42l42.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_SOF_ES8336_MACH) += snd-soc-sof_es8336.o

sound/soc/intel/boards/sof_rt5682.c

+11 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,17 @@ static const struct platform_device_id board_ids[] = { 
					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "rpl_rt1019_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1019_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4) |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "mtl_mx98357_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

sound/soc/intel/boards/sof_sdw.c

+402 −140

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/intel/boards/sof_sdw_common.h

+61 −23

File changed.

Preview size limit exceeded, changes collapsed.