On 11/13/23 05:59, Mac Chiang wrote: > RT5650 is I2S codec integrated with HP and SPK. > The HW board connects SoC I2S to RT5650 codec as below: > > I2S0: ALC5650 aif1 for Speaker > I2S2: ALC5650 aif2 for Headphone > > Reviewed-by: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx> > Signed-off-by: Mac Chiang <mac.chiang@xxxxxxxxx> > --- > Hi Pierre, I resend the patch for your review and cc maintainers. Thanks. > Pick up for Chrome MTL projects support. The code was submitted as https://github.com/thesofproject/linux/pull/4661, approved and merged in the topic/sof-dev branch. By submitting the same code multiple times using two different paths, you are just adding more confusion and noise for what should be a straightforward process on a minor change. Moving forward, please pick one of: a) submit to alsa-devel b) submit to the SOF GitHub and let SOF maintainers upstream. Thank you. Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > > Changes v3: > - missing Reviewed-by, add it. > --- > > sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++ > sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 12 ++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c > index 06ad15af46de..9723479f43da 100644 > --- a/sound/soc/intel/boards/sof_rt5682.c > +++ b/sound/soc/intel/boards/sof_rt5682.c > @@ -1147,6 +1147,15 @@ static const struct platform_device_id board_ids[] = { > SOF_RT5682_SSP_AMP(0) | > SOF_RT5682_NUM_HDMIDEV(3)), > }, > + { > + .name = "mtl_rt5650", > + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | > + SOF_RT5682_SSP_CODEC(2) | > + SOF_RT5682_SSP_AMP(0) | > + SOF_RT5682_NUM_HDMIDEV(3) | > + SOF_BT_OFFLOAD_SSP(1) | > + SOF_SSP_BT_OFFLOAD_PRESENT), > + }, > { } > }; > MODULE_DEVICE_TABLE(platform, board_ids); > diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c > index 301b8142d554..af4224bff718 100644 > --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c > +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c > @@ -40,6 +40,11 @@ static const struct snd_soc_acpi_codecs mtl_lt6911_hdmi = { > .codecs = {"INTC10B0"} > }; > > +static const struct snd_soc_acpi_codecs mtl_rt5650_amp = { > + .num_codecs = 1, > + .codecs = {"10EC5650"} > +}; > + > struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { > { > .comp_ids = &mtl_rt5682_rt5682s_hp, > @@ -77,6 +82,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { > SND_SOC_ACPI_TPLG_INTEL_SSP_MSB | > SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER, > }, > + { > + .id = "10EC5650", > + .drv_name = "mtl_rt5650", > + .machine_quirk = snd_soc_acpi_codec_list, > + .quirk_data = &mtl_rt5650_amp, > + .sof_tplg_filename = "sof-mtl-rt5650.tplg", > + }, > /* place amp-only boards in the end of table */ > { > .id = "INTC10B0",
