Unverified Commit 828497fb authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Add Intel machine driver support for CS35L63 

Merge series from Stefan Binding <sbinding@opensource.cirrus.com>:

This adds support to the Intel machine drivers for CS35L63 codecs using
soundwire, and also adds match entries for the CDB35L63-CB2 on MTL
systems.
parents 15c2b04a 8c4d2cc1

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

+38 −0
Original line number Diff line number Diff line
@@ -730,6 +730,24 @@ static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device cs35l63_1_fb_adr[] = {

	{

		.adr = 0x00013001FA356301ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_l_fb_endpoints),

		.endpoints = cs35l56_l_fb_endpoints,

		.name_prefix = "AMP1"

	},

};



static const struct snd_soc_acpi_adr_device cs35l63_3_fb_adr[] = {

	{

		.adr = 0x00033101FA356301ull,

		.num_endpoints = ARRAY_SIZE(cs35l56_r_fb_endpoints),

		.endpoints = cs35l56_r_fb_endpoints,

		.name_prefix = "AMP2"

	},

};



static const struct snd_soc_acpi_link_adr rt5682_link2_max98373_link0[] = {

	/* Expected order: jack -> amp */

	{
@@ -1027,6 +1045,20 @@ static const struct snd_soc_acpi_link_adr mtl_cs35l56_x8_link0_link1_fb[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr mtl_cs35l63_x2_link1_link3_fb[] = {

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(cs35l63_3_fb_adr),

		.adr_d = cs35l63_3_fb_adr,

	},

	{

		.mask = BIT(1),

		.num_adr = ARRAY_SIZE(cs35l63_1_fb_adr),

		.adr_d = cs35l63_1_fb_adr,

	},

	{}

};



/* this table is used when there is no I2S codec present */

struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {

	/* mockup tests need to be first */
@@ -1134,6 +1166,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { 
		.sof_tplg_filename = "sof-mtl-cs42l43-l0.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

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

		.links = mtl_cs35l63_x2_link1_link3_fb,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-mtl-cs35l56-l01-fb8.tplg",

	},

	{

		.link_mask = GENMASK(3, 0),

		.links = mtl_3_in_1_sdca,

sound/soc/sdw_utils/soc_sdw_utils.c

+25 −0
Original line number Diff line number Diff line
@@ -510,6 +510,31 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
		},

		.dai_num = 2,

	},

	{

		.part_id = 0x3563,

		.dais = {

			{

				.direction = {true, false},

				.dai_name = "cs35l56-sdw1",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_cs_amp_init,

				.rtd_init = asoc_sdw_cs_spk_rtd_init,

				.controls = generic_spk_controls,

				.num_controls = ARRAY_SIZE(generic_spk_controls),

				.widgets = generic_spk_widgets,

				.num_widgets = ARRAY_SIZE(generic_spk_widgets),

			},

			{

				.direction = {false, true},

				.dai_name = "cs35l56-sdw1c",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.rtd_init = asoc_sdw_cs_spk_feedback_rtd_init,

			},

		},

		.dai_num = 2,

	},

	{

		.part_id = 0x4242,

		.dais = {