Unverified Commit 04afb621 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: intel: sof_rt5682: support jsl_rt5682s_rt1015 board 



This patch adds driver data for two ALC1015Q-CG speaker amplifiers on
SSP1 and one ALC5682I-VS headphone codec on SSP0 for JSL platform.

Topology is leveraged from jsl_rt5682_rt1015 since the capability of
two ALC5682 variants is the same.

Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210914101847.778688-4-brent.lu@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 46414bc3

sound/soc/intel/boards/sof_rt5682.c

+10 −0
Original line number Diff line number Diff line
@@ -1046,6 +1046,16 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(2) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.name = "jsl_rt5682s_rt1015",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_MCLK_24MHZ |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_RT5682S_HEADPHONE_CODEC_PRESENT |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_RT1015_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1)),

	},

	{

		.name = "jsl_rt5682s_rt1015p",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

sound/soc/intel/common/soc-acpi-intel-jsl-match.c

+8 −0
Original line number Diff line number Diff line
@@ -81,6 +81,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { 
		.quirk_data = &mx98360a_spk,

		.sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg",

	},

	{

		.id = "RTL5682",

		.drv_name = "jsl_rt5682s_rt1015",

		.sof_fw_filename = "sof-jsl.ri",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &rt1015_spk,

		.sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",

	},

	{

		.id = "RTL5682",

		.drv_name = "jsl_rt5682s_rt1015p",