iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: amd: Migrate to new style legacy DAI naming flag

Browse Source 
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>
This commit is contained in:
Charles Keepax 2022-06-23 13:51:32 +01:00 committed by Mark Brown
parent ad483da7b0
commit 0bc1e7d1fc
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/amd/acp/acp-platform.c
View File

@ -267,13 +267,14 @@ static int acp_dma_close(struct snd_soc_component *component,
} }
static const struct snd_soc_component_driver acp_pcm_component = { static const struct snd_soc_component_driver acp_pcm_component = {
.name = DRV_NAME, .name = DRV_NAME,
.open = acp_dma_open, .open = acp_dma_open,
.close = acp_dma_close, .close = acp_dma_close,
.hw_params = acp_dma_hw_params, .hw_params = acp_dma_hw_params,
.pointer = acp_dma_pointer, .pointer = acp_dma_pointer,
.mmap = acp_dma_mmap, .mmap = acp_dma_mmap,
.pcm_construct = acp_dma_new, .pcm_construct = acp_dma_new,
.legacy_dai_naming = 1,
}; };
int acp_platform_register(struct device *dev) int acp_platform_register(struct device *dev)

3
sound/soc/amd/raven/acp3x-i2s.c
View File

@ -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 = { 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 = { static struct snd_soc_dai_driver acp3x_i2s_dai = {

13
sound/soc/amd/renoir/acp3x-pdm-dma.c
View File

@ -363,12 +363,13 @@ static struct snd_soc_dai_driver acp_pdm_dai_driver = {
}; };
static const struct snd_soc_component_driver acp_pdm_component = { static const struct snd_soc_component_driver acp_pdm_component = {
.name = DRV_NAME, .name = DRV_NAME,
.open = acp_pdm_dma_open, .open = acp_pdm_dma_open,
.close = acp_pdm_dma_close, .close = acp_pdm_dma_close,
.hw_params = acp_pdm_dma_hw_params, .hw_params = acp_pdm_dma_hw_params,
.pointer = acp_pdm_dma_pointer, .pointer = acp_pdm_dma_pointer,
.pcm_construct = acp_pdm_dma_new, .pcm_construct = acp_pdm_dma_new,
.legacy_dai_naming = 1,
}; };
static int acp_pdm_audio_probe(struct platform_device *pdev) static int acp_pdm_audio_probe(struct platform_device *pdev)

1
sound/soc/amd/vangogh/acp5x-i2s.c
View File

@ -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 = { static const struct snd_soc_component_driver acp5x_dai_component = {
.name = "acp5x-i2s", .name = "acp5x-i2s",
.legacy_dai_naming = 1,
}; };
static struct snd_soc_dai_driver acp5x_i2s_dai = { static struct snd_soc_dai_driver acp5x_i2s_dai = {

13
sound/soc/amd/yc/acp6x-pdm-dma.c
View File

@ -335,12 +335,13 @@ static struct snd_soc_dai_driver acp6x_pdm_dai_driver = {
}; };
static const struct snd_soc_component_driver acp6x_pdm_component = { static const struct snd_soc_component_driver acp6x_pdm_component = {
.name = DRV_NAME, .name = DRV_NAME,
.open = acp6x_pdm_dma_open, .open = acp6x_pdm_dma_open,
.close = acp6x_pdm_dma_close, .close = acp6x_pdm_dma_close,
.hw_params = acp6x_pdm_dma_hw_params, .hw_params = acp6x_pdm_dma_hw_params,
.pointer = acp6x_pdm_dma_pointer, .pointer = acp6x_pdm_dma_pointer,
.pcm_construct = acp6x_pdm_dma_new, .pcm_construct = acp6x_pdm_dma_new,
.legacy_dai_naming = 1,
}; };
static int acp6x_pdm_audio_probe(struct platform_device *pdev) static int acp6x_pdm_audio_probe(struct platform_device *pdev)