Skip to contentSkip to conversation

ASoC: intel - fix the card names

PATCH In review Jaroslav Kysela 3 participants 3 messages Oct 28, 2019 – Oct 29, 2019

Subsystems (3)
lore
Share & tools
lore

Jaroslav Kysela

author maintainer
#0 lore raw

PATCH v2 1/1 ASoC: intel - fix the card names

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

Cc Pierre-Louis Bossart <[email protected]>
Cc Mark Brown <[email protected]>
---
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
 sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index 74dda8784f1a..d14ca327c684 100644
@@ -623,7 +623,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
  * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
  */
 static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
 	.owner = THIS_MODULE,
 	.dai_link = kabylake_dais,
 	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
index 1778acdc367c..e8d676c192f6 100644
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
 }
 
 static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "hda-dsp",
 	.owner = THIS_MODULE,
 	.dai_link = skl_hda_be_dai_links,
 	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +1 -1
index 4f6e58c3954a..320a9b9273db 100644
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
 /* sof audio machine driver for rt5682 codec */
 static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "rt5682", /* the sof- prefix is added by the core */
 	.owner = THIS_MODULE,
 	.controls = sof_controls,
 	.num_controls = ARRAY_SIZE(sof_controls),
Signature · 5 lines
2.20.1
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Acked-by on v2 1/1
#1 lore raw
Quoted 4 lines · Jaroslav Kysela

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

We're likely to break a couple of setups with these changes (UCM files need similar renaming), but in hindsight the initial naming was a mistake, and since all these platforms are still going through development there isn't a huge risk impacting a very large user base.

Quoted 42 lines
Cc Pierre-Louis Bossart <[email protected]>
Cc Mark Brown <[email protected]>
---
  sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
  sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
  sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index 74dda8784f1a..d14ca327c684 100644
@@ -623,7 +623,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
   * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
   */
  static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
  	.owner = THIS_MODULE,
  	.dai_link = kabylake_dais,
  	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
index 1778acdc367c..e8d676c192f6 100644
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
  }
 
  static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "hda-dsp",
  	.owner = THIS_MODULE,
  	.dai_link = skl_hda_be_dai_links,
  	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +0 -0
index 4f6e58c3954a..320a9b9273db 100644

sound/soc/intel/boards/sof_rt5682.c static int dmic_init(struct snd_soc_pcm_runtime *rtd) · line 376

Quoted 8 lines
sound/soc/intel/boards/sof_rt5682.c +1 -1
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
  /* sof audio machine driver for rt5682 codec */
  static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "rt5682", /* the sof- prefix is added by the core */
  	.owner = THIS_MODULE,
  	.controls = sof_controls,
  	.num_controls = ARRAY_SIZE(sof_controls),

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#2 lore raw

[alsa-devel] Applied "ASoC: intel - fix the card names" to the asoc tree

In reply to Jaroslav Kysela

The patch

ASoC: intel - fix the card names

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From d745cc1ab65945b2d17ec9c5652f38299c054649 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <[email protected]>
Date: Mon, 28 Oct 2019 17:46:24 +0100
Subject: [PATCH] ASoC: intel - fix the card names

Those strings are exposed to the user space as the card name thus used in the GUIs. The common standard is to avoid '_' here. The worst case is 'sof-skl_hda_card' string.

---
 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +-
 sound/soc/intel/boards/skl_hda_dsp_generic.c        | 2 +-
 sound/soc/intel/boards/sof_rt5682.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +1 -1
index b546de8ba1e3..a1056cda3dd7 100644
@@ -737,7 +737,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
  * kabylake audio machine driver for  MAX98927 + RT5514 + RT5663
  */
 static struct snd_soc_card kabylake_audio_card = {
-	.name = "kbl_r5514_5663_max",
+	.name = "kbl-r5514-5663-max",
 	.owner = THIS_MODULE,
 	.dai_link = kabylake_dais,
 	.num_links = ARRAY_SIZE(kabylake_dais),
sound/soc/intel/boards/skl_hda_dsp_generic.c +1 -1
index 1778acdc367c..e8d676c192f6 100644
@@ -90,7 +90,7 @@ skl_hda_add_dai_link(struct snd_soc_card *card, struct snd_soc_dai_link *link)
 }
 
 static struct snd_soc_card hda_soc_card = {
-	.name = "skl_hda_card",
+	.name = "hda-dsp",
 	.owner = THIS_MODULE,
 	.dai_link = skl_hda_be_dai_links,
 	.dapm_widgets = skl_hda_widgets,
sound/soc/intel/boards/sof_rt5682.c +1 -1
index 5ce643d62faf..2caebc77fdb5 100644
@@ -370,7 +370,7 @@ static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 
 /* sof audio machine driver for rt5682 codec */
 static struct snd_soc_card sof_audio_card_rt5682 = {
-	.name = "sof_rt5682",
+	.name = "rt5682", /* the sof- prefix is added by the core */
 	.owner = THIS_MODULE,
 	.controls = sof_controls,
 	.num_controls = ARRAY_SIZE(sof_controls),
Signature · 6 lines
2.20.1

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel