Unverified Commit 0bc1e7d1 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220623125250.2355471-19-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ad483da7

sound/soc/amd/acp/acp-platform.c

+8 −7
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static const struct snd_soc_component_driver acp_pcm_component = { 
	.pointer		= acp_dma_pointer,

	.mmap			= acp_dma_mmap,

	.pcm_construct		= acp_dma_new,

	.legacy_dai_naming	= 1,

};



int acp_platform_register(struct device *dev)

sound/soc/amd/raven/acp3x-i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ static const struct snd_soc_dai_ops acp3x_i2s_dai_ops = { 


static const struct snd_soc_component_driver acp3x_dai_component = {

	.name			= DRV_NAME,

	.legacy_dai_naming	= 1,

};



static struct snd_soc_dai_driver acp3x_i2s_dai = {

sound/soc/amd/renoir/acp3x-pdm-dma.c

+7 −6
Original line number Diff line number Diff line
@@ -369,6 +369,7 @@ static const struct snd_soc_component_driver acp_pdm_component = { 
	.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)

sound/soc/amd/vangogh/acp5x-i2s.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

sound/soc/amd/yc/acp6x-pdm-dma.c

+7 −6
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static const struct snd_soc_component_driver acp6x_pdm_component = { 
	.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)