Add "Line In" input jack constants

PATCH In review David Henningsson 5 participants 10 messages Oct 5, 2011 – Oct 6, 2011

Subsystems (2)

Sound Input drivers

lore

Share & tools

lore

David Henningsson

author

2011-10-05 14:01 UTC #0 lore raw

PATCH 1/1 Add "Line In" input jack constants

Hi,

Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.

Signature · 2 lines

David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

Quoted 1 line

From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks.

Signed-off-by David Henningsson <[email protected]>

---
 include/linux/input.h     |    1 +
 include/sound/jack.h      |    1 +
 sound/core/jack.c         |    1 +
 sound/pci/hda/hda_codec.c |    2 ++
 4 files changed, 5 insertions(+), 0 deletions(-)

include/linux/input.h +1 -0

index a637e78..a514fb8 100644
@@ -814,6 +814,7 @@ struct input_keymap_entry {
 #define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
 #define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
 #define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define SW_MAX			0x0f
 #define SW_CNT			(SW_MAX+1)

include/sound/jack.h +1 -0

index c140fc7..63c7907 100644
@@ -42,6 +42,7 @@ enum snd_jack_types {
 	SND_JACK_MECHANICAL	= 0x0008, /* If detected separately */
 	SND_JACK_VIDEOOUT	= 0x0010,
 	SND_JACK_AVOUT		= SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+	SND_JACK_LINEIN		= 0x0020,
 
 	/* Kept separate from switches to facilitate implementation */
 	SND_JACK_BTN_0		= 0x4000,

sound/core/jack.c +1 -0

index 53b53e9..240a3e1 100644
@@ -30,6 +30,7 @@ static int jack_switch_types[] = {
 	SW_LINEOUT_INSERT,
 	SW_JACK_PHYSICAL_INSERT,
 	SW_VIDEOOUT_INSERT,
+	SW_LINEIN_INSERT,
 };
 
 static int snd_jack_dev_free(struct snd_device *device)

sound/pci/hda/hda_codec.c +2 -0

index e3db196..8b046a1 100644
@@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
 		return "Mic";
 	case SND_JACK_LINEOUT:
 		return "Line-out";
+	case SND_JACK_LINEIN:
+		return "Line-in";
 	case SND_JACK_HEADSET:
 		return "Headset";
 	case SND_JACK_VIDEOOUT:

Signature · 1 line

1.7.5.4

Takashi Iwai

2011-10-05 14:08 UTC #1 lore raw

At Wed, 05 Oct 2011 16:01:22 +0200,

Quoted 5 lines · David Henningsson

Hi,
Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.

Looks OK to me. I can take it in unless Mark has any objection.

thanks,

Takashi

Quoted 72 lines

Signature · 3 lines

David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
[2 0001-Add-Line-In-input-jack-constants.patch <text/x-patch (7bit)>]

Quoted 1 line

From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks.

Signed-off-by David Henningsson <[email protected]>

---
 include/linux/input.h     |    1 +
 include/sound/jack.h      |    1 +
 sound/core/jack.c         |    1 +
 sound/pci/hda/hda_codec.c |    2 ++
 4 files changed, 5 insertions(+), 0 deletions(-)

include/linux/input.h +1 -0

index a637e78..a514fb8 100644
@@ -814,6 +814,7 @@ struct input_keymap_entry {
 #define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
 #define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
 #define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define SW_MAX			0x0f
 #define SW_CNT			(SW_MAX+1)

include/sound/jack.h +1 -0

index c140fc7..63c7907 100644
@@ -42,6 +42,7 @@ enum snd_jack_types {
 	SND_JACK_MECHANICAL	= 0x0008, /* If detected separately */
 	SND_JACK_VIDEOOUT	= 0x0010,
 	SND_JACK_AVOUT		= SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+	SND_JACK_LINEIN		= 0x0020,
 
 	/* Kept separate from switches to facilitate implementation */
 	SND_JACK_BTN_0		= 0x4000,

sound/core/jack.c +1 -0

index 53b53e9..240a3e1 100644
@@ -30,6 +30,7 @@ static int jack_switch_types[] = {
 	SW_LINEOUT_INSERT,
 	SW_JACK_PHYSICAL_INSERT,
 	SW_VIDEOOUT_INSERT,
+	SW_LINEIN_INSERT,
 };
 
 static int snd_jack_dev_free(struct snd_device *device)

sound/pci/hda/hda_codec.c +2 -0

index e3db196..8b046a1 100644
@@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
 		return "Mic";
 	case SND_JACK_LINEOUT:
 		return "Line-out";
+	case SND_JACK_LINEIN:
+		return "Line-in";
 	case SND_JACK_HEADSET:
 		return "Headset";
 	case SND_JACK_VIDEOOUT:

Signature · 1 line

1.7.5.4

Mark Brown

Acked-by on v1 1/1

2011-10-05 15:07 UTC #2 lore raw

In reply to David Henningsson

Quoted 16 lines · David Henningsson

Hi,

Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.

Signature · 10 lines

David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001
From: David Henningsson <[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Similar to Line Out, these constants form the base for future
patches enabling input jack reporting for Line in jacks.

Acked-by Mark Brown <[email protected]>

but please follow the patch submission process in SubmittingPatches - in particular, don't send your patch as an attachment.

Takashi Iwai

2011-10-06 06:23 UTC #3 lore raw

At Wed, 5 Oct 2011 16:07:56 +0100,

Quoted 16 lines · Mark Brown

Quoted 14 lines · David Henningsson
Hi,
Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.
Signature · 7 lines
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001
From: David Henningsson <[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Quoted 4 lines

Quoted 2 lines
Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks.
Acked-by Mark Brown <[email protected]>

OK, applied now. Thanks.

Takashi

David Henningsson

author

2011-10-06 07:29 UTC #4 lore raw

Quoted 18 lines · Takashi Iwai

At Wed, 5 Oct 2011 16:07:56 +0100,
Quoted 16 lines · Mark Brown
Quoted 14 lines · David Henningsson
Hi,
Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.
--
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001
From: David Henningsson<[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Quoted 6 lines

Quoted 4 lines
Quoted 2 lines
Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks.
Acked-by Mark Brown<[email protected]>
OK, applied now. Thanks.

Danke schön! And thanks for taking the effort of contacting the relevant people.

Signature · 2 lines

David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

David Henningsson

author

2011-10-06 06:46 UTC #5 lore raw

Patch submission process (was: [PATCH] Add "Line In" input jack constants)

In reply to Mark Brown

Quoted 2 lines · Mark Brown

but please follow the patch submission process in SubmittingPatches - in particular, don't send your patch as an attachment.

I find this hard to fulfil at times, in particular when I want to add something to the email that I don't want to be a part of the commit message. Is this possible with git send-email, and without sending the patch as an attachment?

Signature · 2 lines

David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic

Clemens Ladisch

2011-10-06 08:56 UTC #6 lore raw

Re: Patch submission process

Quoted 7 lines · David Henningsson

Quoted 1 line · Mark Brown
... don't send your patch as an attachment.
I find this hard to fulfil at times, in particular when I want to add something to the email that I don't want to be a part of the commit message. Is this possible with git send-email, and without sending the patch as an attachment?

Use "git send-email --annotate", and delimit the something from the commit message with a scissors line (man git-am).

Regards,
Clemens

Mark Brown

2011-10-06 10:00 UTC #7 lore raw

Re: Patch submission process (was: [PATCH] Add "Line In" input jack constants)

In reply to David Henningsson

Quoted 8 lines · David Henningsson

Quoted 2 lines · Mark Brown
but please follow the patch submission process in SubmittingPatches - in particular, don't send your patch as an attachment.
I find this hard to fulfil at times, in particular when I want to add something to the email that I don't want to be a part of the commit message. Is this possible with git send-email, and without sending the patch as an attachment?

The relevant section of SubmittingPatches is:

|  - A marker line containing simply "---".
|
|   - Any additional comments not suitable for the changelog.
|
|   - The actual patch (diff output).

You can edit the patch after running format-patch, or use --annotate with send-mail.

Takashi Iwai

2011-10-05 15:55 UTC #8 lore raw

In reply to David Henningsson

At Wed, 05 Oct 2011 16:01:22 +0200,

Quoted 5 lines · David Henningsson

Hi,
Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.

Oh, we should add Dmitry to Cc, since the patch touchs linux/input.h. Dmitry, is it OK to add SW_LINEIN_INSERT as below?

thanks,

Takashi

Quoted 73 lines

Signature · 4 lines

-- 
David Henningsson, Canonical Ltd.
http://launchpad.net/~diwic
[2 0001-Add-Line-In-input-jack-constants.patch <text/x-patch (7bit)>]

Quoted 1 line

From 356e80c4e2f5d9d1c85b5eee93d2932f7637b338 Mon Sep 17 00:00:00 2001

From: David Henningsson <[email protected]>
Date: Wed, 5 Oct 2011 15:53:25 +0200
Subject: [PATCH] Add "Line In" input jack constants

Similar to Line Out, these constants form the base for future patches enabling input jack reporting for Line in jacks.

Signed-off-by David Henningsson <[email protected]>

---
 include/linux/input.h     |    1 +
 include/sound/jack.h      |    1 +
 sound/core/jack.c         |    1 +
 sound/pci/hda/hda_codec.c |    2 ++
 4 files changed, 5 insertions(+), 0 deletions(-)

include/linux/input.h +1 -0

index a637e78..a514fb8 100644
@@ -814,6 +814,7 @@ struct input_keymap_entry {
 #define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
 #define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
 #define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define SW_MAX			0x0f
 #define SW_CNT			(SW_MAX+1)

include/sound/jack.h +1 -0

index c140fc7..63c7907 100644
@@ -42,6 +42,7 @@ enum snd_jack_types {
 	SND_JACK_MECHANICAL	= 0x0008, /* If detected separately */
 	SND_JACK_VIDEOOUT	= 0x0010,
 	SND_JACK_AVOUT		= SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+	SND_JACK_LINEIN		= 0x0020,
 
 	/* Kept separate from switches to facilitate implementation */
 	SND_JACK_BTN_0		= 0x4000,

sound/core/jack.c +1 -0

index 53b53e9..240a3e1 100644
@@ -30,6 +30,7 @@ static int jack_switch_types[] = {
 	SW_LINEOUT_INSERT,
 	SW_JACK_PHYSICAL_INSERT,
 	SW_VIDEOOUT_INSERT,
+	SW_LINEIN_INSERT,
 };
 
 static int snd_jack_dev_free(struct snd_device *device)

sound/pci/hda/hda_codec.c +2 -0

index e3db196..8b046a1 100644
@@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
 		return "Mic";
 	case SND_JACK_LINEOUT:
 		return "Line-out";
+	case SND_JACK_LINEIN:
+		return "Line-in";
 	case SND_JACK_HEADSET:
 		return "Headset";
 	case SND_JACK_VIDEOOUT:

Signature · 1 line

1.7.5.4

Dmitry Torokhov

maintainer

2011-10-06 03:36 UTC #9 lore raw

Quoted 11 lines · Takashi Iwai

At Wed, 05 Oct 2011 16:01:22 +0200,
Quoted 5 lines · David Henningsson
Hi,
Do you think this is reasonable to apply to 3.2? If so I'll continue with writing some patches that use this new constant, of course.
Oh, we should add Dmitry to Cc, since the patch touchs linux/input.h. Dmitry, is it OK to add SW_LINEIN_INSERT as below?

Yeah, that should be OK.

Thanks.

Signature · 1 line

Dmitry