| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131 |
- index dc5f1d3..a24bf8c 100644
- --- a/arch/x86/platform/geode/alix.c
- +++ b/arch/x86/platform/geode/alix.c
- @@ -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,47 @@
- #include <linux/leds.h>
- #include <linux/platform_device.h>
- #include <linux/gpio.h>
- +#include <linux/input.h>
- +#include <linux/gpio_keys.h>
- +#include <linux/dmi.h>
-
- #include <asm/geode.h>
-
- +#define BIOS_SIGNATURE_TINYBIOS 0xf0000
- +#define BIOS_SIGNATURE_COREBOOT 0x500
- +#define BIOS_REGION_SIZE 0x10000
- +
- static bool 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-keys-polled",
- + .id = 1,
- + .dev = {
- + .platform_data = &alix_buttons_data,
- + }
- +};
- +
- static struct gpio_led alix_leds[] = {
- {
- .name = "alix:1",
- @@ -64,17 +98,22 @@ static struct platform_device alix_leds_
- .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,8 @@ static int __init alix_present(unsigned
- *a = '\0';
-
- tail = p + alix_sig_len;
- - if ((tail[0] == '2' || tail[0] == '3')) {
- + if ((tail[0] == '2' || tail[0] == '3' || tail[0] == '6')) {
- +
- printk(KERN_INFO
- "%s: system is recognized as \"%s\"\n",
- KBUILD_MODNAME, name);
- @@ -120,6 +160,24 @@ static int __init alix_present(unsigned
- return 0;
- }
-
- +static bool __init alix_present_dmi(void)
- +{
- + const char *vendor, *product;
- +
- + vendor = dmi_get_system_info(DMI_SYS_VENDOR);
- + if (!vendor || strcmp(vendor, "PC Engines"))
- + return false;
- +
- + product = dmi_get_system_info(DMI_PRODUCT_NAME);
- + if (!product || (strcmp(product, "ALIX.2D") && strcmp(product, "ALIX.6")))
- + return false;
- +
- + printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
- + KBUILD_MODNAME, vendor, product);
- +
- + return true;
- +}
- +
- static int __init alix_init(void)
- {
- const char tinybios_sig[] = "PC Engines ALIX.";
- @@ -128,8 +186,9 @@ static int __init alix_init(void)
- 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) ||
- + alix_present_dmi())
- register_alix();
-
- return 0;
|
