Unverified Commit cc983803 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: updates for 6.10 - part2 

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

This second part provides SoundWire-related cleanups and extensions
required by Realtek RT722 and Cirrus Logic codecs.

Also included is a cleanup of the RT715-sdca DAI naming and new tables
for ACPI-based board detections.
parents 7b95ee0d 59ffeb15

sound/soc/codecs/rt715-sdca.c

+2 −2
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ static const struct snd_soc_dai_ops rt715_sdca_ops = { 


static struct snd_soc_dai_driver rt715_sdca_dai[] = {

	{

		.name = "rt715-aif1",

		.name = "rt715-sdca-aif1",

		.id = RT715_AIF1,

		.capture = {

			.stream_name = "DP6 Capture",
@@ -945,7 +945,7 @@ static struct snd_soc_dai_driver rt715_sdca_dai[] = { 
		.ops = &rt715_sdca_ops,

	},

	{

		.name = "rt715-aif2",

		.name = "rt715-sdca-aif2",

		.id = RT715_AIF2,

		.capture = {

			.stream_name = "DP4 Capture",

sound/soc/intel/boards/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -678,7 +678,6 @@ 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_INTEL_SOF_BOARD_HELPERS

	select SND_SOC_MAX98363

	select SND_SOC_MAX98373_I2C

	select SND_SOC_MAX98373_SDW

sound/soc/intel/boards/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ snd-soc-sof-sdw-objs += sof_sdw.o \ 
			sof_sdw_maxim.o sof_sdw_rt_amp.o	\

			sof_sdw_rt5682.o sof_sdw_rt700.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_rt722_sdca.o	\

			sof_sdw_rt712_sdca.o sof_sdw_rt722_sdca.o	\

			sof_sdw_rt_dmic.o			\

			sof_sdw_cs42l42.o sof_sdw_cs42l43.o	\

			sof_sdw_cs_amp.o			\

			sof_sdw_dmic.o				\

sound/soc/intel/boards/sof_board_helpers.c

+0 −18
Original line number Diff line number Diff line
@@ -630,24 +630,6 @@ sof_intel_board_get_ctx(struct device *dev, unsigned long board_quirk) 
}

EXPORT_SYMBOL_NS(sof_intel_board_get_ctx, SND_SOC_INTEL_SOF_BOARD_HELPERS);



struct snd_soc_dai *get_codec_dai_by_name(struct snd_soc_pcm_runtime *rtd,

					  const char * const dai_name[], int num_dais)

{

	struct snd_soc_dai *dai;

	int index;

	int i;



	for (index = 0; index < num_dais; index++)

		for_each_rtd_codec_dais(rtd, i, dai)

			if (strstr(dai->name, dai_name[index])) {

				dev_dbg(rtd->card->dev, "get dai %s\n", dai->name);

				return dai;

			}



	return NULL;

}

EXPORT_SYMBOL_NS(get_codec_dai_by_name, SND_SOC_INTEL_SOF_BOARD_HELPERS);



MODULE_DESCRIPTION("ASoC Intel SOF Machine Driver Board Helpers");

MODULE_AUTHOR("Brent Lu <brent.lu@intel.com>");

MODULE_LICENSE("GPL");

sound/soc/intel/boards/sof_board_helpers.h

+0 −3
Original line number Diff line number Diff line
@@ -167,7 +167,4 @@ int sof_intel_board_set_dai_link(struct device *dev, struct snd_soc_card *card, 
struct sof_card_private *

sof_intel_board_get_ctx(struct device *dev, unsigned long board_quirk);



struct snd_soc_dai *get_codec_dai_by_name(struct snd_soc_pcm_runtime *rtd,

					  const char * const dai_name[], int num_dais);



#endif /* __SOF_INTEL_BOARD_HELPERS_H */