target/linux/x86/patches-3.3/001-alix_platform.patch

   1 index dc5f1d3..a24bf8c 100644
   2 --- a/arch/x86/platform/geode/alix.c
   3 +++ b/arch/x86/platform/geode/alix.c
   4 @@ -6,6 +6,7 @@
   5   *
   6   * Copyright (C) 2008 Constantin Baranov <const@mimas.ru>
   7   * Copyright (C) 2011 Ed Wildgoose <kernel@wildgooses.com>
   8 + *                and Philip Prindeville <philipp@redfish-solutions.com>
   9   *
  10   * TODO: There are large similarities with leds-net5501.c
  11   * by Alessandro Zummo <a.zummo@towertech.it>
  12 @@ -24,14 +25,47 @@
  13  #include <linux/leds.h>
  14  #include <linux/platform_device.h>
  15  #include <linux/gpio.h>
  16 +#include <linux/input.h>
  17 +#include <linux/gpio_keys.h>
  18 +#include <linux/dmi.h>
  19
  20  #include <asm/geode.h>
  21
  22 +#define BIOS_SIGNATURE_TINYBIOS                0xf0000
  23 +#define BIOS_SIGNATURE_COREBOOT                0x500
  24 +#define BIOS_REGION_SIZE               0x10000
  25 +
  26  static bool force = 0;
  27  module_param(force, bool, 0444);
  28  /* FIXME: Award bios is not automatically detected as Alix platform */
  29  MODULE_PARM_DESC(force, "Force detection as ALIX.2/ALIX.3 platform");
  30
  31 +static struct gpio_keys_button alix_gpio_buttons[] = {
  32 +       {
  33 +               .code = KEY_RESTART,
  34 +               .gpio = 24,
  35 +               .active_low = 1,
  36 +               .desc = "Reset button",
  37 +               .type = EV_KEY,
  38 +               .wakeup = 0,
  39 +               .debounce_interval = 100,
  40 +               .can_disable = 0,
  41 +       }
  42 +};
  43 +static struct gpio_keys_platform_data alix_buttons_data = {
  44 +       .buttons = alix_gpio_buttons,
  45 +       .nbuttons = ARRAY_SIZE(alix_gpio_buttons),
  46 +       .poll_interval = 20,
  47 +};
  48 +
  49 +static struct platform_device alix_buttons_dev = {
  50 +       .name = "gpio-keys-polled",
  51 +       .id = 1,
  52 +       .dev = {
  53 +               .platform_data = &alix_buttons_data,
  54 +       }
  55 +};
  56 +
  57  static struct gpio_led alix_leds[] = {
  58         {
  59                 .name = "alix:1",
  60 @@ -64,17 +98,22 @@ static struct platform_device alix_leds_
  61         .dev.platform_data = &alix_leds_data,
  62  };
  63
  64 +static struct __initdata platform_device *alix_devs[] = {
  65 +       &alix_buttons_dev,
  66 +       &alix_leds_dev,
  67 +};
  68 +
  69  static void __init register_alix(void)
  70  {
  71         /* Setup LED control through leds-gpio driver */
  72 -       platform_device_register(&alix_leds_dev);
  73 +       platform_add_devices(alix_devs, ARRAY_SIZE(alix_devs));
  74  }
  75
  76  static int __init alix_present(unsigned long bios_phys,
  77                                 const char *alix_sig,
  78                                 size_t alix_sig_len)
  79  {
  80 -       const size_t bios_len = 0x00010000;
  81 +       const size_t bios_len = BIOS_REGION_SIZE;
  82         const char *bios_virt;
  83         const char *scan_end;
  84         const char *p;
  85 @@ -109,7 +148,8 @@ static int __init alix_present(unsigned
  86                         *a = '\0';
  87
  88                 tail = p + alix_sig_len;
  89 -               if ((tail[0] == '2' || tail[0] == '3')) {
  90 +               if ((tail[0] == '2' || tail[0] == '3' || tail[0] == '6')) {
  91 +
  92                         printk(KERN_INFO
  93                                "%s: system is recognized as \"%s\"\n",
  94                                KBUILD_MODNAME, name);
  95 @@ -120,6 +160,24 @@ static int __init alix_present(unsigned
  96         return 0;
  97  }
  98
  99 +static bool __init alix_present_dmi(void)
 100 +{
 101 +       const char *vendor, *product;
 102 +
 103 +       vendor = dmi_get_system_info(DMI_SYS_VENDOR);
 104 +       if (!vendor || strcmp(vendor, "PC Engines"))
 105 +               return false;
 106 +
 107 +       product = dmi_get_system_info(DMI_PRODUCT_NAME);
 108 +       if (!product || (strcmp(product, "ALIX.2D") && strcmp(product, "ALIX.6")))
 109 +               return false;
 110 +
 111 +       printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
 112 +              KBUILD_MODNAME, vendor, product);
 113 +
 114 +       return true;
 115 +}
 116 +
 117  static int __init alix_init(void)
 118  {
 119         const char tinybios_sig[] = "PC Engines ALIX.";
 120 @@ -128,8 +186,9 @@ static int __init alix_init(void)
 121         if (!is_geode())
 122                 return 0;
 123
 124 -       if (alix_present(0xf0000, tinybios_sig, sizeof(tinybios_sig) - 1) ||
 125 -           alix_present(0x500, coreboot_sig, sizeof(coreboot_sig) - 1))
 126 +       if (alix_present(BIOS_SIGNATURE_TINYBIOS, tinybios_sig, sizeof(tinybios_sig) - 1) ||
 127 +           alix_present(BIOS_SIGNATURE_COREBOOT, coreboot_sig, sizeof(coreboot_sig) - 1) ||
 128 +           alix_present_dmi())
 129                 register_alix();
 130
 131         return 0;