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

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


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

sound/soc/atmel/atmel-classd.c

+1 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ static const struct snd_soc_component_driver atmel_classd_cpu_dai_component = { 
	.num_controls		= ARRAY_SIZE(atmel_classd_snd_controls),

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.legacy_dai_naming	= 1,

};



/* ASoC sound card */

sound/soc/atmel/atmel-i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -565,6 +565,7 @@ static struct snd_soc_dai_driver atmel_i2s_dai = { 


static const struct snd_soc_component_driver atmel_i2s_component = {

	.name			= "atmel-i2s",

	.legacy_dai_naming	= 1,

};



static int atmel_i2s_sama5d2_mck_init(struct atmel_i2s_dev *dev,

sound/soc/atmel/atmel-pdmic.c

+1 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ static const struct snd_soc_component_driver atmel_pdmic_cpu_dai_component = { 
	.num_controls		= ARRAY_SIZE(atmel_pdmic_snd_controls),

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.legacy_dai_naming	= 1,

};



/* ASoC sound card */

sound/soc/atmel/atmel_ssc_dai.c

+4 −3
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ static const struct snd_soc_component_driver atmel_ssc_component = { 
	.name			= "atmel-ssc",

	.suspend		= atmel_ssc_suspend,

	.resume			= atmel_ssc_resume,

	.legacy_dai_naming	= 1,

};



static int asoc_ssc_init(struct device *dev)

sound/soc/atmel/mchp-i2s-mcc.c

+2 −1
Original line number Diff line number Diff line
@@ -929,6 +929,7 @@ static struct snd_soc_dai_driver mchp_i2s_mcc_dai = { 


static const struct snd_soc_component_driver mchp_i2s_mcc_component = {

	.name			= "mchp-i2s-mcc",

	.legacy_dai_naming	= 1,

};



#ifdef CONFIG_OF