Unverified Commit 95bfb16d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: soc-acpi: Adding Es83x6 codec entry and 

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Adding Es83x6 codec entry and HDMI-in capture support in MTL match table.
parents 41bae58d d1f67278

sound/soc/intel/boards/sof_es8336.c

+10 −0
Original line number Diff line number Diff line
@@ -808,6 +808,16 @@ static const struct platform_device_id board_ids[] = { 
					SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK |

					SOF_ES8336_JD_INVERTED),

	},

	{

		.name = "mtl_es83x6_c1_h02",

		.driver_data = (kernel_ulong_t)(SOF_ES8336_SSP_CODEC(1) |

					SOF_NO_OF_HDMI_CAPTURE_SSP(2) |

					SOF_HDMI_CAPTURE_1_SSP(0) |

					SOF_HDMI_CAPTURE_2_SSP(2) |

					SOF_SSP_HDMI_CAPTURE_PRESENT |

					SOF_ES8336_SPEAKERS_EN_GPIO1_QUIRK |

					SOF_ES8336_JD_INVERTED),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

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

+25 −0
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = { 
	.codecs = {"10EC5682", "RTL5682"},

};



static const struct snd_soc_acpi_codecs mtl_essx_83x6 = {

	.num_codecs = 3,

	.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},

};



static const struct snd_soc_acpi_codecs mtl_lt6911_hdmi = {

	.num_codecs = 1,

	.codecs = {"INTC10B0"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {

	{

		.comp_ids = &mtl_rt5682_rt5682s_hp,
@@ -52,6 +62,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = { 
		.quirk_data = &mtl_rt1019p_amp,

		.sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg",

	},

	{

		.comp_ids = &mtl_essx_83x6,

		.drv_name = "mtl_es83x6_c1_h02",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mtl_lt6911_hdmi,

		.sof_tplg_filename = "sof-mtl-es83x6-ssp1-hdmi-ssp02.tplg",

	},

	{

		.comp_ids = &mtl_essx_83x6,

		.drv_name = "sof-essx8336",

		.sof_tplg_filename = "sof-mtl-es8336", /* the tplg suffix is added at run time */

		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER |

					SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |

					SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_mtl_machines);