Unverified Commit 8b725626 authored by Ajit Kumar Pandey's avatar Ajit Kumar Pandey Committed by Mark Brown
Browse files

ASoC: amd: acp: Add support for RT5682-VS codec 



In newer variants primary codec is rt5682vs. Add support for newer
codec variants in generic machine driver module and define driver
data to register SOF sound card.

Signed-off-by: default avatarAjit Kumar Pandey <AjitKumar.Pandey@amd.com>
Link: https://lore.kernel.org/r/20211019070938.5076-9-AjitKumar.Pandey@amd.com


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

sound/soc/amd/acp/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ config SND_SOC_AMD_MACH_COMMON 
	select SND_SOC_DMIC

	select SND_SOC_RT1019

	select SND_SOC_MAX98357A

	select SND_SOC_RT5682S

	depends on X86 && PCI && I2C

	help

	  This option enables common Machine driver module for ACP.

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

+96 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "../../codecs/rt5682.h"

#include "../../codecs/rt1019.h"

#include "../../codecs/rt5682s.h"

#include "acp-mach.h"



#define PCO_PLAT_CLK 48000000
@@ -182,6 +183,89 @@ static const struct snd_soc_ops acp_card_rt5682_ops = { 
	.shutdown = acp_card_shutdown,

};



/* Define RT5682S CODEC component*/

SND_SOC_DAILINK_DEF(rt5682s,

		    DAILINK_COMP_ARRAY(COMP_CODEC("i2c-RTL5682:00", "rt5682s-aif1")));



static const struct snd_soc_dapm_route rt5682s_map[] = {

	{ "Headphone Jack", NULL, "HPOL" },

	{ "Headphone Jack", NULL, "HPOR" },

	{ "IN1P", NULL, "Headset Mic" },

};



static int acp_card_rt5682s_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_card *card = rtd->card;

	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;

	int ret;



	dev_info(rtd->dev, "codec dai name = %s\n", codec_dai->name);



	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 (ret < 0) {

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

		return ret;

	}



	ret = snd_soc_dai_set_pll(codec_dai, RT5682S_PLL2, RT5682S_PLL_S_MCLK,

				  PCO_PLAT_CLK, RT5682_PLL_FREQ);

	if (ret < 0) {

		dev_err(rtd->dev, "Failed to set codec PLL: %d\n", ret);

		return ret;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, RT5682S_SCLK_S_PLL2,

				     RT5682_PLL_FREQ, SND_SOC_CLOCK_IN);

	if (ret < 0) {

		dev_err(rtd->dev, "Failed to set codec SYSCLK: %d\n", ret);

		return ret;

	}



	/* Set tdm/i2s1 master bclk ratio */

	ret = snd_soc_dai_set_bclk_ratio(codec_dai, 64);

	if (ret < 0) {

		dev_err(rtd->dev, "Failed to set rt5682 tdm bclk ratio: %d\n", ret);

		return ret;

	}



	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 |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &pco_jack, NULL, 0);

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;

	}



	snd_jack_set_key(pco_jack.jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);

	snd_jack_set_key(pco_jack.jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);

	snd_jack_set_key(pco_jack.jack, SND_JACK_BTN_2, KEY_VOLUMEUP);

	snd_jack_set_key(pco_jack.jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);



	ret = snd_soc_component_set_jack(component, &pco_jack, NULL);

	if (ret) {

		dev_err(rtd->dev, "Headset Jack call-back failed: %d\n", ret);

		return ret;

	}



	return snd_soc_dapm_add_routes(&rtd->card->dapm, rt5682s_map, ARRAY_SIZE(rt5682s_map));

}



static const struct snd_soc_ops acp_card_rt5682s_ops = {

	.startup = acp_card_hs_startup,

	.shutdown = acp_card_shutdown,

};



/* Declare RT1019 codec components */

SND_SOC_DAILINK_DEF(rt1019,

	DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:01", "rt1019-aif"),
@@ -370,6 +454,12 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
			links[i].init = acp_card_rt5682_init;

			links[i].ops = &acp_card_rt5682_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++;

	}
@@ -462,6 +552,12 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card) 
			links[i].init = acp_card_rt5682_init;

			links[i].ops = &acp_card_rt5682_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++;

	}

sound/soc/amd/acp/acp-mach.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum codec_endpoints { 
	RT5682,

	RT1019,

	MAX98360A,

	RT5682S,

};



struct acp_card_drvdata {

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

+14 −0
Original line number Diff line number Diff line
@@ -38,6 +38,15 @@ static struct acp_card_drvdata sof_rt5682_max_data = { 
	.dmic_codec_id = DMIC,

};



static struct acp_card_drvdata sof_rt5682s_max_data = {

	.hs_cpu_id = I2S_SP,

	.amp_cpu_id = I2S_SP,

	.dmic_cpu_id = DMIC,

	.hs_codec_id = RT5682S,

	.amp_codec_id = MAX98360A,

	.dmic_codec_id = DMIC,

};



static const struct snd_kcontrol_new acp_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone Jack"),

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

		.driver_data = (kernel_ulong_t)&sof_rt5682_max_data

	},

	{

		.name = "rt5682s-max",

		.driver_data = (kernel_ulong_t)&sof_rt5682s_max_data

	},

	{ }

};

static struct platform_driver acp_asoc_audio = {
@@ -114,4 +127,5 @@ MODULE_IMPORT_NS(SND_SOC_AMD_MACH); 
MODULE_DESCRIPTION("ACP chrome SOF audio support");

MODULE_ALIAS("platform:rt5682-rt1019");

MODULE_ALIAS("platform:rt5682-max");

MODULE_ALIAS("platform:rt5682s-max");

MODULE_LICENSE("GPL v2");