Unverified Commit 192595a6 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: add support for new devices 

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

Add support for new devices on Intel platforms.
parents 68e4dada 86ccd4d3

sound/soc/intel/boards/sof_es8336.c

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

					SOF_ES8336_JD_INVERTED),

	},

	{

		.name = "ptl_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-lnl-match.c

+34 −0
Original line number Diff line number Diff line
@@ -419,6 +419,15 @@ static const struct snd_soc_acpi_adr_device rt1320_1_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = {

	{

		.adr = 0x000231025D132001ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "rt1320-2"

	}

};



static const struct snd_soc_acpi_adr_device rt1320_1_group2_adr[] = {

	{

		.adr = 0x000130025D132001ull,
@@ -609,6 +618,25 @@ static const struct snd_soc_acpi_link_adr lnl_sdw_rt1318_l12_rt714_l0[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr lnl_sdw_rt1320_l12_rt714_l0[] = {

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(rt1320_1_group2_adr),

		.adr_d = rt1320_1_group2_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1320_2_group2_adr),

		.adr_d = rt1320_2_group2_adr,

	},

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt714_0_adr),

		.adr_d = rt714_0_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr lnl_sdw_rt713_l0_rt1318_l1[] = {

	{

		.mask = BIT(0),
@@ -740,6 +768,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-lnl-rt1318-l12-rt714-l0.tplg"

	},

	{

		.link_mask = GENMASK(2, 0),

		.links = lnl_sdw_rt1320_l12_rt714_l0,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-lnl-rt1320-l12-rt714-l0.tplg"

	},

	{

		.link_mask = BIT(0) | BIT(1),

		.links = lnl_sdw_rt713_l0_rt1318_l1,

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

+50 −0
Original line number Diff line number Diff line
@@ -21,6 +21,16 @@ static const struct snd_soc_acpi_codecs ptl_rt5682_rt5682s_hp = { 
	.codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID},

};



static const struct snd_soc_acpi_codecs ptl_essx_83x6 = {

	.num_codecs = 3,

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

};



static const struct snd_soc_acpi_codecs ptl_lt6911_hdmi = {

	.num_codecs = 1,

	.codecs = {"INTC10B0"}

};



struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[] = {

	{

		.comp_ids = &ptl_rt5682_rt5682s_hp,
@@ -29,6 +39,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[] = { 
		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |

					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,

	},

	{

		.comp_ids = &ptl_essx_83x6,

		.drv_name = "ptl_es83x6_c1_h02",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &ptl_lt6911_hdmi,

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

	},

	{

		.comp_ids = &ptl_essx_83x6,

		.drv_name = "sof-essx8336",

		.sof_tplg_filename = "sof-ptl-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_ptl_machines);
@@ -330,6 +355,15 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt721_0_single_adr[] = {

	{

		.adr = 0x000030025d072101ull,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt721"

	}

};



static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {

	{

		.adr = 0x000330025d072101ull,
@@ -448,6 +482,15 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l3[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt721_0_single_adr),

		.adr_d = rt721_0_single_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {

	{

		.mask = BIT(0),
@@ -635,6 +678,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt711.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = ptl_rt721_l0,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt721.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

		.link_mask = BIT(0),

		.links = ptl_rt722_only,