From patchwork Mon Oct 19 07:37:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 54700 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9J7bZCw025056 for ; Mon, 19 Oct 2009 07:37:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755100AbZJSHh3 (ORCPT ); Mon, 19 Oct 2009 03:37:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755428AbZJSHh3 (ORCPT ); Mon, 19 Oct 2009 03:37:29 -0400 Received: from buzzloop.caiaq.de ([212.112.241.133]:35565 "EHLO buzzloop.caiaq.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755100AbZJSHh2 (ORCPT ); Mon, 19 Oct 2009 03:37:28 -0400 Received: from localhost (localhost [127.0.0.1]) by buzzloop.caiaq.de (Postfix) with ESMTP id CF4FA7F407B; Mon, 19 Oct 2009 09:37:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at buzzloop.caiaq.de Received: from buzzloop.caiaq.de ([127.0.0.1]) by localhost (buzzloop.caiaq.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tHGzcTewWtRp; Mon, 19 Oct 2009 09:37:28 +0200 (CEST) Received: by buzzloop.caiaq.de (Postfix, from userid 1000) id 62D5F7F4068; Mon, 19 Oct 2009 09:37:28 +0200 (CEST) Date: Mon, 19 Oct 2009 09:37:28 +0200 From: Daniel Mack To: Dmitry Torokhov Cc: Richard Purdie , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, Constantin Baranov Subject: Re: [PATCH] leds-alix2: add support for button connected to J15 Message-ID: <20091019073728.GC28832@buzzloop.caiaq.de> References: <20091016130315.GT28832@buzzloop.caiaq.de> <20091018072738.GF3935@core.coreip.homeip.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20091018072738.GF3935@core.coreip.homeip.net> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index e4f599f..2faba0a 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -77,6 +77,20 @@ config LEDS_ALIX2 This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs. You have to set leds-alix2.force=1 for boards with Award BIOS. +config LEDS_ALIX2_BUTTON + bool "Input device support for button on ALIX boards" + depends on LEDS_ALIX2 && INPUT + select INPUT_POLLDEV + help + This option enables support for a button connected to J15 of ALIX + boards. + + Note that for this feature to work, there is need for a minor + modification to the hardware: R1 needs to be removed, and R4 needs + to be placed as 100 KOhms pull-up. + + Only select that option if you modified your ALIX board like this. + config LEDS_H1940 tristate "LED Support for iPAQ H1940 device" depends on LEDS_CLASS && ARCH_H1940 diff --git a/drivers/leds/leds-alix2.c b/drivers/leds/leds-alix2.c index f59ffad..5788767 100644 --- a/drivers/leds/leds-alix2.c +++ b/drivers/leds/leds-alix2.c @@ -12,6 +12,7 @@ #include #include #include +#include static int force = 0; module_param(force, bool, 0444); @@ -78,6 +79,55 @@ static struct alix_led alix_leds[] = { }, }; +#ifdef CONFIG_LEDS_ALIX2_BUTTON + +#define POLL_INTERVAL_DEFAULT 250 +static struct input_polled_dev *ipdev; + +static void alix_button_poll(struct input_polled_dev *ipdev) +{ + unsigned int val = !(inl(gpio_base + 0x30) & (1 << 1)); + + input_report_key(ipdev->input, KEY_PROG1, val); + input_sync(ipdev->input); +} + +static int alix_button_register(void) +{ + int ret; + + /* enable button input */ + outl(1 << 1, gpio_base + 0x20); + + /* enable pullup on input pin */ + outl(1 << 1, gpio_base + 0x18); + + ipdev = input_allocate_polled_device(); + if (!ipdev) + return -ENOMEM; + + ipdev->poll = alix_button_poll; + ipdev->poll_interval = POLL_INTERVAL_DEFAULT; + ipdev->input->name = "ALIX2 button"; + ipdev->input->phys = "alix2/input0"; + ipdev->input->id.bustype = BUS_HOST; + + set_bit(EV_KEY, ipdev->input->evbit); + ipdev->input->keybit[BIT_WORD(KEY_PROG1)] = BIT_MASK(KEY_PROG1); + + ret = input_register_polled_device(ipdev); + + if (ret) { + input_free_polled_device(ipdev); + ipdev = NULL; + } + + return ret; +} +#else +#define alix_button_register() (0) +#endif + static int __init alix_led_probe(struct platform_device *pdev) { int i; @@ -89,6 +139,11 @@ static int __init alix_led_probe(struct platform_device *pdev) if (ret < 0) goto fail; } + + ret = alix_button_register(); + if (ret) + goto fail; + return 0; fail: @@ -103,6 +158,10 @@ static int alix_led_remove(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(alix_leds); i++) led_classdev_unregister(&alix_leds[i].cdev); + + if (ipdev) + input_unregister_polled_device(ipdev); + return 0; }