Skip to contentSkip to conversation

Add support for hook switch on ams-delta

RFC PATCH In review Janusz Krzysztofik 4 participants 14 messages May 26, 2009 – Mar 29, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 Add support for hook switch on ams-delta

Hi,

This trivial patch adds gpio-keys compatible platform device definition to ams-delta board, that supports hook switch found on this videophone. It is derived from similiar definitions found in other boards code. The patch is based on linux-2.6.30-rc5. Any comments are welcome.

Cheers,
Janusz

arch/arm/mach-omap1/board-ams-delta.c +33 -0
diff -Npru a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/gpio_keys.h>
 #include <linux/platform_device.h>
 
 #include <mach/hardware.h>
@@ -213,10 +214,35 @@ static struct platform_device ams_delta_
 	.id	= -1
 };
 
+static struct gpio_keys_button ams_delta_gpio_keys_buttons[] = {
+	[0] = {
+		.desc		= "hook_switch",
+		.type		= EV_SW,		/* or EV_KEY ? */
+		.code		= SW_HEADPHONE_INSERT,	/* or a new one ? */
+		.active_low	= 1,
+		.gpio		= AMS_DELTA_GPIO_PIN_HOOK_SWITCH,
+		.debounce_interval = 10,
+	},
+};
+
+static struct gpio_keys_platform_data ams_delta_gpio_keys = {
+	.buttons		= ams_delta_gpio_keys_buttons,
+	.nbuttons		= ARRAY_SIZE(ams_delta_gpio_keys_buttons),
+};
+
+static struct platform_device ams_delta_gpio_keys_device = {
+	.name			= "gpio-keys",
+	.id			= -1,
+	.dev			= {
+		.platform_data	= &ams_delta_gpio_keys,
+	},
+};
+
 static struct platform_device *ams_delta_devices[] __initdata = {
 	&ams_delta_kp_device,
 	&ams_delta_lcd_device,
 	&ams_delta_led_device,
+	&ams_delta_gpio_keys_device,
 };
 
 static void __init ams_delta_init(void)
@@ -233,6 +259,13 @@ static void __init ams_delta_init_irq(vo
 
 	omap_usb_init(&ams_delta_usb_config);
 	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
+
+	omap_cfg_reg(P20_1610_GPIO4); /* is this required? */
+
+	/* The hook switch state could be exposed over sysfs with gpio_export().
+	 * This should be done after the gpio-keys driver calls gpio_request(),
+	 * but I don't know how to do this from outside of the driver. */
+	/* gpio_export(AMS_DELTA_GPIO_PIN_HOOK_SWITCH, 0); */
 }
 
 static void __init ams_delta_map_io(void)
reviewer
#2 lore raw
Quoted 10 lines · Tony Lindgren

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 89c6da9692bb04ce6221c371d3161f9722005e99

PatchWorks
http://patchwork.kernel.org/patch/26069/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Everybody, please try to send your patches with git send-mail, with proper Signed-off-by and description. It is no fun to manually edit patches.

Thanks,

Tony

#3 lore raw

Tuesday 02 June 2009 20:27:50 Tony Lindgren napisał(a):

Quoted 10 lines · Tony Lindgren
Quoted 9 lines

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change):
89c6da9692bb04ce6221c371d3161f9722005e99

PatchWorks
http://patchwork.kernel.org/patch/26069/

Quoted 6 lines
Quoted 3 lines

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=com
mit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Tony,

I'm sorry, I'm new here and did not realise that my message would ever be processed by a "fwiendly patch wobot". Was this because of the [PATCH] label I had put into subject line?

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

reviewer
#4 lore raw
Quoted 18 lines · Janusz Krzysztofik

Tuesday 02 June 2009 20:27:50 Tony Lindgren napisał(a):

Quoted 10 lines · Tony Lindgren
Quoted 9 lines

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change):
89c6da9692bb04ce6221c371d3161f9722005e99

PatchWorks
http://patchwork.kernel.org/patch/26069/

Quoted 6 lines
Quoted 3 lines

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=com
mit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Quoted 9 lines

Tony,

I'm sorry, I'm new here and did not realise that my message would ever be processed by a "fwiendly patch wobot". Was this because of the [PATCH] label I had put into subject line?

Well sounds like further changes are needed, I did not push it yet so please resubmit.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

Wednesday 03 June 2009 18:36:52 Tony Lindgren napisał(a):

Quoted 26 lines · Janusz Krzysztofik
Quoted 25 lines

Tuesday 02 June 2009 20:27:50 Tony Lindgren napisał(a):

Quoted 10 lines · Tony Lindgren
Quoted 9 lines

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change):
89c6da9692bb04ce6221c371d3161f9722005e99

PatchWorks
http://patchwork.kernel.org/patch/26069/

Quoted 6 lines
Quoted 3 lines

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a
=com mit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Tony,

I'm sorry, I'm new here and did not realise that my message would ever be processed by a "fwiendly patch wobot". Was this because of the [PATCH] label I had put into subject line?

Quoted 6 lines
Quoted 1 line

Well sounds like further changes are needed, I did not push it yet so please resubmit.

Tony

OK, I will, thanks,
Janusz
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#6 lore raw
In reply to Tony Lindgren
Quoted 19 lines · Tony Lindgren
Quoted 18 lines · Janusz Krzysztofik

Tuesday 02 June 2009 20:27:50 Tony Lindgren napisał(a):

Quoted 7 lines · Tony Lindgren
Quoted 6 lines

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change):
89c6da9692bb04ce6221c371d3161f9722005e99

Quoted 8 lines
Quoted 6 lines

PatchWorks
http://patchwork.kernel.org/patch/26069/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=com
mit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Tony,

Quoted 8 lines
Quoted 5 lines

I'm sorry, I'm new here and did not realise that my message would ever be processed by a "fwiendly patch wobot". Was this because of the [PATCH] label I had put into subject line?

Well sounds like further changes are needed, I did not push it yet so please resubmit.

Tony,

I have noticed that the patch has entered omap1-upstream branch. Is it possible to revert it? It will conflict with a new different, ASoC jack based implementation I am currently working on instead.

Thanks,
Janusz
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

reviewer
#7 lore raw
Quoted 28 lines · Janusz Krzysztofik
Quoted 27 lines · Tony Lindgren
Quoted 25 lines · Janusz Krzysztofik

Tuesday 02 June 2009 20:27:50 Tony Lindgren napisał(a):

Quoted 7 lines · Tony Lindgren
Quoted 6 lines

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change):
89c6da9692bb04ce6221c371d3161f9722005e99

Quoted 8 lines
Quoted 6 lines

PatchWorks
http://patchwork.kernel.org/patch/26069/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=com
mit;h=89c6da9692bb04ce6221c371d3161f9722005e99

Argh, this is missing Signed-off-by too, please reply with your Signed-off-by. Or repost with proper description.

Tony,

I'm sorry, I'm new here and did not realise that my message would ever be processed by a "fwiendly patch wobot". Was this because of the [PATCH] label I had put into subject line?

Quoted 8 lines
Quoted 2 lines

Well sounds like further changes are needed, I did not push it yet so please resubmit.

Tony,

I have noticed that the patch has entered omap1-upstream branch. Is it possible to revert it? It will conflict with a new different, ASoC jack based implementation I am currently working on instead.

Oops, sorry I guess I forgot to revert it there, will remove.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#8 lore raw
In reply to Janusz Krzysztofik
Quoted 4 lines · Janusz Krzysztofik

This trivial patch adds gpio-keys compatible platform device definition to ams-delta board, that supports hook switch found on this videophone. It is derived from similiar definitions found in other boards code. The patch is based on linux-2.6.30-rc5. Any comments are welcome.

I'm obviously too late as I've seen the "Applied" mail, but some comments:

* I don't think SW_HEADPHONE_INSERT is appropriate. input guys, is it not reasonable to have SW_PHONE_HOOK or similar? I can't find anything else in tree I know to be a VOIP phone that has the concept of a hook switch except perhaps the TuxScreen and it doesn't have anything set up that I could find. I think you're correct that EV_SW is appropriate; it may remain in the off-hook state for some time and AFAICT the gpio-key driver would produce a repeating key press if you used EV_KEY.

* We assume the bootloader does the appropriate GPIO pin setup for us, so I don't think your omap_cfg_reg is required but it doesn't hurt in the unlikely event we ever replace the Amstrad PBL.

* The commented out code to include the GPIO status in sysfs shouldn't be included. Does the input layer not provide a way to obtain the state of the switch?

Quoted 51 lines

diff -Npru a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c

arch/arm/mach-omap1/board-ams-delta.c +26 -0
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/input.h>
+#include <linux/gpio_keys.h>
 #include <linux/platform_device.h>
 
 #include <mach/hardware.h>
@@ -213,10 +214,35 @@ static struct platform_device ams_delta_
 	.id	= -1
 };
 
+static struct gpio_keys_button ams_delta_gpio_keys_buttons[] = {
+	[0] = {
+		.desc		= "hook_switch",
+		.type		= EV_SW,		/* or EV_KEY ? */
+		.code		= SW_HEADPHONE_INSERT,	/* or a new one ? */
+		.active_low	= 1,
+		.gpio		= AMS_DELTA_GPIO_PIN_HOOK_SWITCH,
+		.debounce_interval = 10,
+	},
+};
+
+static struct gpio_keys_platform_data ams_delta_gpio_keys = {
+	.buttons		= ams_delta_gpio_keys_buttons,
+	.nbuttons		= ARRAY_SIZE(ams_delta_gpio_keys_buttons),
+};
+
+static struct platform_device ams_delta_gpio_keys_device = {
+	.name			= "gpio-keys",
+	.id			= -1,
+	.dev			= {
+		.platform_data	= &ams_delta_gpio_keys,
+	},
+};
+
 static struct platform_device *ams_delta_devices[] __initdata = {
 	&ams_delta_kp_device,
 	&ams_delta_lcd_device,
 	&ams_delta_led_device,
+	&ams_delta_gpio_keys_device,
 };
 
 static void __init ams_delta_init(void)
@@ -233,6 +259,13 @@ static void __init ams_delta_init_irq(vo
 
 	omap_usb_init(&ams_delta_usb_config);
 	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));

arch/arm/mach-omap1/board-ams-delta.c static void __init ams_delta_init_irq(vo · line 271

Quoted 10 lines
arch/arm/mach-omap1/board-ams-delta.c +7 -0
+
+	omap_cfg_reg(P20_1610_GPIO4); /* is this required? */
+
+	/* The hook switch state could be exposed over sysfs with gpio_export().
+	 * This should be done after the gpio-keys driver calls gpio_request(),
+	 * but I don't know how to do this from outside of the driver. */
+	/* gpio_export(AMS_DELTA_GPIO_PIN_HOOK_SWITCH, 0); */
 }
 
 static void __init ams_delta_map_io(void)

J.

Signature · 1 line
Revd. Jonathan McDowell, ULC | I don't sleep, I dream.
#9 lore raw

Hi Jonathan,

Wednesday 03 June 2009 00:04:33 Jonathan McDowell napisał(a):

Quoted 1 line

I'm obviously too late as I've seen the "Applied" mail,

No problem, I'm glad to hear from you.

Quoted 5 lines

but some
comments:

* I don't think SW_HEADPHONE_INSERT is appropriate. input guys, is it not reasonable to have SW_PHONE_HOOK or similar?

I do share you point of view. However, I didn't want to start a discussion if there is a need for another symbol or not before the patch got any acceptance.

Quoted 3 lines

* We assume the bootloader does the appropriate GPIO pin setup for us, so I don't think your omap_cfg_reg is required but it doesn't hurt in the unlikely event we ever replace the Amstrad PBL.

OK, let it stay there. Do you see a need for replaceing it with a new ams_delta_hook_switch_init() function call that just calls omap_cfg_reg()?

Quoted 2 lines

* The commented out code to include the GPIO status in sysfs shouldn't be included.

Yes, I put it there to get a feedback.

Quoted 2 lines

Does the input layer not provide a way to obtain the state of the switch?

Yes, it does, with EVIOCGSW ioctl()[1]. I personally don't like this way of getting the switch status and would rather see it available over sysfs. However, input guys may have their own preferences and gpio-keys driver belongs to them.

Thanks,
Janusz

[1] http://www.spinics.net/lists/linux-input/msg03482.html

P.S. I include my Signed-off-by, as Tony have requested, to avoid the code without one floating around.

Quoted 61 lines
Quoted 61 lines

diff -Npru a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c ---
a/arch/arm/mach-omap1/board-ams-delta.c 2009-05-17 17:58:18.000000000
+0200 +++ b/arch/arm/mach-omap1/board-ams-delta.c 2009-05-17
16:22:59.000000000 +0200 @@ -15,6 +15,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/input.h>

arch/arm/mach-omap1/board-ams-delta.c +30 -0
+#include <linux/gpio_keys.h>
 #include <linux/platform_device.h>
 
 #include <mach/hardware.h>
@@ -213,10 +214,35 @@ static struct platform_device ams_delta_
 	.id	= -1
 };
 
+static struct gpio_keys_button ams_delta_gpio_keys_buttons[] = {
+	[0] = {
+		.desc		= "hook_switch",
+		.type		= EV_SW,		/* or EV_KEY ? */
+		.code		= SW_HEADPHONE_INSERT,	/* or a new one ? */
+		.active_low	= 1,
+		.gpio		= AMS_DELTA_GPIO_PIN_HOOK_SWITCH,
+		.debounce_interval = 10,
+	},
+};
+
+static struct gpio_keys_platform_data ams_delta_gpio_keys = {
+	.buttons		= ams_delta_gpio_keys_buttons,
+	.nbuttons		= ARRAY_SIZE(ams_delta_gpio_keys_buttons),
+};
+
+static struct platform_device ams_delta_gpio_keys_device = {
+	.name			= "gpio-keys",
+	.id			= -1,
+	.dev			= {
+		.platform_data	= &ams_delta_gpio_keys,
+	},
+};
+
 static struct platform_device *ams_delta_devices[] __initdata = {
 	&ams_delta_kp_device,
 	&ams_delta_lcd_device,
 	&ams_delta_led_device,
+	&ams_delta_gpio_keys_device,
 };
 
 static void __init ams_delta_init(void)
@@ -233,6 +259,13 @@ static void __init ams_delta_init_irq(vo
 
 	omap_usb_init(&ams_delta_usb_config);
 	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
+
+	omap_cfg_reg(P20_1610_GPIO4); /* is this required? */
+
+	/* The hook switch state could be exposed over sysfs with

gpio_export(). + * This should be done after the gpio-keys driver calls
gpio_request(), + * but I don't know how to do this from outside of the
driver. */ + /* gpio_export(AMS_DELTA_GPIO_PIN_HOOK_SWITCH, 0); */
}

Quoted 3 lines
Quoted 1 line

static void __init ams_delta_map_io(void)

J.

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#10 lore raw
Quoted 15 lines · Janusz Krzysztofik

Wednesday 03 June 2009 00:04:33 Jonathan McDowell napisał(a):

Quoted 1 line

I'm obviously too late as I've seen the "Applied" mail,

No problem, I'm glad to hear from you.

Quoted 5 lines

but some
comments:

* I don't think SW_HEADPHONE_INSERT is appropriate. input guys, is it not reasonable to have SW_PHONE_HOOK or similar?

I do share you point of view. However, I didn't want to start a discussion if there is a need for another symbol or not before the patch got any acceptance.

Quoted 6 lines
Quoted 3 lines

* We assume the bootloader does the appropriate GPIO pin setup for us, so I don't think your omap_cfg_reg is required but it doesn't hurt in the unlikely event we ever replace the Amstrad PBL.

OK, let it stay there. Do you see a need for replaceing it with a new ams_delta_hook_switch_init() function call that just calls omap_cfg_reg()?

I don't see a need for this; it's always present and not a lot of code to have in the init function as it stands.

Quoted 5 lines
Quoted 2 lines

* The commented out code to include the GPIO status in sysfs shouldn't be included.

Yes, I put it there to get a feedback.

Quoted 7 lines
Quoted 2 lines

Does the input layer not provide a way to obtain the state of the switch?

Yes, it does, with EVIOCGSW ioctl()[1]. I personally don't like this way of getting the switch status and would rather see it available over sysfs. However, input guys may have their own preferences and gpio-keys driver belongs to them.

I think that's a discussion to have with the input guys rather than putting a hack in the platform file then.

So really the only issue with the patch that remains is if it justifies adding a new SW_PHONE_HOOK switch type?

J.

Signature · 8 lines
] http://www.earth.li/~noodles/ []  Purranoia: The fear that your cat  [
]  PGP/GPG Key @ the.earth.li   []         is up to something.         [
] via keyserver, web or email.  []                                     [
] RSA: 4096/2DA8B985            []                                     [
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#11 lore raw

Hi,

Thursday 04 June 2009 20:18:33 Jonathan McDowell napisał(a):

Quoted 7 lines · Janusz Krzysztofik
Quoted 6 lines

Wednesday 03 June 2009 00:04:33 Jonathan McDowell napisał(a):

Quoted 3 lines

* We assume the bootloader does the appropriate GPIO pin setup for us, so I don't think your omap_cfg_reg is required but it doesn't hurt in the unlikely event we ever replace the Amstrad PBL.

Quoted 6 lines
Quoted 3 lines

OK, let it stay there. Do you see a need for replaceing it with a new ams_delta_hook_switch_init() function call that just calls omap_cfg_reg()?

I don't see a need for this; it's always present and not a lot of code to have in the init function as it stands.

Fine, I'll only add a comment explainig the purpose of the call then.

Quoted 10 lines
Quoted 7 lines
Quoted 2 lines

Does the input layer not provide a way to obtain the state of the switch?

Yes, it does, with EVIOCGSW ioctl()[1]. I personally don't like this way of getting the switch status and would rather see it available over sysfs. However, input guys may have their own preferences and gpio-keys driver belongs to them.

I think that's a discussion to have with the input guys rather than putting a hack in the platform file then.

Sure. I have a patch for gpio-keys.c ready to submit, let's see how far we can get with the idea of exporting a gpio-keys driven switch state over gpiolib sysfs.

Quoted 2 lines

So really the only issue with the patch that remains is if it justifies adding a new SW_PHONE_HOOK switch type?

I've just submitted a patch that adds new symbol definition to include/linux/input.h. Do I have to wait for acknowledgement before I resubmit my modified patch that depends on that, or can I submit it now?

Thanks,
Janusz
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#12 lore raw
In reply to Jonathan McDowell
Quoted 3 lines · Jonathan McDowell

* The commented out code to include the GPIO status in sysfs shouldn't be included. Does the input layer not provide a way to obtain the state of the switch?

It does, but only via an ioctl().

#13 lore raw
Quoted 7 lines · Mark Brown
Quoted 3 lines · Jonathan McDowell

* The commented out code to include the GPIO status in sysfs shouldn't be included. Does the input layer not provide a way to obtain the state of the switch?

It does, but only via an ioctl().

Sorry, clearly I'm managing to get some extremely old mail dripping through here :(