Unverified Commit 122d851b authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: boards: updates for SOF boards 

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

One new JasperLake configuration, core refactoring between RT1316 and
RT1318 and a minor uninitialized variable corner case.
parents 4f143eca 47d2b66f

sound/soc/intel/boards/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 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 sof_sdw_rt1318.o	\

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

sound/soc/intel/boards/sof_realtek_common.c

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

	struct snd_soc_dai *codec_dai;

	int i, clk_freq, ret;

	int i, clk_freq;

	int ret = 0;



	clk_freq = sof_dai_get_bclk(rtd);

sound/soc/intel/boards/sof_rt5682.c

+6 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,12 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.name = "jsl_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_MCLK_24MHZ |

					SOF_RT5682_SSP_CODEC(0)),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

sound/soc/intel/boards/sof_sdw.c

+5 −5
Original line number Diff line number Diff line
@@ -550,23 +550,23 @@ static struct sof_sdw_codec_info codec_info_list[] = { 
		.direction = {true, false},

		.dai_name = "rt1308-aif",

		.ops = &sof_sdw_rt1308_i2s_ops,

		.init = sof_sdw_rt1308_init,

		.exit = sof_sdw_rt1308_exit,

		.init = sof_sdw_rt_amp_init,

		.exit = sof_sdw_rt_amp_exit,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

		.part_id = 0x1316,

		.direction = {true, true},

		.dai_name = "rt1316-aif",

		.init = sof_sdw_rt1316_init,

		.exit = sof_sdw_rt1316_exit,

		.init = sof_sdw_rt_amp_init,

		.exit = sof_sdw_rt_amp_exit,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

		.part_id = 0x1318,

		.direction = {true, true},

		.dai_name = "rt1318-aif",

		.init = sof_sdw_rt1318_init,

		.init = sof_sdw_rt_amp_init,

		.codec_type = SOF_SDW_CODEC_TYPE_AMP,

	},

	{

sound/soc/intel/boards/sof_sdw_common.h

+4 −16
Original line number Diff line number Diff line
@@ -125,30 +125,18 @@ int sof_sdw_rt700_init(struct snd_soc_card *card, 
		       struct sof_sdw_codec_info *info,

		       bool playback);



/* RT1308 support */

/* RT1308 I2S support */

extern struct snd_soc_ops sof_sdw_rt1308_i2s_ops;



int sof_sdw_rt1308_init(struct snd_soc_card *card,

/* generic amp support */

int sof_sdw_rt_amp_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

int sof_sdw_rt1308_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);

int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1316 support */

int sof_sdw_rt1316_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);

int sof_sdw_rt1316_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);



/* RT1318 support */

int sof_sdw_rt1318_init(struct snd_soc_card *card,

			const struct snd_soc_acpi_link_adr *link,

			struct snd_soc_dai_link *dai_links,

			struct sof_sdw_codec_info *info,

			bool playback);



/* RT715 support */

int sof_sdw_rt715_init(struct snd_soc_card *card,