Commit 05603f15 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: pxa: 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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-29-ckeepax@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e750817
...@@ -456,10 +456,11 @@ static int mmp_sspa_close(struct snd_soc_component *component, ...@@ -456,10 +456,11 @@ static int mmp_sspa_close(struct snd_soc_component *component,
} }
static const struct snd_soc_component_driver mmp_sspa_component = { static const struct snd_soc_component_driver mmp_sspa_component = {
.name = "mmp-sspa", .name = "mmp-sspa",
.mmap = mmp_pcm_mmap, .mmap = mmp_pcm_mmap,
.open = mmp_sspa_open, .open = mmp_sspa_open,
.close = mmp_sspa_close, .close = mmp_sspa_close,
.legacy_dai_naming = 1,
}; };
static int asoc_mmp_sspa_probe(struct platform_device *pdev) static int asoc_mmp_sspa_probe(struct platform_device *pdev)
......
...@@ -848,16 +848,17 @@ static struct snd_soc_dai_driver pxa_ssp_dai = { ...@@ -848,16 +848,17 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
}; };
static const struct snd_soc_component_driver pxa_ssp_component = { static const struct snd_soc_component_driver pxa_ssp_component = {
.name = "pxa-ssp", .name = "pxa-ssp",
.pcm_construct = pxa2xx_soc_pcm_new, .pcm_construct = pxa2xx_soc_pcm_new,
.open = pxa2xx_soc_pcm_open, .open = pxa2xx_soc_pcm_open,
.close = pxa2xx_soc_pcm_close, .close = pxa2xx_soc_pcm_close,
.hw_params = pxa2xx_soc_pcm_hw_params, .hw_params = pxa2xx_soc_pcm_hw_params,
.prepare = pxa2xx_soc_pcm_prepare, .prepare = pxa2xx_soc_pcm_prepare,
.trigger = pxa2xx_soc_pcm_trigger, .trigger = pxa2xx_soc_pcm_trigger,
.pointer = pxa2xx_soc_pcm_pointer, .pointer = pxa2xx_soc_pcm_pointer,
.suspend = pxa_ssp_suspend, .suspend = pxa_ssp_suspend,
.resume = pxa_ssp_resume, .resume = pxa_ssp_resume,
.legacy_dai_naming = 1,
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
...@@ -355,16 +355,17 @@ static struct snd_soc_dai_driver pxa_i2s_dai = { ...@@ -355,16 +355,17 @@ static struct snd_soc_dai_driver pxa_i2s_dai = {
}; };
static const struct snd_soc_component_driver pxa_i2s_component = { static const struct snd_soc_component_driver pxa_i2s_component = {
.name = "pxa-i2s", .name = "pxa-i2s",
.pcm_construct = pxa2xx_soc_pcm_new, .pcm_construct = pxa2xx_soc_pcm_new,
.open = pxa2xx_soc_pcm_open, .open = pxa2xx_soc_pcm_open,
.close = pxa2xx_soc_pcm_close, .close = pxa2xx_soc_pcm_close,
.hw_params = pxa2xx_soc_pcm_hw_params, .hw_params = pxa2xx_soc_pcm_hw_params,
.prepare = pxa2xx_soc_pcm_prepare, .prepare = pxa2xx_soc_pcm_prepare,
.trigger = pxa2xx_soc_pcm_trigger, .trigger = pxa2xx_soc_pcm_trigger,
.pointer = pxa2xx_soc_pcm_pointer, .pointer = pxa2xx_soc_pcm_pointer,
.suspend = pxa2xx_soc_pcm_suspend, .suspend = pxa2xx_soc_pcm_suspend,
.resume = pxa2xx_soc_pcm_resume, .resume = pxa2xx_soc_pcm_resume,
.legacy_dai_naming = 1,
}; };
static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment