aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-02-03 18:16:27 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-02-03 18:16:27 +0000
commit79a3fdb9da50f0cce32ecbcb9f564e83e38192d1 (patch)
treec63cf0d1be6012e97957b8ccc6d38e5d4d628c04 /target
parent25d605ab0ead3a5fcb98edd57f9b2352cfdf6c0c (diff)
downloadupstream-79a3fdb9da50f0cce32ecbcb9f564e83e38192d1.tar.gz
upstream-79a3fdb9da50f0cce32ecbcb9f564e83e38192d1.tar.bz2
upstream-79a3fdb9da50f0cce32ecbcb9f564e83e38192d1.zip
geos: backport driver from linux-next to 3.2 and 3.3 The Geos driver is in linux-next and will be out in 3.4. It builds fine against 3.2.2 and 3.3-rc2. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
SVN-Revision: 30022
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/patches-3.2/002-geos_platform.patch188
-rw-r--r--target/linux/x86/patches-3.3/002-geos_platform.patch188
2 files changed, 376 insertions, 0 deletions
diff --git a/target/linux/x86/patches-3.2/002-geos_platform.patch b/target/linux/x86/patches-3.2/002-geos_platform.patch
new file mode 100644
index 0000000000..cdb8dc2f14
--- /dev/null
+++ b/target/linux/x86/patches-3.2/002-geos_platform.patch
@@ -0,0 +1,188 @@
+From 31bc84d45320dad2392384381ad4d818ab21087a Mon Sep 17 00:00:00 2001
+From: "Philip A. Prindeville" <philipp@redfish-solutions.com>
+Date: Wed, 18 Jan 2012 11:15:33 -0700
+Subject: [PATCH 1/1] geos: Platform driver for Geos and Geos2 single-board
+ computers.
+
+Trivial platform driver for Traverse Technologies Geos and Geos2
+single-board computers. Uses SMBIOS to identify platform.
+Based on progressive revisions of the leds-net5501 driver that
+was rewritten by Ed Wildgoose as a platform driver.
+
+Supports GPIO-based LEDs (3) and 1 polled button which is
+typically used for a soft reset.
+
+Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
+Reviewed-by: Ed Wildgoose <ed@wildgooses.com>
+Acked-by: Andres Salomon <dilinger@queued.net>
+Cc: Richard Purdie <rpurdie@rpsys.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+---
+ arch/x86/Kconfig | 7 ++
+ arch/x86/platform/geode/Makefile | 1 +
+ arch/x86/platform/geode/geos.c | 128 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 136 insertions(+), 0 deletions(-)
+ create mode 100644 arch/x86/platform/geode/geos.c
+
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 07c3f15..4ee921b 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2168,6 +2168,13 @@ config ALIX
+
+ Note: You have to set alix.force=1 for boards with Award BIOS.
+
++config GEOS
++ bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
++ select GPIOLIB
++ depends on DMI
++ ---help---
++ This option enables system support for the Traverse Technologies GEOS.
++
+ endif # X86_32
+
+ config AMD_NB
+diff --git a/arch/x86/platform/geode/Makefile b/arch/x86/platform/geode/Makefile
+index 07c9cd0..d8ba564 100644
+--- a/arch/x86/platform/geode/Makefile
++++ b/arch/x86/platform/geode/Makefile
+@@ -1 +1,2 @@
+ obj-$(CONFIG_ALIX) += alix.o
++obj-$(CONFIG_GEOS) += geos.o
+diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
+new file mode 100644
+index 0000000..c2e6d53
+--- /dev/null
++++ b/arch/x86/platform/geode/geos.c
+@@ -0,0 +1,128 @@
++/*
++ * System Specific setup for Traverse Technologies GEOS.
++ * At the moment this means setup of GPIO control of LEDs.
++ *
++ * 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>
++ * In the future leds-net5501.c should be migrated over to platform
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2
++ * as published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/string.h>
++#include <linux/module.h>
++#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>
++
++static struct gpio_keys_button geos_gpio_buttons[] = {
++ {
++ .code = KEY_RESTART,
++ .gpio = 3,
++ .active_low = 1,
++ .desc = "Reset button",
++ .type = EV_KEY,
++ .wakeup = 0,
++ .debounce_interval = 100,
++ .can_disable = 0,
++ }
++};
++static struct gpio_keys_platform_data geos_buttons_data = {
++ .buttons = geos_gpio_buttons,
++ .nbuttons = ARRAY_SIZE(geos_gpio_buttons),
++ .poll_interval = 20,
++};
++
++static struct platform_device geos_buttons_dev = {
++ .name = "gpio-keys-polled",
++ .id = 1,
++ .dev = {
++ .platform_data = &geos_buttons_data,
++ }
++};
++
++static struct gpio_led geos_leds[] = {
++ {
++ .name = "geos:1",
++ .gpio = 6,
++ .default_trigger = "default-on",
++ .active_low = 1,
++ },
++ {
++ .name = "geos:2",
++ .gpio = 25,
++ .default_trigger = "default-off",
++ .active_low = 1,
++ },
++ {
++ .name = "geos:3",
++ .gpio = 27,
++ .default_trigger = "default-off",
++ .active_low = 1,
++ },
++};
++
++static struct gpio_led_platform_data geos_leds_data = {
++ .num_leds = ARRAY_SIZE(geos_leds),
++ .leds = geos_leds,
++};
++
++static struct platform_device geos_leds_dev = {
++ .name = "leds-gpio",
++ .id = -1,
++ .dev.platform_data = &geos_leds_data,
++};
++
++static struct __initdata platform_device *geos_devs[] = {
++ &geos_buttons_dev,
++ &geos_leds_dev,
++};
++
++static void __init register_geos(void)
++{
++ /* Setup LED control through leds-gpio driver */
++ platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
++}
++
++static int __init geos_init(void)
++{
++ const char *vendor, *product;
++
++ if (!is_geode())
++ return 0;
++
++ vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++ if (!vendor || strcmp(vendor, "Traverse Technologies"))
++ return 0;
++
++ product = dmi_get_system_info(DMI_PRODUCT_NAME);
++ if (!product || strcmp(product, "Geos"))
++ return 0;
++
++ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++ KBUILD_MODNAME, vendor, product);
++
++ register_geos();
++
++ return 0;
++}
++
++module_init(geos_init);
++
++MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");
++MODULE_DESCRIPTION("Traverse Technologies Geos System Setup");
++MODULE_LICENSE("GPL");
+--
+1.7.7.4
+
diff --git a/target/linux/x86/patches-3.3/002-geos_platform.patch b/target/linux/x86/patches-3.3/002-geos_platform.patch
new file mode 100644
index 0000000000..cdb8dc2f14
--- /dev/null
+++ b/target/linux/x86/patches-3.3/002-geos_platform.patch
@@ -0,0 +1,188 @@
+From 31bc84d45320dad2392384381ad4d818ab21087a Mon Sep 17 00:00:00 2001
+From: "Philip A. Prindeville" <philipp@redfish-solutions.com>
+Date: Wed, 18 Jan 2012 11:15:33 -0700
+Subject: [PATCH 1/1] geos: Platform driver for Geos and Geos2 single-board
+ computers.
+
+Trivial platform driver for Traverse Technologies Geos and Geos2
+single-board computers. Uses SMBIOS to identify platform.
+Based on progressive revisions of the leds-net5501 driver that
+was rewritten by Ed Wildgoose as a platform driver.
+
+Supports GPIO-based LEDs (3) and 1 polled button which is
+typically used for a soft reset.
+
+Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
+Reviewed-by: Ed Wildgoose <ed@wildgooses.com>
+Acked-by: Andres Salomon <dilinger@queued.net>
+Cc: Richard Purdie <rpurdie@rpsys.net>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+---
+ arch/x86/Kconfig | 7 ++
+ arch/x86/platform/geode/Makefile | 1 +
+ arch/x86/platform/geode/geos.c | 128 ++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 136 insertions(+), 0 deletions(-)
+ create mode 100644 arch/x86/platform/geode/geos.c
+
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 07c3f15..4ee921b 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -2168,6 +2168,13 @@ config ALIX
+
+ Note: You have to set alix.force=1 for boards with Award BIOS.
+
++config GEOS
++ bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
++ select GPIOLIB
++ depends on DMI
++ ---help---
++ This option enables system support for the Traverse Technologies GEOS.
++
+ endif # X86_32
+
+ config AMD_NB
+diff --git a/arch/x86/platform/geode/Makefile b/arch/x86/platform/geode/Makefile
+index 07c9cd0..d8ba564 100644
+--- a/arch/x86/platform/geode/Makefile
++++ b/arch/x86/platform/geode/Makefile
+@@ -1 +1,2 @@
+ obj-$(CONFIG_ALIX) += alix.o
++obj-$(CONFIG_GEOS) += geos.o
+diff --git a/arch/x86/platform/geode/geos.c b/arch/x86/platform/geode/geos.c
+new file mode 100644
+index 0000000..c2e6d53
+--- /dev/null
++++ b/arch/x86/platform/geode/geos.c
+@@ -0,0 +1,128 @@
++/*
++ * System Specific setup for Traverse Technologies GEOS.
++ * At the moment this means setup of GPIO control of LEDs.
++ *
++ * 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>
++ * In the future leds-net5501.c should be migrated over to platform
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2
++ * as published by the Free Software Foundation.
++ */
++
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/string.h>
++#include <linux/module.h>
++#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>
++
++static struct gpio_keys_button geos_gpio_buttons[] = {
++ {
++ .code = KEY_RESTART,
++ .gpio = 3,
++ .active_low = 1,
++ .desc = "Reset button",
++ .type = EV_KEY,
++ .wakeup = 0,
++ .debounce_interval = 100,
++ .can_disable = 0,
++ }
++};
++static struct gpio_keys_platform_data geos_buttons_data = {
++ .buttons = geos_gpio_buttons,
++ .nbuttons = ARRAY_SIZE(geos_gpio_buttons),
++ .poll_interval = 20,
++};
++
++static struct platform_device geos_buttons_dev = {
++ .name = "gpio-keys-polled",
++ .id = 1,
++ .dev = {
++ .platform_data = &geos_buttons_data,
++ }
++};
++
++static struct gpio_led geos_leds[] = {
++ {
++ .name = "geos:1",
++ .gpio = 6,
++ .default_trigger = "default-on",
++ .active_low = 1,
++ },
++ {
++ .name = "geos:2",
++ .gpio = 25,
++ .default_trigger = "default-off",
++ .active_low = 1,
++ },
++ {
++ .name = "geos:3",
++ .gpio = 27,
++ .default_trigger = "default-off",
++ .active_low = 1,
++ },
++};
++
++static struct gpio_led_platform_data geos_leds_data = {
++ .num_leds = ARRAY_SIZE(geos_leds),
++ .leds = geos_leds,
++};
++
++static struct platform_device geos_leds_dev = {
++ .name = "leds-gpio",
++ .id = -1,
++ .dev.platform_data = &geos_leds_data,
++};
++
++static struct __initdata platform_device *geos_devs[] = {
++ &geos_buttons_dev,
++ &geos_leds_dev,
++};
++
++static void __init register_geos(void)
++{
++ /* Setup LED control through leds-gpio driver */
++ platform_add_devices(geos_devs, ARRAY_SIZE(geos_devs));
++}
++
++static int __init geos_init(void)
++{
++ const char *vendor, *product;
++
++ if (!is_geode())
++ return 0;
++
++ vendor = dmi_get_system_info(DMI_SYS_VENDOR);
++ if (!vendor || strcmp(vendor, "Traverse Technologies"))
++ return 0;
++
++ product = dmi_get_system_info(DMI_PRODUCT_NAME);
++ if (!product || strcmp(product, "Geos"))
++ return 0;
++
++ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
++ KBUILD_MODNAME, vendor, product);
++
++ register_geos();
++
++ return 0;
++}
++
++module_init(geos_init);
++
++MODULE_AUTHOR("Philip Prindeville <philipp@redfish-solutions.com>");
++MODULE_DESCRIPTION("Traverse Technologies Geos System Setup");
++MODULE_LICENSE("GPL");
+--
+1.7.7.4
+