Unverified Commit 4dc6737c authored by V sujith kumar Reddy's avatar V sujith kumar Reddy Committed by Mark Brown
Browse files

ASoC: amd: acp: Add support for rt5682s and rt1019 card with hs instance 



We have new platform with rt5682s as a primary codec and rt1019 as an
amp codec. Add machine struct to register sof audio based sound card
on such Chrome machine.

Here we are configuring as a soc mclk master and codec slave.

Signed-off-by: default avatarV sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20220531120813.47116-3-Vsujithkumar.Reddy@amd.com


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

sound/soc/amd/acp-config.c

+9 −0
Original line number Diff line number Diff line
@@ -147,6 +147,15 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[] = { 
		.fw_filename = "sof-rmb.ri",

		.sof_tplg_filename = "sof-rmb-nau8825-max98360.tplg",

	},

	{

		.id = "RTL5682",

		.drv_name = "rt5682s-hs-rt1019",

		.pdata = &acp_quirk_data,

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &amp_rt1019,

		.fw_filename = "sof-rmb.ri",

		.sof_tplg_filename = "sof-rmb-rt5682s-rt1019.tplg",

	},

	{},

};

EXPORT_SYMBOL(snd_soc_acpi_amd_rmb_sof_machines);

sound/soc/amd/acp/acp-mach-common.c

+57 −10
Original line number Diff line number Diff line
@@ -149,9 +149,14 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream) 
	struct acp_card_drvdata *drvdata = card->drvdata;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int ret;

	unsigned int fmt;



	ret =  snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				   | SND_SOC_DAIFMT_CBP_CFP);

	if (drvdata->soc_mclk)

		fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;

	else

		fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;



	ret =  snd_soc_dai_set_fmt(codec_dai, fmt);

	if (ret < 0) {

		dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret);

		return ret;
@@ -162,10 +167,13 @@ static int acp_card_hs_startup(struct snd_pcm_substream *substream) 
				      &constraints_channels);

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,

				      &constraints_rates);



	if (!drvdata->soc_mclk) {

		ret = acp_clk_enable(drvdata);

	if (ret < 0)

		if (ret < 0) {

			dev_err(rtd->card->dev, "Failed to enable HS clk: %d\n", ret);

			return ret;

		}

	}



	return ret;

}
@@ -201,6 +209,7 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
	struct acp_card_drvdata *drvdata = card->drvdata;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct snd_soc_component *component = codec_dai->component;

	unsigned int fmt;

	int ret;



	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);
@@ -208,8 +217,12 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
	if (drvdata->hs_codec_id != RT5682S)

		return -EINVAL;



	ret =  snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF

				   | SND_SOC_DAIFMT_CBP_CFP);

	if (drvdata->soc_mclk)

		fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC;

	else

		fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBP_CFP;



	ret =  snd_soc_dai_set_fmt(codec_dai, fmt);

	if (ret < 0) {

		dev_err(rtd->card->dev, "Failed to set dai fmt: %d\n", ret);

		return ret;
@@ -236,8 +249,10 @@ static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	if (!drvdata->soc_mclk) {

		drvdata->wclk = clk_get(component->dev, "rt5682-dai-wclk");

		drvdata->bclk = clk_get(component->dev, "rt5682-dai-bclk");

	}



	ret = snd_soc_card_jack_new(card, "Headset Jack",

				    SND_JACK_HEADSET | SND_JACK_LINEOUT |
@@ -298,6 +313,9 @@ static const struct snd_soc_ops acp_card_dmic_ops = { 
SND_SOC_DAILINK_DEF(rt1019,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:00", "rt1019-aif"),

			  COMP_CODEC("i2c-10EC1019:01", "rt1019-aif")));

SND_SOC_DAILINK_DEF(rt1019_1,

		    DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:02", "rt1019-aif"),

		    COMP_CODEC("i2c-10EC1019:01", "rt1019-aif")));



static const struct snd_soc_dapm_route rt1019_map_lr[] = {

	{ "Left Spk", NULL, "Left SPO" },
@@ -315,6 +333,17 @@ static struct snd_soc_codec_conf rt1019_conf[] = { 
	},

};



static struct snd_soc_codec_conf rt1019_1_conf[] = {

	{

		.dlc = COMP_CODEC_CONF("i2c-10EC1019:02"),

		.name_prefix = "Left",

	},

	{

		.dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),

		.name_prefix = "Right",

	},

};



static int acp_card_rt1019_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;
@@ -618,6 +647,12 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
			links[i].init = acp_card_nau8825_init;

			links[i].ops = &acp_card_nau8825_ops;

		}

		if (drv_data->hs_codec_id == RT5682S) {

			links[i].codecs = rt5682s;

			links[i].num_codecs = ARRAY_SIZE(rt5682s);

			links[i].init = acp_card_rt5682s_init;

			links[i].ops = &acp_card_rt5682s_ops;

		}

		i++;

	}
@@ -674,6 +709,18 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
			links[i].ops = &acp_card_maxim_ops;

			links[i].init = acp_card_maxim_init;

		}

		if (drv_data->amp_codec_id == RT1019) {

			links[i].codecs = rt1019;

			links[i].num_codecs = ARRAY_SIZE(rt1019);

			links[i].ops = &acp_card_rt1019_ops;

			links[i].init = acp_card_rt1019_init;

			card->codec_conf = rt1019_conf;

			card->num_configs = ARRAY_SIZE(rt1019_conf);

			links[i].codecs = rt1019_1;

			links[i].num_codecs = ARRAY_SIZE(rt1019_1);

			card->codec_conf = rt1019_1_conf;

			card->num_configs = ARRAY_SIZE(rt1019_1_conf);

		}

		i++;

	}

sound/soc/amd/acp/acp-sof-mach.c

+15 −0
Original line number Diff line number Diff line
@@ -66,6 +66,16 @@ static struct acp_card_drvdata sof_nau8825_data = { 
	.soc_mclk = true,

};



static struct acp_card_drvdata sof_rt5682s_hs_rt1019_data = {

	.hs_cpu_id = I2S_HS,

	.amp_cpu_id = I2S_HS,

	.dmic_cpu_id = DMIC,

	.hs_codec_id = RT5682S,

	.amp_codec_id = RT1019,

	.dmic_codec_id = DMIC,

	.soc_mclk = true,

};



static const struct snd_kcontrol_new acp_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone Jack"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -138,6 +148,10 @@ static const struct platform_device_id board_ids[] = { 
		.name = "nau8825-max",

		.driver_data = (kernel_ulong_t)&sof_nau8825_data

	},

	{

		.name = "rt5682s-hs-rt1019",

		.driver_data = (kernel_ulong_t)&sof_rt5682s_hs_rt1019_data

	},

	{ }

};

static struct platform_driver acp_asoc_audio = {
@@ -158,4 +172,5 @@ MODULE_ALIAS("platform:rt5682-max"); 
MODULE_ALIAS("platform:rt5682s-max");

MODULE_ALIAS("platform:rt5682s-rt1019");

MODULE_ALIAS("platform:nau8825-max");

MODULE_ALIAS("platform:rt5682s-hs-rt1019");

MODULE_LICENSE("GPL v2");