From patchwork Fri Oct 16 13:03:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 54255 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 n9GD7aPX013686 for ; Fri, 16 Oct 2009 13:07:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754189AbZJPND6 (ORCPT ); Fri, 16 Oct 2009 09:03:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759157AbZJPND6 (ORCPT ); Fri, 16 Oct 2009 09:03:58 -0400 Received: from buzzloop.caiaq.de ([212.112.241.133]:34381 "EHLO buzzloop.caiaq.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754189AbZJPND5 (ORCPT ); Fri, 16 Oct 2009 09:03:57 -0400 Received: from localhost (localhost [127.0.0.1]) by buzzloop.caiaq.de (Postfix) with ESMTP id 2F0EB7C801F; Fri, 16 Oct 2009 15:03:19 +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 aViiP9YOZL48; Fri, 16 Oct 2009 15:03:15 +0200 (CEST) Received: by buzzloop.caiaq.de (Postfix, from userid 1000) id 765BD7C8009; Fri, 16 Oct 2009 15:03:15 +0200 (CEST) Date: Fri, 16 Oct 2009 15:03:15 +0200 From: Daniel Mack To: Richard Purdie , linux-kernel@vger.kernel.org Cc: Dmitry Torokhov , linux-input@vger.kernel.org, Constantin Baranov Subject: [PATCH] leds-alix2: add support for button connected to J15 Message-ID: <20091016130315.GT28832@buzzloop.caiaq.de> MIME-Version: 1.0 Content-Disposition: inline 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..7e57bba 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 places as 100KOhms 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..e41b252 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); @@ -29,6 +30,12 @@ static struct pci_device_id divil_pci[] = { }; MODULE_DEVICE_TABLE(pci, divil_pci); +#ifdef CONFIG_LEDS_ALIX2_BUTTON +static struct input_polled_dev *ipdev; +static int alix_button_last; +#define POLL_INTERVAL_DEFAULT 250 +#endif + struct alix_led { struct led_classdev cdev; unsigned short port; @@ -78,6 +85,20 @@ static struct alix_led alix_leds[] = { }, }; +#ifdef CONFIG_LEDS_ALIX2_BUTTON +static void alix_button_poll(struct input_polled_dev *ipdev) +{ + unsigned int val = !(inl(gpio_base + 0x30) & (1 << 1)); + + if (val == alix_button_last) + return; + + input_report_key(ipdev->input, BTN_MISC, val); + input_sync(ipdev->input); + alix_button_last = val; +} +#endif + static int __init alix_led_probe(struct platform_device *pdev) { int i; @@ -89,6 +110,35 @@ static int __init alix_led_probe(struct platform_device *pdev) if (ret < 0) goto fail; } + +#ifdef CONFIG_LEDS_ALIX2_BUTTON + /* enable button input */ + outl(1 << 1, gpio_base + 0x20); + + /* enable pullup on input pin */ + outl(1 << 1, gpio_base + 0x18); + + alix_button_last = 0; + ipdev = input_allocate_polled_device(); + if (!ipdev) + goto fail; + + 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(BTN_MISC)] = BIT_MASK(BTN_MISC); + + ret = input_register_polled_device(ipdev); + if (ret) { + input_free_polled_device(ipdev); + goto fail; + } +#endif + return 0; fail: