Unverified Commit bb24a31e authored by Agrawal, Akshu's avatar Agrawal, Akshu Committed by Mark Brown
Browse files

ASoC: AMD: Configure wclk and bclk of master codec 



With CCF support in da7219, we can now set the correct rate of
wclk and bclk.

Signed-off-by: default avatarAkshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f2a1fdb5

sound/soc/amd/acp-da7219-max98357a.c

+42 −24
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
#define DUAL_CHANNEL		2



static struct snd_soc_jack cz_jack;

static struct clk *da7219_dai_clk;

static struct clk *da7219_dai_wclk;

static struct clk *da7219_dai_bclk;

extern bool bt_uart_enable;



static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
@@ -72,7 +73,8 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	da7219_dai_clk = clk_get(component->dev, "da7219-dai-bclk");

	da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk");

	da7219_dai_bclk = clk_get(component->dev, "da7219-dai-bclk");



	ret = snd_soc_card_jack_new(card, "Headset Jack",

				SND_JACK_HEADSET | SND_JACK_LINEOUT |
@@ -94,12 +96,15 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

}



static int da7219_clk_enable(struct snd_pcm_substream *substream)

static int da7219_clk_enable(struct snd_pcm_substream *substream,

			     int wclk_rate, int bclk_rate)

{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;



	ret = clk_prepare_enable(da7219_dai_clk);

	clk_set_rate(da7219_dai_wclk, wclk_rate);

	clk_set_rate(da7219_dai_bclk, bclk_rate);

	ret = clk_prepare_enable(da7219_dai_bclk);

	if (ret < 0) {

		dev_err(rtd->dev, "can't enable master clock %d\n", ret);

		return ret;
@@ -110,7 +115,7 @@ static int da7219_clk_enable(struct snd_pcm_substream *substream) 


static void da7219_clk_disable(void)

{

	clk_disable_unprepare(da7219_dai_clk);

	clk_disable_unprepare(da7219_dai_bclk);

}



static const unsigned int channels[] = {
@@ -151,7 +156,7 @@ static int cz_da7219_play_startup(struct snd_pcm_substream *substream) 
				   &constraints_rates);



	machine->play_i2s_instance = I2S_SP_INSTANCE;

	return da7219_clk_enable(substream);

	return 0;

}



static int cz_da7219_cap_startup(struct snd_pcm_substream *substream)
@@ -173,12 +178,7 @@ static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) 


	machine->cap_i2s_instance = I2S_SP_INSTANCE;

	machine->capture_channel = CAP_CHANNEL1;

	return da7219_clk_enable(substream);

}



static void cz_da7219_shutdown(struct snd_pcm_substream *substream)

{

	da7219_clk_disable();

	return 0;

}



static int cz_max_startup(struct snd_pcm_substream *substream)
@@ -199,12 +199,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream) 
				   &constraints_rates);



	machine->play_i2s_instance = I2S_BT_INSTANCE;

	return da7219_clk_enable(substream);

}



static void cz_max_shutdown(struct snd_pcm_substream *substream)

{

	da7219_clk_disable();

	return 0;

}



static int cz_dmic0_startup(struct snd_pcm_substream *substream)
@@ -225,7 +220,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) 
				   &constraints_rates);



	machine->cap_i2s_instance = I2S_BT_INSTANCE;

	return da7219_clk_enable(substream);

	return 0;

}



static int cz_dmic1_startup(struct snd_pcm_substream *substream)
@@ -247,10 +242,28 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream) 


	machine->cap_i2s_instance = I2S_SP_INSTANCE;

	machine->capture_channel = CAP_CHANNEL0;

	return da7219_clk_enable(substream);

	return 0;

}



static void cz_dmic_shutdown(struct snd_pcm_substream *substream)

static int cz_da7219_params(struct snd_pcm_substream *substream,

				      struct snd_pcm_hw_params *params)

{

	int wclk, bclk;



	wclk = params_rate(params);

	bclk = wclk * params_channels(params) *

		snd_pcm_format_width(params_format(params));

	/* ADAU7002 spec: "The ADAU7002 requires a BCLK rate

	 * that is minimum of 64x the LRCLK sample rate."

	 * DA7219 is the only clk source so for all codecs

	 * we have to limit bclk to 64X lrclk.

	 */

	if (bclk < (wclk * 64))

		bclk = wclk * 64;

	return da7219_clk_enable(substream, wclk, bclk);

}



static void cz_da7219_shutdown(struct snd_pcm_substream *substream)

{

	da7219_clk_disable();

}
@@ -258,26 +271,31 @@ static void cz_dmic_shutdown(struct snd_pcm_substream *substream) 
static const struct snd_soc_ops cz_da7219_play_ops = {

	.startup = cz_da7219_play_startup,

	.shutdown = cz_da7219_shutdown,

	.hw_params = cz_da7219_params,

};



static const struct snd_soc_ops cz_da7219_cap_ops = {

	.startup = cz_da7219_cap_startup,

	.shutdown = cz_da7219_shutdown,

	.hw_params = cz_da7219_params,

};



static const struct snd_soc_ops cz_max_play_ops = {

	.startup = cz_max_startup,

	.shutdown = cz_max_shutdown,

	.shutdown = cz_da7219_shutdown,

	.hw_params = cz_da7219_params,

};



static const struct snd_soc_ops cz_dmic0_cap_ops = {

	.startup = cz_dmic0_startup,

	.shutdown = cz_dmic_shutdown,

	.shutdown = cz_da7219_shutdown,

	.hw_params = cz_da7219_params,

};



static const struct snd_soc_ops cz_dmic1_cap_ops = {

	.startup = cz_dmic1_startup,

	.shutdown = cz_dmic_shutdown,

	.shutdown = cz_da7219_shutdown,

	.hw_params = cz_da7219_params,

};



static struct snd_soc_dai_link cz_dai_7219_98357[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE