Unverified Commit 7ede9c4c authored by Mark Brown's avatar Mark Brown
Browse files

Add Machine driver support for nau8825, max98560 and rt5682s, rt1019 

Merge series from V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>:

Add support for some new AMD machines.
parents 52970da2 4dc6737c

sound/soc/amd/acp-config.c

+30 −0
Original line number Diff line number Diff line
@@ -130,4 +130,34 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = { 
};

EXPORT_SYMBOL(snd_soc_acpi_amd_sof_machines);



struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[] = {

	{

		.id = "AMDI1019",

		.drv_name = "rmb-dsp",

		.pdata = &acp_quirk_data,

		.fw_filename = "sof-rmb.ri",

		.sof_tplg_filename = "sof-acp-rmb.tplg",

	},

	{

		.id = "10508825",

		.drv_name = "nau8825-max",

		.pdata = &acp_quirk_data,

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &amp_max,

		.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);



MODULE_LICENSE("Dual BSD/GPL");

sound/soc/amd/acp/Kconfig

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

	select SND_SOC_MAX98357A

	select SND_SOC_RT5682S

	select SND_SOC_NAU8825

	help

	  This option enables common Machine driver module for ACP.

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

+217 −16
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "../../codecs/rt5682.h"

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

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

#include "../../codecs/nau8825.h"

#include "acp-mach.h"



#define PCO_PLAT_CLK 48000000
@@ -148,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;
@@ -161,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;

}
@@ -175,6 +184,7 @@ static void acp_card_shutdown(struct snd_pcm_substream *substream) 
	struct snd_soc_card *card = rtd->card;

	struct acp_card_drvdata *drvdata = card->drvdata;



	if (!drvdata->soc_mclk)

		clk_disable_unprepare(drvdata->wclk);

}
@@ -199,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);
@@ -206,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;
@@ -234,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 |
@@ -296,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" },
@@ -313,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;
@@ -363,7 +394,7 @@ static int acp_card_amp_startup(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_card *card = rtd->card;

	struct acp_card_drvdata *drvdata = card->drvdata;

	int ret;

	int ret = 0;



	runtime->hw.channels_max = DUAL_CHANNEL;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
@@ -371,10 +402,13 @@ static int acp_card_amp_startup(struct snd_pcm_substream *substream) 
	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 AMP clk: %d\n", ret);



			return ret;

		}

	}

	return ret;

}
@@ -409,6 +443,104 @@ static const struct snd_soc_ops acp_card_maxim_ops = { 
	.shutdown = acp_card_shutdown,

};



/* Declare nau8825 codec components */

SND_SOC_DAILINK_DEF(nau8825,

		    DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10508825:00", "nau8825-hifi")));



static const struct snd_soc_dapm_route nau8825_map[] = {

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

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

};



static int acp_card_nau8825_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;

	unsigned int fmt;

	int ret;



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



	if (drvdata->hs_codec_id != NAU8825)

		return -EINVAL;



	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;

	}

	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);

	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, nau8825_map, ARRAY_SIZE(nau8825_map));

}



static int acp_nau8825_hw_params(struct snd_pcm_substream *substream,

				 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

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

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_FLL_FS,

				     (48000 * 256), SND_SOC_CLOCK_IN);

	if (ret < 0)

		dev_err(rtd->dev, "snd_soc_dai_set_sysclk err = %d\n", ret);



	ret = snd_soc_dai_set_pll(codec_dai, 0, 0, params_rate(params),

				  params_rate(params) * 256);

	if (ret < 0) {

		dev_err(rtd->dev, "can't set FLL: %d\n", ret);

		return ret;

	}



	return ret;

}



static int acp_nau8825_startup(struct snd_pcm_substream *substream)

{

	struct snd_pcm_runtime *runtime = substream->runtime;



	runtime->hw.channels_max = 2;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,

				   &constraints_channels);



	runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;

	snd_pcm_hw_constraint_list(runtime, 0,

				   SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);

	return 0;

}



static const struct snd_soc_ops acp_card_nau8825_ops = {

	.startup =  acp_nau8825_startup,

	.hw_params = acp_nau8825_hw_params,

};



/* Declare DMIC codec components */

SND_SOC_DAILINK_DEF(dmic_codec,

		DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
@@ -437,6 +569,8 @@ SND_SOC_DAILINK_DEF(i2s_sp, 
	DAILINK_COMP_ARRAY(COMP_CPU("acp-i2s-sp")));

SND_SOC_DAILINK_DEF(sof_sp,

	DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-sp")));

SND_SOC_DAILINK_DEF(sof_hs,

		    DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-hs")));

SND_SOC_DAILINK_DEF(sof_dmic,

	DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-dmic")));

SND_SOC_DAILINK_DEF(pdm_dmic,
@@ -491,6 +625,37 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
		i++;

	}



	if (drv_data->hs_cpu_id == I2S_HS) {

		links[i].name = "acp-headset-codec";

		links[i].id = HEADSET_BE_ID;

		links[i].cpus = sof_hs;

		links[i].num_cpus = ARRAY_SIZE(sof_hs);

		links[i].platforms = sof_component;

		links[i].num_platforms = ARRAY_SIZE(sof_component);

		links[i].dpcm_playback = 1;

		links[i].dpcm_capture = 1;

		links[i].nonatomic = true;

		links[i].no_pcm = 1;

		if (!drv_data->hs_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

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

		}

		if (drv_data->hs_codec_id == NAU8825) {

			links[i].codecs = nau8825;

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

			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++;

	}



	if (drv_data->amp_cpu_id == I2S_SP) {

		links[i].name = "acp-amp-codec";

		links[i].id = AMP_BE_ID;
@@ -523,6 +688,42 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card) 
		i++;

	}



	if (drv_data->amp_cpu_id == I2S_HS) {

		links[i].name = "acp-amp-codec";

		links[i].id = AMP_BE_ID;

		links[i].cpus = sof_hs;

		links[i].num_cpus = ARRAY_SIZE(sof_hs);

		links[i].platforms = sof_component;

		links[i].num_platforms = ARRAY_SIZE(sof_component);

		links[i].dpcm_playback = 1;

		links[i].nonatomic = true;

		links[i].no_pcm = 1;

		if (!drv_data->amp_codec_id) {

			/* Use dummy codec if codec id not specified */

			links[i].codecs = dummy_codec;

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

		}

		if (drv_data->amp_codec_id == MAX98360A) {

			links[i].codecs = max98360a;

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

			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++;

	}



	if (drv_data->dmic_cpu_id == DMIC) {

		links[i].name = "acp-dmic-codec";

		links[i].id = DMIC_BE_ID;

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

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum be_id { 


enum cpu_endpoints {

	NONE = 0,

	I2S_HS,

	I2S_SP,

	I2S_BT,

	DMIC,
@@ -37,6 +38,7 @@ enum codec_endpoints { 
	RT1019,

	MAX98360A,

	RT5682S,

	NAU8825,

};



struct acp_card_drvdata {
@@ -49,6 +51,7 @@ struct acp_card_drvdata { 
	unsigned int dai_fmt;

	struct clk *wclk;

	struct clk *bclk;

	bool soc_mclk;

};



int acp_sofdsp_dai_links_create(struct snd_soc_card *card);

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

+30 −0
Original line number Diff line number Diff line
@@ -56,6 +56,26 @@ static struct acp_card_drvdata sof_rt5682s_max_data = { 
	.dmic_codec_id = DMIC,

};



static struct acp_card_drvdata sof_nau8825_data = {

	.hs_cpu_id = I2S_HS,

	.amp_cpu_id = I2S_HS,

	.dmic_cpu_id = DMIC,

	.hs_codec_id = NAU8825,

	.amp_codec_id = MAX98360A,

	.dmic_codec_id = DMIC,

	.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"),
@@ -124,6 +144,14 @@ static const struct platform_device_id board_ids[] = { 
		.name = "rt5682s-rt1019",

		.driver_data = (kernel_ulong_t)&sof_rt5682s_rt1019_data

	},

	{

		.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 = {
@@ -143,4 +171,6 @@ MODULE_ALIAS("platform:rt5682-rt1019"); 
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");