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

ASoC: fsl: 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/87v9mvir89.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/fsl/eukrea-tlv320.c

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ static int eukrea_tlv320_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 *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

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

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

	int ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, 0,

sound/soc/fsl/fsl-asoc-card.c

+5 −5
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, 
		return 0;



	/* Specific configurations of DAIs starts from here */

	ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, cpu_priv->sysclk_id[tx],

	ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), cpu_priv->sysclk_id[tx],

				     cpu_priv->sysclk_freq[tx],

				     cpu_priv->sysclk_dir[tx]);

	if (ret && ret != -ENOTSUPP) {
@@ -168,7 +168,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, 
	}



	if (cpu_priv->slot_width) {

		ret = snd_soc_dai_set_tdm_slot(rtd->cpu_dai, 0x3, 0x3, 2,

		ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_cpu(rtd, 0), 0x3, 0x3, 2,

					       cpu_priv->slot_width);

		if (ret && ret != -ENOTSUPP) {

			dev_err(dev, "failed to set TDM slot for cpu dai\n");
@@ -257,7 +257,7 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, 
	int ret;



	rtd = snd_soc_get_pcm_runtime(card, &card->dai_link[0]);

	codec_dai = rtd->codec_dai;

	codec_dai = asoc_rtd_to_codec(rtd, 0);

	if (dapm->dev != codec_dai->dev)

		return 0;
@@ -446,14 +446,14 @@ static int fsl_asoc_card_late_probe(struct snd_soc_card *card) 
	struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card);

	struct snd_soc_pcm_runtime *rtd = list_first_entry(

			&card->rtd_list, struct snd_soc_pcm_runtime, list);

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

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

	struct codec_priv *codec_priv = &priv->codec_priv;

	struct device *dev = card->dev;

	int ret;



	if (fsl_asoc_card_is_ac97(priv)) {

#if IS_ENABLED(CONFIG_SND_AC97_CODEC)

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

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

		struct snd_ac97 *ac97 = snd_soc_component_get_drvdata(component);



		/*

sound/soc/fsl/fsl_asrc_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, 
	for_each_dpcm_be(rtd, stream, dpcm) {

		struct snd_soc_pcm_runtime *be = dpcm->be;

		struct snd_pcm_substream *substream_be;

		struct snd_soc_dai *dai = be->cpu_dai;

		struct snd_soc_dai *dai = asoc_rtd_to_cpu(be, 0);



		if (dpcm->fe != rtd)

			continue;
@@ -169,7 +169,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, 
	}



	/* Override dma_data of the Front-End and config its dmaengine */

	dma_params_fe = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	dma_params_fe = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);

	dma_params_fe->addr = asrc_priv->paddr + REG_ASRDx(!dir, index);

	dma_params_fe->maxburst = dma_params_be->maxburst;
@@ -328,7 +328,7 @@ static int fsl_asrc_dma_startup(struct snd_soc_component *component, 
		goto dma_chan_err;

	}



	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

	dma_data = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);



	/* Refine the snd_imx_hardware according to caps of DMA. */

	ret = snd_dmaengine_pcm_refine_runtime_hwparams(substream,

sound/soc/fsl/fsl_spdif.c

+5 −5
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, 
				int sample_rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control;

	struct regmap *regmap = spdif_priv->regmap;

	struct platform_device *pdev = spdif_priv->pdev;
@@ -458,7 +458,7 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream, 
			     struct snd_soc_dai *cpu_dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct platform_device *pdev = spdif_priv->pdev;

	struct regmap *regmap = spdif_priv->regmap;

	u32 scr, mask;
@@ -534,7 +534,7 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, 
				struct snd_soc_dai *cpu_dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct regmap *regmap = spdif_priv->regmap;

	u32 scr, mask, i;
@@ -569,7 +569,7 @@ static int fsl_spdif_hw_params(struct snd_pcm_substream *substream, 
				struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct spdif_mixer_control *ctrl = &spdif_priv->fsl_spdif_control;

	struct platform_device *pdev = spdif_priv->pdev;

	u32 sample_rate = params_rate(params);
@@ -597,7 +597,7 @@ static int fsl_spdif_trigger(struct snd_pcm_substream *substream, 
				int cmd, struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct regmap *regmap = spdif_priv->regmap;

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;

	u32 intr = SIE_INTR_FOR(tx);

sound/soc/fsl/fsl_ssi.c

+4 −4
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, 
			   struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	int ret;



	ret = clk_prepare_enable(ssi->clk);
@@ -655,7 +655,7 @@ static void fsl_ssi_shutdown(struct snd_pcm_substream *substream, 
			     struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	clk_disable_unprepare(ssi->clk);

}
@@ -854,7 +854,7 @@ static int fsl_ssi_hw_free(struct snd_pcm_substream *substream, 
			   struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));



	if (fsl_ssi_is_i2s_master(ssi) &&

	    ssi->baudclk_streams & BIT(substream->stream)) {
@@ -1059,7 +1059,7 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, 
			   struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(rtd->cpu_dai);

	struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;



	switch (cmd) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE