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

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.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0bc1e7d1
...@@ -458,6 +458,7 @@ static const struct snd_soc_component_driver atmel_classd_cpu_dai_component = { ...@@ -458,6 +458,7 @@ static const struct snd_soc_component_driver atmel_classd_cpu_dai_component = {
.num_controls = ARRAY_SIZE(atmel_classd_snd_controls), .num_controls = ARRAY_SIZE(atmel_classd_snd_controls),
.idle_bias_on = 1, .idle_bias_on = 1,
.use_pmdown_time = 1, .use_pmdown_time = 1,
.legacy_dai_naming = 1,
}; };
/* ASoC sound card */ /* ASoC sound card */
......
...@@ -565,6 +565,7 @@ static struct snd_soc_dai_driver atmel_i2s_dai = { ...@@ -565,6 +565,7 @@ static struct snd_soc_dai_driver atmel_i2s_dai = {
static const struct snd_soc_component_driver atmel_i2s_component = { static const struct snd_soc_component_driver atmel_i2s_component = {
.name = "atmel-i2s", .name = "atmel-i2s",
.legacy_dai_naming = 1,
}; };
static int atmel_i2s_sama5d2_mck_init(struct atmel_i2s_dev *dev, static int atmel_i2s_sama5d2_mck_init(struct atmel_i2s_dev *dev,
......
...@@ -481,6 +481,7 @@ static const struct snd_soc_component_driver atmel_pdmic_cpu_dai_component = { ...@@ -481,6 +481,7 @@ static const struct snd_soc_component_driver atmel_pdmic_cpu_dai_component = {
.num_controls = ARRAY_SIZE(atmel_pdmic_snd_controls), .num_controls = ARRAY_SIZE(atmel_pdmic_snd_controls),
.idle_bias_on = 1, .idle_bias_on = 1,
.use_pmdown_time = 1, .use_pmdown_time = 1,
.legacy_dai_naming = 1,
}; };
/* ASoC sound card */ /* ASoC sound card */
......
...@@ -861,6 +861,7 @@ static const struct snd_soc_component_driver atmel_ssc_component = { ...@@ -861,6 +861,7 @@ static const struct snd_soc_component_driver atmel_ssc_component = {
.name = "atmel-ssc", .name = "atmel-ssc",
.suspend = atmel_ssc_suspend, .suspend = atmel_ssc_suspend,
.resume = atmel_ssc_resume, .resume = atmel_ssc_resume,
.legacy_dai_naming = 1,
}; };
static int asoc_ssc_init(struct device *dev) static int asoc_ssc_init(struct device *dev)
......
...@@ -929,6 +929,7 @@ static struct snd_soc_dai_driver mchp_i2s_mcc_dai = { ...@@ -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 = { static const struct snd_soc_component_driver mchp_i2s_mcc_component = {
.name = "mchp-i2s-mcc", .name = "mchp-i2s-mcc",
.legacy_dai_naming = 1,
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
...@@ -423,6 +423,7 @@ static const struct snd_soc_component_driver mchp_pdmc_dai_component = { ...@@ -423,6 +423,7 @@ static const struct snd_soc_component_driver mchp_pdmc_dai_component = {
.num_controls = ARRAY_SIZE(mchp_pdmc_snd_controls), .num_controls = ARRAY_SIZE(mchp_pdmc_snd_controls),
.open = &mchp_pdmc_open, .open = &mchp_pdmc_open,
.close = &mchp_pdmc_close, .close = &mchp_pdmc_close,
.legacy_dai_naming = 1,
}; };
static const unsigned int mchp_pdmc_1mic[] = {1}; static const unsigned int mchp_pdmc_1mic[] = {1};
......
...@@ -847,6 +847,7 @@ static struct snd_soc_dai_driver mchp_spdifrx_dai = { ...@@ -847,6 +847,7 @@ static struct snd_soc_dai_driver mchp_spdifrx_dai = {
static const struct snd_soc_component_driver mchp_spdifrx_component = { static const struct snd_soc_component_driver mchp_spdifrx_component = {
.name = "mchp-spdifrx", .name = "mchp-spdifrx",
.legacy_dai_naming = 1,
}; };
static const struct of_device_id mchp_spdifrx_dt_ids[] = { static const struct of_device_id mchp_spdifrx_dt_ids[] = {
......
...@@ -754,6 +754,7 @@ static struct snd_soc_dai_driver mchp_spdiftx_dai = { ...@@ -754,6 +754,7 @@ static struct snd_soc_dai_driver mchp_spdiftx_dai = {
static const struct snd_soc_component_driver mchp_spdiftx_component = { static const struct snd_soc_component_driver mchp_spdiftx_component = {
.name = "mchp-spdiftx", .name = "mchp-spdiftx",
.legacy_dai_naming = 1,
}; };
static const struct of_device_id mchp_spdiftx_dt_ids[] = { static const struct of_device_id mchp_spdiftx_dt_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment