Unverified Commit 227178d2 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: machine driver updates for 5.18 

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

Two cleanups to remove an unused filename and typos, and one addition
of an ACPI matching table for a Dell SoundWire SKU without local
microphones.

The main change is the addition of a common 'sof-ssp-amp' machine
driver for devices with amplifiers only (no headset codec) and
different connections using I2S links (Bluetooth offload, HDMI
receiver). It's likely that the amplifier will be swapped out by OEMs,
this machine driver provides a relatively generic solution to avoid
copy-paste of similar solutions.
parents d5dd781b c4dcd710

include/sound/soc-acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ struct snd_soc_acpi_link_adr { 
 * audio codecs whose presence if checked with ACPI

 * @pdata: intended for platform data or machine specific-ops. This structure

 *  is not constant since this field may be updated at run-time

 * @sof_fw_filename: Sound Open Firmware file name, if enabled

 * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled

 */

/* Descriptor for SST ASoC machine driver */
@@ -158,7 +157,6 @@ struct snd_soc_acpi_mach { 
	const void *quirk_data;

	void *pdata;

	struct snd_soc_acpi_mach_params mach_params;

	const char *sof_fw_filename;

	const char *sof_tplg_filename;

};

sound/soc/intel/boards/Kconfig

+24 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ config SND_SOC_INTEL_HDA_DSP_COMMON 
config SND_SOC_INTEL_SOF_MAXIM_COMMON

	tristate



config SND_SOC_INTEL_SOF_REALTEK_COMMON

	tristate



config SND_SOC_INTEL_SOF_CIRRUS_COMMON

	tristate



if SND_SOC_INTEL_CATPT



config SND_SOC_INTEL_HASWELL_MACH
@@ -477,6 +483,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH 
	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_MAXIM_COMMON

	select SND_SOC_INTEL_SOF_REALTEK_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with rt5682 codec.
@@ -599,6 +606,23 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH 


endif ## SND_SOC_SOF_JASPERLAKE



config SND_SOC_INTEL_SOF_SSP_AMP_MACH

	tristate "SOF with amplifiers in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT1308

	select SND_SOC_CS35L41_I2C

	select SND_SOC_DMIC

	select SND_SOC_HDAC_HDMI

	select SND_SOC_INTEL_HDA_DSP_COMMON

	select SND_SOC_INTEL_SOF_REALTEK_COMMON

	select SND_SOC_INTEL_SOF_CIRRUS_COMMON

	help

	   This adds support for ASoC machine driver for SOF platforms

	   with RT1308/CS35L41 I2S audio codec.

	   Say Y if you have such a device.

	   If unsure select "N".



if SND_SOC_SOF_ELKHARTLAKE



config SND_SOC_INTEL_EHL_RT5660_MACH

sound/soc/intel/boards/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 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 sof_realtek_common.o

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

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

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

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

snd-soc-sof_nau8825-objs := sof_nau8825.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
@@ -35,6 +35,7 @@ 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

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_rt1308.o sof_sdw_rt1316.o	\
@@ -79,6 +80,7 @@ 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

obj-$(CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH) += snd-soc-sof-ssp-amp.o



# common modules

snd-soc-intel-hda-dsp-common-objs := hda_dsp_common.o
@@ -86,3 +88,9 @@ 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



snd-soc-intel-sof-realtek-common-objs += sof_realtek_common.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON) += snd-soc-intel-sof-realtek-common.o



snd-soc-intel-sof-cirrus-common-objs += sof_cirrus_common.o

obj-$(CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON) += snd-soc-intel-sof-cirrus-common.o

sound/soc/intel/boards/bdw-rt5650.c

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ static int bdw_rt5650_probe(struct platform_device *pdev) 
	if (!bdw_rt5650)

		return -ENOMEM;



	/* override plaform name, if required */

	/* override platform name, if required */

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card,

						    mach->mach_params.platform);

sound/soc/intel/boards/bdw-rt5677.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int bdw_rt5677_probe(struct platform_device *pdev) 
	if (!bdw_rt5677)

		return -ENOMEM;



	/* override plaform name, if required */

	/* override platform name, if required */

	mach = pdev->dev.platform_data;

	ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5677_card,

						    mach->mach_params.platform);