Unverified Commit 8e2cc2b2 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: pxa: Rename set_fmt_new back to set_fmt 



Now the core has been migrated across to the new direct clock
specification we can move the drivers back to the normal set_fmt
callback.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-44-ckeepax@opensource.cirrus.com


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

sound/soc/pxa/mmp-sspa.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ static const struct snd_soc_dai_ops mmp_sspa_dai_ops = { 
	.hw_params	= mmp_sspa_hw_params,

	.hw_params	= mmp_sspa_hw_params,

	.set_sysclk	= mmp_sspa_set_dai_sysclk,

	.set_sysclk	= mmp_sspa_set_dai_sysclk,

	.set_pll	= mmp_sspa_set_dai_pll,

	.set_pll	= mmp_sspa_set_dai_pll,

	.set_fmt_new	= mmp_sspa_set_dai_fmt,

	.set_fmt	= mmp_sspa_set_dai_fmt,

};

};





static struct snd_soc_dai_driver mmp_sspa_dai = {

static struct snd_soc_dai_driver mmp_sspa_dai = {

sound/soc/pxa/pxa-ssp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -824,7 +824,7 @@ static const struct snd_soc_dai_ops pxa_ssp_dai_ops = { 
	.trigger	= pxa_ssp_trigger,

	.trigger	= pxa_ssp_trigger,

	.hw_params	= pxa_ssp_hw_params,

	.hw_params	= pxa_ssp_hw_params,

	.set_sysclk	= pxa_ssp_set_dai_sysclk,

	.set_sysclk	= pxa_ssp_set_dai_sysclk,

	.set_fmt_new	= pxa_ssp_set_dai_fmt,

	.set_fmt	= pxa_ssp_set_dai_fmt,

	.set_tdm_slot	= pxa_ssp_set_dai_tdm_slot,

	.set_tdm_slot	= pxa_ssp_set_dai_tdm_slot,

	.set_tristate	= pxa_ssp_set_dai_tristate,

	.set_tristate	= pxa_ssp_set_dai_tristate,

};

};

sound/soc/pxa/pxa2xx-i2s.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -333,7 +333,7 @@ static const struct snd_soc_dai_ops pxa_i2s_dai_ops = { 
	.shutdown	= pxa2xx_i2s_shutdown,

	.shutdown	= pxa2xx_i2s_shutdown,

	.trigger	= pxa2xx_i2s_trigger,

	.trigger	= pxa2xx_i2s_trigger,

	.hw_params	= pxa2xx_i2s_hw_params,

	.hw_params	= pxa2xx_i2s_hw_params,

	.set_fmt_new	= pxa2xx_i2s_set_dai_fmt,

	.set_fmt	= pxa2xx_i2s_set_dai_fmt,

	.set_sysclk	= pxa2xx_i2s_set_dai_sysclk,

	.set_sysclk	= pxa2xx_i2s_set_dai_sysclk,

};

};