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: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-29-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c
index 382e9d8..fb5a439 100644 (file)
--- a/sound/soc/pxa/mmp-sspa.c
+++ b/sound/soc/pxa/mmp-sspa.c
@@ -456,10 +456,11 @@ static int mmp_sspa_close(struct snd_soc_component *component,
 }
 
 static const struct snd_soc_component_driver mmp_sspa_component = {
-       .name           = "mmp-sspa",
-       .mmap           = mmp_pcm_mmap,
-       .open           = mmp_sspa_open,
-       .close          = mmp_sspa_close,
+       .name                   = "mmp-sspa",
+       .mmap                   = mmp_pcm_mmap,
+       .open                   = mmp_sspa_open,
+       .close                  = mmp_sspa_close,
+       .legacy_dai_naming      = 1,
 };
 
 static int asoc_mmp_sspa_probe(struct platform_device *pdev)

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 0f504a9..430dd44 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -848,16 +848,17 @@ static struct snd_soc_dai_driver pxa_ssp_dai = {
 };
 
 static const struct snd_soc_component_driver pxa_ssp_component = {
-       .name           = "pxa-ssp",
-       .pcm_construct  = pxa2xx_soc_pcm_new,
-       .open           = pxa2xx_soc_pcm_open,
-       .close          = pxa2xx_soc_pcm_close,
-       .hw_params      = pxa2xx_soc_pcm_hw_params,
-       .prepare        = pxa2xx_soc_pcm_prepare,
-       .trigger        = pxa2xx_soc_pcm_trigger,
-       .pointer        = pxa2xx_soc_pcm_pointer,
-       .suspend        = pxa_ssp_suspend,
-       .resume         = pxa_ssp_resume,
+       .name                   = "pxa-ssp",
+       .pcm_construct          = pxa2xx_soc_pcm_new,
+       .open                   = pxa2xx_soc_pcm_open,
+       .close                  = pxa2xx_soc_pcm_close,
+       .hw_params              = pxa2xx_soc_pcm_hw_params,
+       .prepare                = pxa2xx_soc_pcm_prepare,
+       .trigger                = pxa2xx_soc_pcm_trigger,
+       .pointer                = pxa2xx_soc_pcm_pointer,
+       .suspend                = pxa_ssp_suspend,
+       .resume                 = pxa_ssp_resume,
+       .legacy_dai_naming      = 1,
 };
 
 #ifdef CONFIG_OF

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index ffcf44e..3e4c704 100644 (file)
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -355,16 +355,17 @@ static struct snd_soc_dai_driver pxa_i2s_dai = {
 };
 
 static const struct snd_soc_component_driver pxa_i2s_component = {
-       .name           = "pxa-i2s",
-       .pcm_construct  = pxa2xx_soc_pcm_new,
-       .open           = pxa2xx_soc_pcm_open,
-       .close          = pxa2xx_soc_pcm_close,
-       .hw_params      = pxa2xx_soc_pcm_hw_params,
-       .prepare        = pxa2xx_soc_pcm_prepare,
-       .trigger        = pxa2xx_soc_pcm_trigger,
-       .pointer        = pxa2xx_soc_pcm_pointer,
-       .suspend        = pxa2xx_soc_pcm_suspend,
-       .resume         = pxa2xx_soc_pcm_resume,
+       .name                   = "pxa-i2s",
+       .pcm_construct          = pxa2xx_soc_pcm_new,
+       .open                   = pxa2xx_soc_pcm_open,
+       .close                  = pxa2xx_soc_pcm_close,
+       .hw_params              = pxa2xx_soc_pcm_hw_params,
+       .prepare                = pxa2xx_soc_pcm_prepare,
+       .trigger                = pxa2xx_soc_pcm_trigger,
+       .pointer                = pxa2xx_soc_pcm_pointer,
+       .suspend                = pxa2xx_soc_pcm_suspend,
+       .resume                 = pxa2xx_soc_pcm_resume,
+       .legacy_dai_naming      = 1,
 };
 
 static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)