Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [alsa-devel] [PATCH] ALSA: hda - fix the Headset Mic Jack name for Realtek
@ 2019-11-01 11:57 Jaroslav Kysela
  2019-11-01 12:30 ` Takashi Iwai
  0 siblings, 1 reply; 3+ messages in thread
From: Jaroslav Kysela @ 2019-11-01 11:57 UTC (permalink / raw)
  To: ALSA development; +Cc: Takashi Iwai, Kailang Yang

The HDA auto parser creates kcontrol 'Headset Mic Jack'. Use this
name also for the alc_fixup_headset_jack() function. It is necessary
to have common name for the user space like the UCM configs:

https://github.com/alsa-project/alsa-ucm-conf/pull/5

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Cc: Kailang Yang <kailang@realtek.com>
---
 sound/pci/hda/patch_realtek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 80f66ba85f87..2633e45144d5 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5679,7 +5679,7 @@ static void alc_fixup_headset_jack(struct hda_codec *codec,
 	case HDA_FIXUP_ACT_PRE_PROBE:
 		snd_hda_jack_detect_enable_callback(codec, 0x55,
 						    alc_headset_btn_callback);
-		snd_hda_jack_add_kctl(codec, 0x55, "Headset Jack", false,
+		snd_hda_jack_add_kctl(codec, 0x55, "Headset Mic Jack", false,
 				      SND_JACK_HEADSET, alc_headset_btn_keymap);
 		break;
 	case HDA_FIXUP_ACT_INIT:
-- 
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [alsa-devel] [PATCH] ALSA: hda - fix the Headset Mic Jack name for Realtek
  2019-11-01 11:57 [alsa-devel] [PATCH] ALSA: hda - fix the Headset Mic Jack name for Realtek Jaroslav Kysela
@ 2019-11-01 12:30 ` Takashi Iwai
  2019-11-06 12:28   ` Jaroslav Kysela
  0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2019-11-01 12:30 UTC (permalink / raw)
  To: Jaroslav Kysela; +Cc: ALSA development, Kailang Yang

On Fri, 01 Nov 2019 12:57:18 +0100,
Jaroslav Kysela wrote:
> 
> The HDA auto parser creates kcontrol 'Headset Mic Jack'. Use this
> name also for the alc_fixup_headset_jack() function. It is necessary
> to have common name for the user space like the UCM configs:
> 
> https://github.com/alsa-project/alsa-ucm-conf/pull/5

Please make sure that this really doesn't break the existing device
especially with PulseAudio.  I'll merge this once when it's confirmed
that it still works as is after the change.


thanks,

Takashi


> 
> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
> Cc: Kailang Yang <kailang@realtek.com>
> ---
>  sound/pci/hda/patch_realtek.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index 80f66ba85f87..2633e45144d5 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -5679,7 +5679,7 @@ static void alc_fixup_headset_jack(struct hda_codec *codec,
>  	case HDA_FIXUP_ACT_PRE_PROBE:
>  		snd_hda_jack_detect_enable_callback(codec, 0x55,
>  						    alc_headset_btn_callback);
> -		snd_hda_jack_add_kctl(codec, 0x55, "Headset Jack", false,
> +		snd_hda_jack_add_kctl(codec, 0x55, "Headset Mic Jack", false,
>  				      SND_JACK_HEADSET, alc_headset_btn_keymap);
>  		break;
>  	case HDA_FIXUP_ACT_INIT:
> -- 
> 2.20.1
> 
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [alsa-devel] [PATCH] ALSA: hda - fix the Headset Mic Jack name for Realtek
  2019-11-01 12:30 ` Takashi Iwai
@ 2019-11-06 12:28   ` Jaroslav Kysela
  0 siblings, 0 replies; 3+ messages in thread
From: Jaroslav Kysela @ 2019-11-06 12:28 UTC (permalink / raw)
  To: Takashi Iwai; +Cc: ALSA development, Kailang Yang

Dne 01. 11. 19 v 13:30 Takashi Iwai napsal(a):
> On Fri, 01 Nov 2019 12:57:18 +0100,
> Jaroslav Kysela wrote:
>>
>> The HDA auto parser creates kcontrol 'Headset Mic Jack'. Use this
>> name also for the alc_fixup_headset_jack() function. It is necessary
>> to have common name for the user space like the UCM configs:
>>
>> https://github.com/alsa-project/alsa-ucm-conf/pull/5
> 
> Please make sure that this really doesn't break the existing device
> especially with PulseAudio.  I'll merge this once when it's confirmed
> that it still works as is after the change.

Just for the reference: Please, drop this patch. I mangled the names somehow 
(Headset / Headphone). The Headphone Jack names are not consistent, too. We 
are going to handle this in UCM (user space) rather than the driver side.

						Jaroslav

-- 
Jaroslav Kysela <perex@perex.cz>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-01 11:57 [alsa-devel] [PATCH] ALSA: hda - fix the Headset Mic Jack name for Realtek Jaroslav Kysela
2019-11-01 12:30 ` Takashi Iwai
2019-11-06 12:28   ` Jaroslav Kysela

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git