Unverified Commit cd486d37 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_cs42l42: add adl_mx98360a_cs4242 board config 



This patch adds driver data for adl_mx98360a_cs4242 which supports
two max98360a speaker amplifiers on SSP1 and cs42l42 headphone codec
on SSP0 running on ADL platform.

Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220708110030.658468-3-brent.lu@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1460b85d

sound/soc/intel/boards/sof_cs42l42.c

+11 −0
Original line number Diff line number Diff line
@@ -700,6 +700,17 @@ static const struct platform_device_id board_ids[] = { 
					SOF_CS42L42_SSP_AMP(1)) |

					SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_NONE),

	},

	{

		.name = "adl_mx98360a_cs4242",

		.driver_data = (kernel_ulong_t)(SOF_CS42L42_SSP_CODEC(0) |

				SOF_SPEAKER_AMP_PRESENT |

				SOF_MAX98360A_SPEAKER_AMP_PRESENT |

				SOF_CS42L42_SSP_AMP(1) |

				SOF_CS42L42_NUM_HDMIDEV(4) |

				SOF_BT_OFFLOAD_PRESENT |

				SOF_CS42L42_SSP_BT(2) |

				SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_BT)),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

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

+7 −0
Original line number Diff line number Diff line
@@ -479,6 +479,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_rt5682",

		.sof_tplg_filename = "sof-adl-rt5682.tplg",

	},

	{

		.id = "10134242",

		.drv_name = "adl_mx98360a_cs4242",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98360a_amp,

		.sof_tplg_filename = "sof-adl-max98360a-cs42l42.tplg",

	},

	/* place amp-only boards in the end of table */

	{

		.id = "CSC3541",