ASoC: ti: Migrate to new style legacy DAI naming flag
Change the legacy DAI naming flag from opting in to the new scheme (non_legacy_dai_naming), to opting out of it (legacy_dai_naming). These drivers appear to be on the CPU side of the DAI link and currently uses the legacy naming, so add the new flag. Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20220623125250.2355471-32-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
768be0d633
commit
39c84e77da
|
@ -640,7 +640,8 @@ static struct snd_soc_dai_driver davinci_i2s_dai = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver davinci_i2s_component = {
|
static const struct snd_soc_component_driver davinci_i2s_component = {
|
||||||
.name = DRV_NAME,
|
.name = DRV_NAME,
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int davinci_i2s_probe(struct platform_device *pdev)
|
static int davinci_i2s_probe(struct platform_device *pdev)
|
||||||
|
|
|
@ -1765,7 +1765,8 @@ static struct snd_soc_dai_driver davinci_mcasp_dai[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver davinci_mcasp_component = {
|
static const struct snd_soc_component_driver davinci_mcasp_component = {
|
||||||
.name = "davinci-mcasp",
|
.name = "davinci-mcasp",
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Some HW specific values and defaults. The rest is filled in from DT. */
|
/* Some HW specific values and defaults. The rest is filled in from DT. */
|
||||||
|
|
|
@ -185,7 +185,8 @@ static struct snd_soc_dai_driver davinci_vcif_dai = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver davinci_vcif_component = {
|
static const struct snd_soc_component_driver davinci_vcif_component = {
|
||||||
.name = "davinci-vcif",
|
.name = "davinci-vcif",
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int davinci_vcif_probe(struct platform_device *pdev)
|
static int davinci_vcif_probe(struct platform_device *pdev)
|
||||||
|
|
|
@ -453,7 +453,8 @@ static struct snd_soc_dai_driver omap_dmic_dai = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver omap_dmic_component = {
|
static const struct snd_soc_component_driver omap_dmic_component = {
|
||||||
.name = "omap-dmic",
|
.name = "omap-dmic",
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int asoc_dmic_probe(struct platform_device *pdev)
|
static int asoc_dmic_probe(struct platform_device *pdev)
|
||||||
|
|
|
@ -275,6 +275,7 @@ static const struct snd_soc_dai_ops hdmi_dai_ops = {
|
||||||
|
|
||||||
static const struct snd_soc_component_driver omap_hdmi_component = {
|
static const struct snd_soc_component_driver omap_hdmi_component = {
|
||||||
.name = "omapdss_hdmi",
|
.name = "omapdss_hdmi",
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct snd_soc_dai_driver omap5_hdmi_dai = {
|
static struct snd_soc_dai_driver omap5_hdmi_dai = {
|
||||||
|
|
|
@ -1317,7 +1317,8 @@ static struct snd_soc_dai_driver omap_mcbsp_dai = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver omap_mcbsp_component = {
|
static const struct snd_soc_component_driver omap_mcbsp_component = {
|
||||||
.name = "omap-mcbsp",
|
.name = "omap-mcbsp",
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct omap_mcbsp_platform_data omap2420_pdata = {
|
static struct omap_mcbsp_platform_data omap2420_pdata = {
|
||||||
|
|
|
@ -524,9 +524,10 @@ static struct snd_soc_dai_driver omap_mcpdm_dai = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_soc_component_driver omap_mcpdm_component = {
|
static const struct snd_soc_component_driver omap_mcpdm_component = {
|
||||||
.name = "omap-mcpdm",
|
.name = "omap-mcpdm",
|
||||||
.suspend = omap_mcpdm_suspend,
|
.suspend = omap_mcpdm_suspend,
|
||||||
.resume = omap_mcpdm_resume,
|
.resume = omap_mcpdm_resume,
|
||||||
|
.legacy_dai_naming = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd,
|
void omap_mcpdm_configure_dn_offsets(struct snd_soc_pcm_runtime *rtd,
|
||||||
|
|
Loading…
Reference in New Issue