diff options
author | Florian Fainelli <florian@openwrt.org> | 2011-08-25 09:35:45 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2011-08-25 09:35:45 +0000 |
commit | d2652dee9dcc907051911b8a75050277d4c22dcb (patch) | |
tree | 82ed2bd8fb7b9ba25870f794922a11d4cf654674 /target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch | |
parent | 71adaae258ad2502ddcd1db2469bc5ca09bcd1d8 (diff) | |
download | master-31e0f0ae-d2652dee9dcc907051911b8a75050277d4c22dcb.tar.gz master-31e0f0ae-d2652dee9dcc907051911b8a75050277d4c22dcb.tar.bz2 master-31e0f0ae-d2652dee9dcc907051911b8a75050277d4c22dcb.zip |
update alix2 platform driver
Add support for Ed Wildgoose's alix platform driver plus my
enhancement to add GPIO soft button support.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 28081
Diffstat (limited to 'target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch b/target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch new file mode 100644 index 0000000000..cd2715cd9f --- /dev/null +++ b/target/linux/generic/patches-2.6.39/106-alix_platform_gpio_keys_button.patch @@ -0,0 +1,106 @@ +--- a/arch/x86/platform/geode/alix.c 2011-08-13 15:51:30.892956346 -0600 ++++ b/arch/x86/platform/geode/alix.c 2011-08-13 16:14:58.082329961 -0600 +@@ -6,6 +6,7 @@ + * + * Copyright (C) 2008 Constantin Baranov <const@mimas.ru> + * Copyright (C) 2011 Ed Wildgoose <kernel@wildgooses.com> ++ * and Philip Prindeville <philipp@redfish-solutions.com> + * + * TODO: There are large similarities with leds-net5501.c + * by Alessandro Zummo <a.zummo@towertech.it> +@@ -24,14 +25,48 @@ + #include <linux/leds.h> + #include <linux/platform_device.h> + #include <linux/gpio.h> ++#include <linux/input.h> ++#include <linux/gpio_keys.h> + + #include <asm/geode.h> + ++#define BIOS_SIGNATURE_TINYBIOS 0x000f0000 ++#define BIOS_SIGNATURE_COREBOOT 0x00000050 ++#define BIOS_REGION_SIZE 0x00010000 ++ ++static int model = 0; ++ + static int force = 0; + module_param(force, bool, 0444); + /* FIXME: Award bios is not automatically detected as Alix platform */ + MODULE_PARM_DESC(force, "Force detection as ALIX.2/ALIX.3 platform"); + ++static struct gpio_keys_button alix_gpio_buttons[] = { ++ { ++ .code = KEY_RESTART, ++ .gpio = 24, ++ .active_low = 1, ++ .desc = "Reset button", ++ .type = EV_KEY, ++ .wakeup = 0, ++ .debounce_interval = 100, ++ .can_disable = 0, ++ } ++}; ++static struct gpio_keys_platform_data alix_buttons_data = { ++ .buttons = alix_gpio_buttons, ++ .nbuttons = ARRAY_SIZE(alix_gpio_buttons), ++ .poll_interval = 20, ++}; ++ ++static struct platform_device alix_buttons_dev = { ++ .name = "gpio-polled-keys", ++ .id = 1, ++ .dev = { ++ .platform_data = &alix_buttons_data, ++ } ++}; ++ + static struct gpio_led alix_leds[] = { + { + .name = "alix:1", +@@ -64,17 +98,22 @@ + .dev.platform_data = &alix_leds_data, + }; + ++static struct __initdata platform_device *alix_devs[] = { ++ &alix_buttons_dev, ++ &alix_leds_dev, ++}; ++ + static void __init register_alix(void) + { + /* Setup LED control through leds-gpio driver */ +- platform_device_register(&alix_leds_dev); ++ platform_add_devices(alix_devs, ARRAY_SIZE(alix_devs)); + } + + static int __init alix_present(unsigned long bios_phys, + const char *alix_sig, + size_t alix_sig_len) + { +- const size_t bios_len = 0x00010000; ++ const size_t bios_len = BIOS_REGION_SIZE; + const char *bios_virt; + const char *scan_end; + const char *p; +@@ -109,7 +148,9 @@ + *a = '\0'; + + tail = p + alix_sig_len; +- if ((tail[0] == '2' || tail[0] == '3')) { ++ if ((tail[0] == '2' || tail[0] == '3' || tail[0] == '6')) { ++ model = tail[0] - '0'; ++ + printk(KERN_INFO + "%s: system is recognized as \"%s\"\n", + KBUILD_MODNAME, name); +@@ -128,8 +169,8 @@ + if (!is_geode()) + return 0; + +- if (alix_present(0xf0000, tinybios_sig, sizeof(tinybios_sig) - 1) || +- alix_present(0x500, coreboot_sig, sizeof(coreboot_sig) - 1)) ++ if (alix_present(BIOS_SIGNATURE_TINYBIOS, tinybios_sig, sizeof(tinybios_sig) - 1) || ++ alix_present(BIOS_SIGNATURE_COREBOOT, coreboot_sig, sizeof(coreboot_sig) - 1)) + register_alix(); + + return 0; |