Re: [PATCH] ASoC: change 'HDMI/DP, pcm=' to 'HDMI/DP, pcm=' Jack control names

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxx>
> Cc: Mark Brown <broonie@xxxxxxxxxx>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel



[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Pulse Audio]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux