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

ASoC: samsung: 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-34-ckeepax@opensource.cirrus.com


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

sound/soc/samsung/i2s.c

+2 −0
Original line number Diff line number Diff line
@@ -1143,6 +1143,8 @@ static const struct snd_soc_component_driver samsung_i2s_component = { 


	.suspend = i2s_suspend,

	.resume = i2s_resume,



	.legacy_dai_naming = 1,

};



#define SAMSUNG_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE | \

sound/soc/samsung/pcm.c

+2 −1
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static struct snd_soc_dai_driver s3c_pcm_dai[] = { 


static const struct snd_soc_component_driver s3c_pcm_component = {

	.name			= "s3c-pcm",

	.legacy_dai_naming	= 1,

};



static int s3c_pcm_dev_probe(struct platform_device *pdev)

sound/soc/samsung/s3c2412-i2s.c

+4 −3
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static const struct snd_soc_component_driver s3c2412_i2s_component = { 
	.name			= "s3c2412-i2s",

	.suspend		= s3c2412_i2s_suspend,

	.resume			= s3c2412_i2s_resume,

	.legacy_dai_naming	= 1,

};



static int s3c2412_iis_dev_probe(struct platform_device *pdev)

sound/soc/samsung/s3c24xx-i2s.c

+4 −3
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ static const struct snd_soc_component_driver s3c24xx_i2s_component = { 
	.name			= "s3c24xx-i2s",

	.suspend		= s3c24xx_i2s_suspend,

	.resume			= s3c24xx_i2s_resume,

	.legacy_dai_naming	= 1,

};



static int s3c24xx_iis_dev_probe(struct platform_device *pdev)

sound/soc/samsung/spdif.c

+4 −3
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ static const struct snd_soc_component_driver samsung_spdif_component = { 
	.name			= "samsung-spdif",

	.suspend		= spdif_suspend,

	.resume			= spdif_resume,

	.legacy_dai_naming	= 1,

};



static int spdif_probe(struct platform_device *pdev)