All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: Jaroslav Kysela <perex@perex.cz>
Cc: ALSA development <alsa-devel@alsa-project.org>,
	Mark Brown <broonie@kernel.org>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: Re: [alsa-devel] [PATCH] ASoC: change 'HDMI/DP, pcm=' to 'HDMI/DP, pcm=' Jack control names
Date: Fri, 25 Oct 2019 14:38:39 +0200	[thread overview]
Message-ID: <s5hk18tuhio.wl-tiwai@suse.de> (raw)
In-Reply-To: <20191025123038.19728-1-perex@perex.cz>

On Fri, 25 Oct 2019 14:30:38 +0200,
Jaroslav Kysela wrote:
> 
> There is an inconsistency in the names for the HDMI/DP Jack control
> names between some ASoC drivers and the HDA HDMI driver which
> introduced this naming in 2011.
> 
> There might be an impact for the user space (UCM). I will fix
> the UCM configurations when this patch is applied.
> 
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Yes, that's a known problem, and I left them so far just for keeping
the already existing stuff working.

Won't this break the current Chromebooks user-space?


thanks,

Takashi

> ---
>  Documentation/sound/designs/control-names.rst   | 5 +++--
>  sound/soc/intel/boards/bxt_da7219_max98357a.c   | 2 +-
>  sound/soc/intel/boards/bxt_rt298.c              | 2 +-
>  sound/soc/intel/boards/glk_rt5682_max98357a.c   | 2 +-
>  sound/soc/intel/boards/kbl_da7219_max98357a.c   | 2 +-
>  sound/soc/intel/boards/kbl_da7219_max98927.c    | 2 +-
>  sound/soc/intel/boards/kbl_rt5660.c             | 2 +-
>  sound/soc/intel/boards/kbl_rt5663_max98927.c    | 2 +-
>  sound/soc/intel/boards/skl_hda_dsp_common.c     | 2 +-
>  sound/soc/intel/boards/skl_nau88l25_max98357a.c | 2 +-
>  sound/soc/intel/boards/skl_nau88l25_ssm4567.c   | 2 +-
>  sound/soc/intel/boards/skl_rt286.c              | 2 +-
>  sound/soc/intel/boards/sof_rt5682.c             | 2 +-
>  13 files changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/Documentation/sound/designs/control-names.rst b/Documentation/sound/designs/control-names.rst
> index 7fedd0f33cd9..a5f6e3842df8 100644
> --- a/Documentation/sound/designs/control-names.rst
> +++ b/Documentation/sound/designs/control-names.rst
> @@ -50,7 +50,7 @@ Internal	internal
>  
>  SOURCE
>  ~~~~~~
> -===================	=================================================
> +===================	===================================================
>  Master
>  Master Mono
>  Hardware Master
> @@ -92,7 +92,8 @@ SPDIF			output only
>  SPDIF In
>  Digital In
>  HDMI/DP			either HDMI or DisplayPort
> -===================	=================================================
> +HDMI/DP,pcm=<num>       either HDMI or DisplayPort with the PCM device link
> +===================	===================================================
>  
>  Exceptions (deprecated)
>  -----------------------
> diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
> index ac1dea5f9d11..b49028c6fd10 100644
> --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
> +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
> @@ -618,7 +618,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &broxton_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
> index adf416a49b48..caaf2f2af287 100644
> --- a/sound/soc/intel/boards/bxt_rt298.c
> +++ b/sound/soc/intel/boards/bxt_rt298.c
> @@ -530,7 +530,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &broxton_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/glk_rt5682_max98357a.c b/sound/soc/intel/boards/glk_rt5682_max98357a.c
> index bd2d371f2acd..5474f28e0c31 100644
> --- a/sound/soc/intel/boards/glk_rt5682_max98357a.c
> +++ b/sound/soc/intel/boards/glk_rt5682_max98357a.c
> @@ -548,7 +548,7 @@ static int glk_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &geminilake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> index 537a88932bb6..367415efed9b 100644
> --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c
> +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c
> @@ -548,7 +548,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &skylake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c
> index 829f95fc4179..b30c2148d1f4 100644
> --- a/sound/soc/intel/boards/kbl_da7219_max98927.c
> +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c
> @@ -977,7 +977,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &kabylake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/kbl_rt5660.c b/sound/soc/intel/boards/kbl_rt5660.c
> index 74fe1f3a5479..0965d1f02b2c 100644
> --- a/sound/soc/intel/boards/kbl_rt5660.c
> +++ b/sound/soc/intel/boards/kbl_rt5660.c
> @@ -470,7 +470,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &skylake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/kbl_rt5663_max98927.c b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> index 7cefda341fbf..9f420e978459 100644
> --- a/sound/soc/intel/boards/kbl_rt5663_max98927.c
> +++ b/sound/soc/intel/boards/kbl_rt5663_max98927.c
> @@ -888,7 +888,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &skylake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c
> index 58409b6e476e..f717b1d179bd 100644
> --- a/sound/soc/intel/boards/skl_hda_dsp_common.c
> +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c
> @@ -139,7 +139,7 @@ int skl_hda_hdmi_jack_init(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			 "HDMI/DP, pcm=%d Jack", pcm->device);
> +			 "HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					    SND_JACK_AVOUT, &pcm->hdmi_jack,
>  					    NULL, 0);
> diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
> index 3ce8efbeed12..b009e2df25d3 100644
> --- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
> +++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
> @@ -607,7 +607,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT,
>  					&skylake_hdmi[i],
> diff --git a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> index 1a7ac8bdf543..0a6e650dc698 100644
> --- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> +++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
> @@ -648,7 +648,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT,
>  					&skylake_hdmi[i],
> diff --git a/sound/soc/intel/boards/skl_rt286.c b/sound/soc/intel/boards/skl_rt286.c
> index 231349a47cc9..56ee4b55dce9 100644
> --- a/sound/soc/intel/boards/skl_rt286.c
> +++ b/sound/soc/intel/boards/skl_rt286.c
> @@ -489,7 +489,7 @@ static int skylake_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			"HDMI/DP, pcm=%d Jack", pcm->device);
> +			"HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					SND_JACK_AVOUT, &skylake_hdmi[i],
>  					NULL, 0);
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 4f6e58c3954a..862a7e35cb5c 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -277,7 +277,7 @@ static int sof_card_late_probe(struct snd_soc_card *card)
>  	list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
>  		component = pcm->codec_dai->component;
>  		snprintf(jack_name, sizeof(jack_name),
> -			 "HDMI/DP, pcm=%d Jack", pcm->device);
> +			 "HDMI/DP,pcm=%d Jack", pcm->device);
>  		err = snd_soc_card_jack_new(card, jack_name,
>  					    SND_JACK_AVOUT, &sof_hdmi[i],
>  					    NULL, 0);
> -- 
> 2.20.1
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  reply	other threads:[~2019-10-25 12:39 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-25 12:30 [alsa-devel] [PATCH] ASoC: change 'HDMI/DP, pcm=' to 'HDMI/DP, pcm=' Jack control names Jaroslav Kysela
2019-10-25 12:38 ` Takashi Iwai [this message]
2019-10-25 13:57   ` Jaroslav Kysela
2019-10-25 14:06     ` Takashi Iwai
2019-10-25 14:18       ` Jaroslav Kysela
2019-10-25 14:28         ` Takashi Iwai
2019-10-25 14:39           ` Jaroslav Kysela
2019-10-25 16:11             ` Takashi Iwai
2019-10-25 17:04               ` Jaroslav Kysela
2019-10-25 18:02                 ` Kai Vehmanen
2019-10-25 21:03                   ` Jaroslav Kysela
2019-10-26  7:37                     ` Takashi Iwai
2019-10-26 17:11                       ` Jaroslav Kysela
2019-10-28 14:23                         ` Takashi Iwai
2019-10-25 14:49           ` Mark Brown
2019-10-25 12:44 ` Kai Vehmanen
2019-10-25 14:04   ` Jaroslav Kysela
2019-10-25 14:35     ` Pierre-Louis Bossart
2019-10-25 14:43       ` Jaroslav Kysela
2019-10-25 16:27   ` Peter Ujfalusi
2019-10-25 17:48     ` Kai Vehmanen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5hk18tuhio.wl-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=perex@perex.cz \
    --cc=pierre-louis.bossart@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.