ASoC: amd: 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-19-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 65a809e2c29fffc31533df6f56a27883ea3b6795..3c4fd8b805891de2d08f27411ae815673300fe2c 100644 (file)
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -267,13 +267,14 @@ static int acp_dma_close(struct snd_soc_component *component,
 }
 
 static const struct snd_soc_component_driver acp_pcm_component = {
-       .name           = DRV_NAME,
-       .open           = acp_dma_open,
-       .close          = acp_dma_close,
-       .hw_params      = acp_dma_hw_params,
-       .pointer        = acp_dma_pointer,
-       .mmap           = acp_dma_mmap,
-       .pcm_construct  = acp_dma_new,
+       .name                   = DRV_NAME,
+       .open                   = acp_dma_open,
+       .close                  = acp_dma_close,
+       .hw_params              = acp_dma_hw_params,
+       .pointer                = acp_dma_pointer,
+       .mmap                   = acp_dma_mmap,
+       .pcm_construct          = acp_dma_new,
+       .legacy_dai_naming      = 1,
 };
 
 int acp_platform_register(struct device *dev)

diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c
index de6f70d7ef3642e942c40dba496d97ec9c159e4a..aa38cef1776dae3136eb29fc85922dda377b65ca 100644 (file)
--- a/sound/soc/amd/raven/acp3x-i2s.c
+++ b/sound/soc/amd/raven/acp3x-i2s.c
@@ -257,7 +257,8 @@ static const struct snd_soc_dai_ops acp3x_i2s_dai_ops = {
 };
 
 static const struct snd_soc_component_driver acp3x_dai_component = {
-       .name           = DRV_NAME,
+       .name                   = DRV_NAME,
+       .legacy_dai_naming      = 1,
 };
 
 static struct snd_soc_dai_driver acp3x_i2s_dai = {

diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c
index 8c42345ee41e9f92a33d7ba697f709765e9eec99..7203c6488df0eb9d5a85a745e6bacb5f4391f2b9 100644 (file)
--- a/sound/soc/amd/renoir/acp3x-pdm-dma.c
+++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c
@@ -363,12 +363,13 @@ static struct snd_soc_dai_driver acp_pdm_dai_driver = {
 };
 
 static const struct snd_soc_component_driver acp_pdm_component = {
-       .name           = DRV_NAME,
-       .open           = acp_pdm_dma_open,
-       .close          = acp_pdm_dma_close,
-       .hw_params      = acp_pdm_dma_hw_params,
-       .pointer        = acp_pdm_dma_pointer,
-       .pcm_construct  = acp_pdm_dma_new,
+       .name                   = DRV_NAME,
+       .open                   = acp_pdm_dma_open,
+       .close                  = acp_pdm_dma_close,
+       .hw_params              = acp_pdm_dma_hw_params,
+       .pointer                = acp_pdm_dma_pointer,
+       .pcm_construct          = acp_pdm_dma_new,
+       .legacy_dai_naming      = 1,
 };
 
 static int acp_pdm_audio_probe(struct platform_device *pdev)

diff --git a/sound/soc/amd/vangogh/acp5x-i2s.c b/sound/soc/amd/vangogh/acp5x-i2s.c
index 72c8c68e59336d5ad734a813471a4f81e87fa83f..773e96f1b4dd6e47934e776c96988bd1bca19030 100644 (file)
--- a/sound/soc/amd/vangogh/acp5x-i2s.c
+++ b/sound/soc/amd/vangogh/acp5x-i2s.c
@@ -345,6 +345,7 @@ static const struct snd_soc_dai_ops acp5x_i2s_dai_ops = {
 
 static const struct snd_soc_component_driver acp5x_dai_component = {
        .name = "acp5x-i2s",
+       .legacy_dai_naming = 1,
 };
 
 static struct snd_soc_dai_driver acp5x_i2s_dai = {

diff --git a/sound/soc/amd/yc/acp6x-pdm-dma.c b/sound/soc/amd/yc/acp6x-pdm-dma.c
index 7e66393e41535395506c0291f8744f5aee80dc01..acecd6a4ec4b1611a05fcf0a5bb47e09f0687ff1 100644 (file)
--- a/sound/soc/amd/yc/acp6x-pdm-dma.c
+++ b/sound/soc/amd/yc/acp6x-pdm-dma.c
@@ -335,12 +335,13 @@ static struct snd_soc_dai_driver acp6x_pdm_dai_driver = {
 };
 
 static const struct snd_soc_component_driver acp6x_pdm_component = {
-       .name           = DRV_NAME,
-       .open           = acp6x_pdm_dma_open,
-       .close          = acp6x_pdm_dma_close,
-       .hw_params      = acp6x_pdm_dma_hw_params,
-       .pointer        = acp6x_pdm_dma_pointer,
-       .pcm_construct  = acp6x_pdm_dma_new,
+       .name                   = DRV_NAME,
+       .open                   = acp6x_pdm_dma_open,
+       .close                  = acp6x_pdm_dma_close,
+       .hw_params              = acp6x_pdm_dma_hw_params,
+       .pointer                = acp6x_pdm_dma_pointer,
+       .pcm_construct          = acp6x_pdm_dma_new,
+       .legacy_dai_naming      = 1,
 };
 
 static int acp6x_pdm_audio_probe(struct platform_device *pdev)