From: Nishanth Menon <nm@ti.com>
To: "Datta, Shubhrajyoti" <shubhrajyoti@ti.com>
Cc: "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Subject: Re: [RFC] [PATCHv2 2/2] SFH7741: Proximity sensor board support.
Date: Wed, 12 May 2010 08:22:31 -0500 [thread overview]
Message-ID: <4BEAAB97.1000106@ti.com> (raw)
In-Reply-To: <0680EC522D0CC943BC586913CF3768C003B3209EF5@dbde02.ent.ti.com>
Datta, Shubhrajyoti had written, on 05/12/2010 03:52 AM, the following:
> Adding board support for the proximity sensor.
>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
> arch/arm/mach-omap2/board-4430sdp.c | 71 +++++++++++++++++++++++++++++++++++
> 1 files changed, 71 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
> index b88f28c..beb3059 100644
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -18,6 +18,7 @@
> #include <linux/io.h>
> #include <linux/gpio.h>
> #include <linux/usb/otg.h>
> +#include <linux/input/sfh7741.h>
>
> #include <mach/hardware.h>
> #include <asm/mach-types.h>
> @@ -31,7 +32,25 @@
> #include <plat/usb.h>
> #include <asm/hardware/gic.h>
> #include <asm/hardware/cache-l2x0.h>
> +#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184
> +#define OMAP4_SFH7741_ENABLE_GPIO 188
> +static void omap_prox_activate(int state);
> +static int omap_prox_read(void);
> +
> +static struct sfh7741_platform_data omap_sfh7741_data = {
> + .irq = OMAP_GPIO_IRQ(OMAP4_SFH7741_SENSOR_OUTPUT_GPIO),
> + .prox_enable = 1,
> + .activate_func = omap_prox_activate,
> + .read_prox = omap_prox_read,
> +};
>
> +static struct platform_device sdp4430_proximity_device = {
> + .name = "sfh7741",
> + .id = 1,
> + .dev = {
> + .platform_data = &omap_sfh7741_data,
> + },
> +};
> static struct platform_device sdp4430_lcd_device = {
> .name = "sdp4430_lcd",
> .id = -1,
> @@ -39,6 +58,7 @@ static struct platform_device sdp4430_lcd_device = {
>
> static struct platform_device *sdp4430_devices[] __initdata = {
> &sdp4430_lcd_device,
> + &sdp4430_proximity_device,
> };
>
> static struct omap_lcd_config sdp4430_lcd_config __initdata = {
> @@ -111,6 +131,56 @@ static struct omap_musb_board_data musb_board_data = {
> .power = 100,
> };
>
> +static void omap_prox_activate(int state)
> +{
> + gpio_set_value(OMAP4_SFH7741_ENABLE_GPIO , state);
> +}
> +
> +static int omap_prox_read(void)
> +{
> + int proximity;
> + proximity = gpio_get_value(OMAP4_SFH7741_SENSOR_OUTPUT_GPIO);
> + return proximity;
> +}
> +
> +static void omap_sfh7741prox_init(void)
> +{
> + char *desc = "sfh7741";
> + int error;
> +
> + error = gpio_request(OMAP4_SFH7741_SENSOR_OUTPUT_GPIO, "sfh7741");
> + if (error < 0) {
> + pr_err("%s: GPIO configuration failed: GPIO %d, error %d\n"
> + , __func__, OMAP4_SFH7741_SENSOR_OUTPUT_GPIO, error);
> + return ;
> + }
> +
> + error = gpio_direction_input(OMAP4_SFH7741_SENSOR_OUTPUT_GPIO);
> + if (error < 0) {
> + pr_err("Proximity GPIO input configuration failed\n");
> + goto fail1;
> + }
> +
> + error = gpio_request(OMAP4_SFH7741_ENABLE_GPIO, "sfh7741");
> + if (error < 0) {
> + pr_err("failed to request GPIO %d, error %d\n",
> + OMAP4_SFH7741_ENABLE_GPIO, error);
> + goto fail1;
> + }
> +
> + error = gpio_direction_output(OMAP4_SFH7741_ENABLE_GPIO , 1);
> + if (error < 0) {
> + pr_err("%s: GPIO configuration failed: GPIO %d,\
> + error %d\n",__func__, OMAP4_SFH7741_ENABLE_GPIO, error);
> + goto fail3;
> + }
> + return;
> +
> +fail3:
> + gpio_free(OMAP4_SFH7741_ENABLE_GPIO);
> +fail1:
> + gpio_free(OMAP4_SFH7741_SENSOR_OUTPUT_GPIO);
> +}
a) mux handling?
b) if init failed, still register the prox device? it wont function right?
> static void __init omap_4430sdp_init(void)
> {
> platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
> @@ -120,6 +190,7 @@ static void __init omap_4430sdp_init(void)
> /* FIXME: allow multi-omap to boot until musb is updated for omap4 */
> if (!cpu_is_omap44xx())
> usb_musb_init(&musb_board_data);
> + omap_sfh7741prox_init();
> }
>
> static void __init omap_4430sdp_map_io(void)
--
Regards,
Nishanth Menon
prev parent reply other threads:[~2010-05-12 13:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 8:52 [RFC] [PATCHv2 2/2] SFH7741: Proximity sensor board support Datta, Shubhrajyoti
2010-05-12 13:22 ` Nishanth Menon [this message]
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=4BEAAB97.1000106@ti.com \
--to=nm@ti.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=shubhrajyoti@ti.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).