Unverified Commit 719e8179 authored by Yong Zhi's avatar Yong Zhi Committed by Mark Brown
Browse files

ASoC: intel: sof_rt5682: Add support for jsl-max98360a-rt5682 



Add support for max98360a speaker amp on SSP1 and ALC5682 on SSP0
for jsl+ platform.

Signed-off-by: default avatarYong Zhi <yong.zhi@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200625191308.3322-10-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_rt5682.c

+23 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
	((quirk << SOF_RT5682_NUM_HDMIDEV_SHIFT) & SOF_RT5682_NUM_HDMIDEV_MASK)

#define SOF_RT1015_SPEAKER_AMP_PRESENT		BIT(13)

#define SOF_MAX98373_SPEAKER_AMP_PRESENT	BIT(14)

#define SOF_MAX98360A_SPEAKER_AMP_PRESENT	BIT(15)



/* Default: MCLK on, MCLK 19.2M, SSP0  */

static unsigned long sof_rt5682_quirk = SOF_RT5682_MCLK_EN |
@@ -500,6 +501,13 @@ static struct snd_soc_dai_link_component max98357a_component[] = { 
	}

};



static struct snd_soc_dai_link_component max98360a_component[] = {

	{

		.name = "MX98360A:00",

		.dai_name = "HiFi",

	}

};



static struct snd_soc_dai_link_component rt1015_components[] = {

	{

		.name = "i2c-10EC1015:00",
@@ -662,6 +670,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, 
			links[id].num_codecs = ARRAY_SIZE(max_98373_components);

			links[id].init = max98373_spk_codec_init;

			links[id].ops = &max_98373_ops;

		} else if (sof_rt5682_quirk &

				SOF_MAX98360A_SPEAKER_AMP_PRESENT) {

			links[id].codecs = max98360a_component;

			links[id].num_codecs = ARRAY_SIZE(max98360a_component);

			links[id].init = speaker_codec_init;

		} else {

			links[id].codecs = max98357a_component;

			links[id].num_codecs = ARRAY_SIZE(max98357a_component);
@@ -833,6 +846,15 @@ static const struct platform_device_id board_ids[] = { 
					SOF_RT5682_SSP_AMP(1) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{

		.name = "jsl_rt5682_max98360a",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_MCLK_24MHZ |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98360A_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(1)),

	},

	{ }

};
@@ -855,3 +877,4 @@ MODULE_ALIAS("platform:sof_rt5682"); 
MODULE_ALIAS("platform:tgl_max98357a_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_rt1015");

MODULE_ALIAS("platform:tgl_max98373_rt5682");

MODULE_ALIAS("platform:jsl_rt5682_max98360a");

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

+13 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ static struct snd_soc_acpi_codecs rt1015_spk = { 
	.codecs = {"10EC1015"}

};



static struct snd_soc_acpi_codecs mx98360a_spk = {

	.num_codecs = 1,

	.codecs = {"MX98360A"}

};



/*

 * When adding new entry to the snd_soc_acpi_intel_jsl_machines array,

 * use .quirk_data member to distinguish different machine driver,
@@ -47,6 +52,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { 
		.quirk_data = &rt1015_spk,

		.sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",

	},

	{

		.id = "10EC5682",

		.drv_name = "jsl_rt5682_max98360a",

		.sof_fw_filename = "sof-jsl.ri",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mx98360a_spk,

		.sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_jsl_machines);