Unverified Commit 23523e93 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: machine driver updates for 6.19 

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

Add supports for new audio configurations on Intel platforms.
parents b3a53024 873bc946

sound/soc/intel/boards/sof_sdw.c

+51 −8
Original line number Diff line number Diff line
@@ -230,6 +230,20 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{

		/*

		 * Avell B.ON (OEM rebrand of NUC15 'Bishop County' LAPBC510 and

		 * LAPBC710)

		 */

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Avell High Performance"),

			DMI_MATCH(DMI_PRODUCT_NAME, "B.ON"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOC_SDW_PCH_DMIC |

					RT711_JD1),

	},

	{

		/* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */

		.callback = sof_sdw_quirk_cb,
@@ -757,6 +771,28 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
		},

		.driver_data = (void *)(SOC_SDW_PCH_DMIC),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Google"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Lapis"),

		},

		.driver_data = (void *)(SOC_SDW_CODEC_SPKR |

					SOC_SDW_PCH_DMIC |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Google"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Francka"),

		},

		.driver_data = (void *)(SOC_SDW_CODEC_SPKR |

					SOC_SDW_PCH_DMIC |

					SOF_BT_OFFLOAD_SSP(2) |

					SOF_SSP_BT_OFFLOAD_PRESENT),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {
@@ -1113,15 +1149,22 @@ static int create_bt_dailinks(struct snd_soc_card *card, 
			      struct snd_soc_dai_link **dai_links, int *be_id)

{

	struct device *dev = card->dev;

	int port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>

			SOF_BT_OFFLOAD_SSP_SHIFT;

	char *name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);

	char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port);

	struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);

	char *cpu_dai_name;

	char *name;

	int port;

	int ret;



	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

		port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >> SOF_BT_OFFLOAD_SSP_SHIFT;

	else

		port = fls(mach->mach_params.bt_link_mask) - 1;



	name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);

	cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port);

	if (!name || !cpu_dai_name)

		return -ENOMEM;



	int ret;



	ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,

					    1, 1, cpu_dai_name, "dummy",

					    snd_soc_dummy_dlc.name, snd_soc_dummy_dlc.dai_name,
@@ -1218,7 +1261,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
		mach_params->dmic_num = DMIC_DEFAULT_CHANNELS;

	}



	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)

	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT || mach_params->bt_link_mask)

		bt_num = 1;



	dev_dbg(dev, "DAI link numbers: sdw %d, ssp %d, dmic %d, hdmi %d, bt: %d\n",
@@ -1273,7 +1316,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) 
		goto err_end;



	/* BT */

	if (sof_sdw_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {

	if (bt_num) {

		ret = create_bt_dailinks(card, &dai_links, &be_id);

		if (ret)

			goto err_end;

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

+79 −0
Original line number Diff line number Diff line
@@ -236,6 +236,30 @@ static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device cs42l43_3_agg_adr[] = {

	{

		.adr = 0x00033001FA424301ull,

		.num_endpoints = ARRAY_SIZE(cs42l43_amp_spkagg_endpoints),

		.endpoints = cs42l43_amp_spkagg_endpoints,

		.name_prefix = "cs42l43"

	}

};



static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = {

	{

		.adr = 0x00023001fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "AMP1"

	},

	{

		.adr = 0x00023101fa355601ull,

		.num_endpoints = 1,

		.endpoints = &spk_r_endpoint,

		.name_prefix = "AMP2"

	}

};



static const struct snd_soc_acpi_adr_device cs35l56_1_3amp_adr[] = {

	{

		.adr = 0x00013001fa355601ull,
@@ -422,6 +446,15 @@ static const struct snd_soc_acpi_adr_device rt1320_2_group2_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt1320_2_group2_l_adr[] = {

	{

		.adr = 0x000230025D132001ull,

		.num_endpoints = 1,

		.endpoints = &spk_l_endpoint,

		.name_prefix = "rt1320-1"

	}

};



static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = {

	{

		.adr = 0x000330025D132001ull,
@@ -431,6 +464,20 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group2_adr[] = { 
	}

};



static const struct snd_soc_acpi_link_adr ptl_cs42l43_agg_l3_cs35l56_l2[] = {

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(cs42l43_3_agg_adr),

		.adr_d = cs42l43_3_agg_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(cs35l56_2_lr_adr),

		.adr_d = cs35l56_2_lr_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = {

	{

		.mask = BIT(2),
@@ -486,6 +533,25 @@ static const struct snd_soc_acpi_link_adr ptl_rt722_l3[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr ptl_rt722_l0_rt1320_l23[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt722_0_single_adr),

		.adr_d = rt722_0_single_adr,

	},

	{

		.mask = BIT(2),

		.num_adr = ARRAY_SIZE(rt1320_2_group2_l_adr),

		.adr_d = rt1320_2_group2_l_adr,

	},

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt1320_3_group2_adr),

		.adr_d = rt1320_3_group2_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr ptl_rvp[] = {

	{

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

		.sof_tplg_filename = "sof-ptl-cs42l43-l2-cs35l56x6-l13.tplg",

	},

	{

		.link_mask = BIT(0) | BIT(2) | BIT(3),

		.links = ptl_rt722_l0_rt1320_l23,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt722-l0-rt1320-l23.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

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

		.links = ptl_sdw_rt712_vb_l2_rt1320_l1,
@@ -640,6 +713,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { 
		.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l2.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

		.link_mask = BIT(2) | BIT(3),

		.links = ptl_cs42l43_agg_l3_cs35l56_l2,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-cs42l43-agg-l3-cs35l56-l2.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = ptl_rvp,