Unverified Commit a7ff5268 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rockchip: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87h7yfir5i.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/rockchip/rk3288_hdmi_analog.c

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ static int rk_hw_params(struct snd_pcm_substream *substream, 
{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	int mclk;



	switch (params_rate(params)) {

sound/soc/rockchip/rk3399_gru_sound.c

+8 −8
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substrea 


	mclk = params_rate(params) * SOUND_FS;



	ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0);

	ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk, 0);

	if (ret) {

		dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n",

				__func__, mclk, ret);
@@ -71,8 +71,8 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, 
			     struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	unsigned int mclk;

	int ret;
@@ -103,8 +103,8 @@ static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, 
			     struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	int mclk, ret;



	/* in bypass mode, the mclk has to be one of the frequencies below */
@@ -153,8 +153,8 @@ static int rockchip_sound_da7219_hw_params(struct snd_pcm_substream *substream, 


static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component = rtd->codec_dais[0]->component;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

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

	int ret;



	/* We need default MCLK and PLL settings for the accessory detection */
@@ -206,7 +206,7 @@ static int rockchip_sound_dmic_hw_params(struct snd_pcm_substream *substream, 


	mclk = params_rate(params) * SOUND_FS;



	ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0);

	ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk, 0);

	if (ret) {

		dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n",

				__func__, mclk, ret);

sound/soc/rockchip/rockchip_max98090.c

+3 −3
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, 
{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	int mclk;



	switch (params_rate(params)) {
@@ -227,7 +227,7 @@ static struct snd_soc_jack rk_hdmi_jack; 
static int rk_hdmi_init(struct snd_soc_pcm_runtime *runtime)

{

	struct snd_soc_card *card = runtime->card;

	struct snd_soc_component *component = runtime->codec_dai->component;

	struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component;

	int ret;



	/* enable jack detection */

sound/soc/rockchip/rockchip_rt5645.c

+3 −3
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, 
{

	int ret = 0;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

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

	int mclk;



	switch (params_rate(params)) {
@@ -113,7 +113,7 @@ static int rk_init(struct snd_soc_pcm_runtime *runtime) 
		return ret;

	}



	return rt5645_set_jack_detect(runtime->codec_dai->component,

	return rt5645_set_jack_detect(asoc_rtd_to_codec(runtime, 0)->component,

				     &headset_jack,

				     &headset_jack,

				     &headset_jack);

CRA Git | Maintained and supported by SUSTech CRA and CCSE