| Message ID | 20220519154318.2153729-53-ckeepax@opensource.cirrus.com |
|---|---|
| State | New |
| Headers | show |
| Series | Specify clock provider directly to CPU DAIs | expand |
On 19/05/2022 18:43, Charles Keepax wrote: > 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. Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> > --- > sound/soc/ti/davinci-i2s.c | 2 +- > sound/soc/ti/davinci-mcasp.c | 2 +- > sound/soc/ti/omap-mcbsp.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c > index c7368d5296688..fe572b720b094 100644 > --- a/sound/soc/ti/davinci-i2s.c > +++ b/sound/soc/ti/davinci-i2s.c > @@ -606,7 +606,7 @@ static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { > .prepare = davinci_i2s_prepare, > .trigger = davinci_i2s_trigger, > .hw_params = davinci_i2s_hw_params, > - .set_fmt_new = davinci_i2s_set_dai_fmt, > + .set_fmt = davinci_i2s_set_dai_fmt, > .set_clkdiv = davinci_i2s_dai_set_clkdiv, > > }; > diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c > index 961bac6963652..e2aab4729f3ab 100644 > --- a/sound/soc/ti/davinci-mcasp.c > +++ b/sound/soc/ti/davinci-mcasp.c > @@ -1620,7 +1620,7 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { > .trigger = davinci_mcasp_trigger, > .delay = davinci_mcasp_delay, > .hw_params = davinci_mcasp_hw_params, > - .set_fmt_new = davinci_mcasp_set_dai_fmt, > + .set_fmt = davinci_mcasp_set_dai_fmt, > .set_clkdiv = davinci_mcasp_set_clkdiv, > .set_sysclk = davinci_mcasp_set_sysclk, > .set_tdm_slot = davinci_mcasp_set_tdm_slot, > diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c > index 5bfb56d4ff844..58d8e200a7b97 100644 > --- a/sound/soc/ti/omap-mcbsp.c > +++ b/sound/soc/ti/omap-mcbsp.c > @@ -1271,7 +1271,7 @@ static const struct snd_soc_dai_ops mcbsp_dai_ops = { > .trigger = omap_mcbsp_dai_trigger, > .delay = omap_mcbsp_dai_delay, > .hw_params = omap_mcbsp_dai_hw_params, > - .set_fmt_new = omap_mcbsp_dai_set_dai_fmt, > + .set_fmt = omap_mcbsp_dai_set_dai_fmt, > .set_clkdiv = omap_mcbsp_dai_set_clkdiv, > .set_sysclk = omap_mcbsp_dai_set_dai_sysclk, > };
diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c index c7368d5296688..fe572b720b094 100644 --- a/sound/soc/ti/davinci-i2s.c +++ b/sound/soc/ti/davinci-i2s.c @@ -606,7 +606,7 @@ static const struct snd_soc_dai_ops davinci_i2s_dai_ops = { .prepare = davinci_i2s_prepare, .trigger = davinci_i2s_trigger, .hw_params = davinci_i2s_hw_params, - .set_fmt_new = davinci_i2s_set_dai_fmt, + .set_fmt = davinci_i2s_set_dai_fmt, .set_clkdiv = davinci_i2s_dai_set_clkdiv, }; diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 961bac6963652..e2aab4729f3ab 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1620,7 +1620,7 @@ static const struct snd_soc_dai_ops davinci_mcasp_dai_ops = { .trigger = davinci_mcasp_trigger, .delay = davinci_mcasp_delay, .hw_params = davinci_mcasp_hw_params, - .set_fmt_new = davinci_mcasp_set_dai_fmt, + .set_fmt = davinci_mcasp_set_dai_fmt, .set_clkdiv = davinci_mcasp_set_clkdiv, .set_sysclk = davinci_mcasp_set_sysclk, .set_tdm_slot = davinci_mcasp_set_tdm_slot, diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 5bfb56d4ff844..58d8e200a7b97 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -1271,7 +1271,7 @@ static const struct snd_soc_dai_ops mcbsp_dai_ops = { .trigger = omap_mcbsp_dai_trigger, .delay = omap_mcbsp_dai_delay, .hw_params = omap_mcbsp_dai_hw_params, - .set_fmt_new = omap_mcbsp_dai_set_dai_fmt, + .set_fmt = omap_mcbsp_dai_set_dai_fmt, .set_clkdiv = omap_mcbsp_dai_set_clkdiv, .set_sysclk = omap_mcbsp_dai_set_dai_sysclk, };
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: Charles Keepax <ckeepax@opensource.cirrus.com> --- sound/soc/ti/davinci-i2s.c | 2 +- sound/soc/ti/davinci-mcasp.c | 2 +- sound/soc/ti/omap-mcbsp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)