@@ -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
@@ -12,6 +12,7 @@
#include <linux/platform_device.h>
#include <linux/string.h>
#include <linux/pci.h>
+#include <linux/input-polldev.h>
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: