From 2d61e4c580f1652b21a24af70f5ae2d6a65de7a0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 25 Dec 2009 10:34:21 +0000 Subject: [PATCH] deduplicate kernel source files from 2.6.30-2.6.32 by moving them to generic files/ SVN-Revision: 18927 --- .../files-2.6.31/drivers/char/gpio_dev.c | 201 -------- .../drivers/input/misc/gpio_buttons.c | 209 -------- .../files-2.6.31/drivers/leds/ledtrig-morse.c | 365 -------------- .../drivers/leds/ledtrig-netdev.c | 451 ------------------ .../files-2.6.31/include/linux/glamo-engine.h | 27 -- .../files-2.6.31/include/linux/glamofb.h | 35 -- .../files-2.6.31/include/linux/gpio_buttons.h | 35 -- .../files-2.6.31/include/linux/gpio_dev.h | 11 - .../files-2.6.32/drivers/char/gpio_dev.c | 201 -------- .../drivers/input/misc/gpio_buttons.c | 209 -------- .../files-2.6.32/drivers/leds/ledtrig-morse.c | 365 -------------- .../drivers/leds/ledtrig-netdev.c | 451 ------------------ .../files-2.6.32/include/linux/glamo-engine.h | 27 -- .../files-2.6.32/include/linux/glamofb.h | 35 -- .../files-2.6.32/include/linux/gpio_buttons.h | 35 -- .../files-2.6.32/include/linux/gpio_dev.h | 11 - .../drivers/char/gpio_dev.c | 0 .../drivers/input/misc/gpio_buttons.c | 0 .../drivers/leds/ledtrig-morse.c | 0 .../drivers/leds/ledtrig-netdev.c | 0 .../include/linux/glamo-engine.h | 0 .../include/linux/glamofb.h | 0 .../include/linux/gpio_buttons.h | 0 .../include/linux/gpio_dev.h | 0 24 files changed, 2668 deletions(-) delete mode 100644 target/linux/generic-2.6/files-2.6.31/drivers/char/gpio_dev.c delete mode 100644 target/linux/generic-2.6/files-2.6.31/drivers/input/misc/gpio_buttons.c delete mode 100644 target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-morse.c delete mode 100644 target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c delete mode 100644 target/linux/generic-2.6/files-2.6.31/include/linux/glamo-engine.h delete mode 100644 target/linux/generic-2.6/files-2.6.31/include/linux/glamofb.h delete mode 100644 target/linux/generic-2.6/files-2.6.31/include/linux/gpio_buttons.h delete mode 100644 target/linux/generic-2.6/files-2.6.31/include/linux/gpio_dev.h delete mode 100644 target/linux/generic-2.6/files-2.6.32/drivers/char/gpio_dev.c delete mode 100644 target/linux/generic-2.6/files-2.6.32/drivers/input/misc/gpio_buttons.c delete mode 100644 target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-morse.c delete mode 100644 target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c delete mode 100644 target/linux/generic-2.6/files-2.6.32/include/linux/glamo-engine.h delete mode 100644 target/linux/generic-2.6/files-2.6.32/include/linux/glamofb.h delete mode 100644 target/linux/generic-2.6/files-2.6.32/include/linux/gpio_buttons.h delete mode 100644 target/linux/generic-2.6/files-2.6.32/include/linux/gpio_dev.h rename target/linux/generic-2.6/{files-2.6.30 => files}/drivers/char/gpio_dev.c (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/drivers/input/misc/gpio_buttons.c (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/drivers/leds/ledtrig-morse.c (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/drivers/leds/ledtrig-netdev.c (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/include/linux/glamo-engine.h (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/include/linux/glamofb.h (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/include/linux/gpio_buttons.h (100%) rename target/linux/generic-2.6/{files-2.6.30 => files}/include/linux/gpio_dev.h (100%) diff --git a/target/linux/generic-2.6/files-2.6.31/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.31/drivers/char/gpio_dev.c deleted file mode 100644 index 8392fcf2d6..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/drivers/char/gpio_dev.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - * character device wrapper for generic gpio layer - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA - * - * Feedback, Bugs... blogic@openwrt.org - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define DRVNAME "gpiodev" -#define DEVNAME "gpio" - -static int dev_major; -static unsigned int gpio_access_mask; -static struct class *gpiodev_class; - -/* Counter is 1, if the device is not opened and zero (or less) if opened. */ -static atomic_t gpio_open_cnt = ATOMIC_INIT(1); - -static int -gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg) -{ - int retval = 0; - - if (((1 << arg) & gpio_access_mask) != (1 << arg)) - { - retval = -EINVAL; - goto out; - } - - switch (cmd) - { - case GPIO_GET: - retval = gpio_get_value(arg); - break; - - case GPIO_SET: - gpio_set_value(arg, 1); - break; - - case GPIO_CLEAR: - gpio_set_value(arg, 0); - break; - - case GPIO_DIR_IN: - gpio_direction_input(arg); - break; - - case GPIO_DIR_OUT: - gpio_direction_output(arg, 0); - break; - - default: - retval = -EINVAL; - break; - } - -out: - return retval; -} - -static int -gpio_open(struct inode *inode, struct file *file) -{ - int result = 0; - unsigned int dev_minor = MINOR(inode->i_rdev); - - if (dev_minor != 0) - { - printk(KERN_ERR DRVNAME ": trying to access unknown minor device -> %d\n", dev_minor); - result = -ENODEV; - goto out; - } - - /* FIXME: We should really allow multiple applications to open the device - * at the same time, as long as the apps access different IO pins. - * The generic gpio-registration functions can be used for that. - * Two new IOCTLs have to be introduced for that. Need to check userspace - * compatibility first. --mb */ - if (!atomic_dec_and_test(&gpio_open_cnt)) { - atomic_inc(&gpio_open_cnt); - printk(KERN_ERR DRVNAME ": Device with minor ID %d already in use\n", dev_minor); - result = -EBUSY; - goto out; - } - -out: - return result; -} - -static int -gpio_close(struct inode * inode, struct file * file) -{ - smp_mb__before_atomic_inc(); - atomic_inc(&gpio_open_cnt); - - return 0; -} - -struct file_operations gpio_fops = { - ioctl: gpio_ioctl, - open: gpio_open, - release: gpio_close -}; - -static int -gpio_probe(struct platform_device *dev) -{ - int result = 0; - - dev_major = register_chrdev(0, DEVNAME, &gpio_fops); - if (!dev_major) - { - printk(KERN_ERR DRVNAME ": Error whilst opening %s \n", DEVNAME); - result = -ENODEV; - goto out; - } - - gpiodev_class = class_create(THIS_MODULE, DRVNAME); - device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME); - - printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major); - - if (dev->num_resources != 1) - { - printk(KERN_ERR DRVNAME ": device may only have 1 resource\n"); - result = -ENODEV; - goto out; - } - - gpio_access_mask = dev->resource[0].start; - - printk(KERN_INFO DRVNAME ": gpio platform device registered with access mask %08X\n", gpio_access_mask); -out: - return result; -} - -static int -gpio_remove(struct platform_device *dev) -{ - unregister_chrdev(dev_major, DEVNAME); - return 0; -} - -static struct -platform_driver gpio_driver = { - .probe = gpio_probe, - .remove = gpio_remove, - .driver = { - .name = "GPIODEV", - .owner = THIS_MODULE, - }, -}; - -static int __init -gpio_mod_init(void) -{ - int ret = platform_driver_register(&gpio_driver); - if (ret) - printk(KERN_INFO DRVNAME ": Error registering platfom driver!"); - - return ret; -} - -static void __exit -gpio_mod_exit(void) -{ - platform_driver_unregister(&gpio_driver); -} - -module_init (gpio_mod_init); -module_exit (gpio_mod_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("John Crispin / OpenWrt"); -MODULE_DESCRIPTION("Character device for for generic gpio api"); diff --git a/target/linux/generic-2.6/files-2.6.31/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files-2.6.31/drivers/input/misc/gpio_buttons.c deleted file mode 100644 index 83a8178340..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/drivers/input/misc/gpio_buttons.c +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Driver for buttons on GPIO lines not capable of generating interrupts - * - * Copyright (C) 2007,2008 Gabor Juhos - * - * This file was based on: /drivers/input/misc/cobalt_btns.c - * Copyright (C) 2007 Yoichi Yuasa - * - * also was based on: /drivers/input/keyboard/gpio_keys.c - * Copyright 2005 Phil Blundell - * - * 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 -#include -#include - -#include -#include -#include -#include - -#include - -#include - -#define DRV_NAME "gpio-buttons" -#define DRV_VERSION "0.1.1" -#define PFX DRV_NAME ": " - -struct gpio_buttons_dev { - struct input_polled_dev *poll_dev; - struct gpio_buttons_platform_data *pdata; -}; - -static void gpio_buttons_poll(struct input_polled_dev *dev) -{ - struct gpio_buttons_dev *bdev = dev->private; - struct gpio_buttons_platform_data *pdata = bdev->pdata; - struct input_dev *input = dev->input; - int i; - - for (i = 0; i < bdev->pdata->nbuttons; i++) { - struct gpio_button *button = &pdata->buttons[i]; - unsigned int type = button->type ?: EV_KEY; - int state; - - state = gpio_get_value(button->gpio) ? 1 : 0; - state ^= button->active_low; - - if (state) { - button->count++; - } else { - if (button->count >= button->threshold) { - input_event(input, type, button->code, 1); - input_sync(input); - } - button->count = 0; - } - - if (button->count == button->threshold) { - input_event(input, type, button->code, 0); - input_sync(input); - } - } -} - -static int __devinit gpio_buttons_probe(struct platform_device *pdev) -{ - struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data; - struct gpio_buttons_dev *bdev; - struct input_polled_dev *poll_dev; - struct input_dev *input; - int error, i; - - - if (!pdata) - return -ENXIO; - - bdev = kzalloc(sizeof(*bdev), GFP_KERNEL); - if (!bdev) { - printk(KERN_ERR DRV_NAME "no memory for device\n"); - return -ENOMEM; - } - - poll_dev = input_allocate_polled_device(); - if (!poll_dev) { - printk(KERN_ERR DRV_NAME "no memory for polled device\n"); - error = -ENOMEM; - goto err_free_bdev; - } - - poll_dev->private = bdev; - poll_dev->poll = gpio_buttons_poll; - poll_dev->poll_interval = pdata->poll_interval; - - input = poll_dev->input; - - input->evbit[0] = BIT(EV_KEY); - input->name = pdev->name; - input->phys = "gpio-buttons/input0"; - input->dev.parent = &pdev->dev; - - input->id.bustype = BUS_HOST; - input->id.vendor = 0x0001; - input->id.product = 0x0001; - input->id.version = 0x0100; - - for (i = 0; i < pdata->nbuttons; i++) { - struct gpio_button *button = &pdata->buttons[i]; - unsigned int gpio = button->gpio; - unsigned int type = button->type ?: EV_KEY; - - error = gpio_request(gpio, button->desc ? - button->desc : DRV_NAME); - if (error) { - printk(KERN_ERR PFX "unable to claim gpio %u, " - "error %d\n", gpio, error); - goto err_free_gpio; - } - - error = gpio_direction_input(gpio); - if (error) { - printk(KERN_ERR PFX "unable to set direction on " - "gpio %u, error %d\n", gpio, error); - goto err_free_gpio; - } - - input_set_capability(input, type, button->code); - button->count = 0; - } - - bdev->poll_dev = poll_dev; - bdev->pdata = pdata; - platform_set_drvdata(pdev, bdev); - - error = input_register_polled_device(poll_dev); - if (error) { - printk(KERN_ERR PFX "unable to register polled device, " - "error %d\n", error); - goto err_free_gpio; - } - - return 0; - -err_free_gpio: - for (i = i - 1; i >= 0; i--) - gpio_free(pdata->buttons[i].gpio); - - input_free_polled_device(poll_dev); - -err_free_bdev: - kfree(bdev); - - platform_set_drvdata(pdev, NULL); - return error; -} - -static int __devexit gpio_buttons_remove(struct platform_device *pdev) -{ - struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev); - struct gpio_buttons_platform_data *pdata = bdev->pdata; - int i; - - input_unregister_polled_device(bdev->poll_dev); - - for (i = 0; i < pdata->nbuttons; i++) - gpio_free(pdata->buttons[i].gpio); - - input_free_polled_device(bdev->poll_dev); - - kfree(bdev); - platform_set_drvdata(pdev, NULL); - - return 0; -} - -static struct platform_driver gpio_buttons_driver = { - .probe = gpio_buttons_probe, - .remove = __devexit_p(gpio_buttons_remove), - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - }, -}; - -static int __init gpio_buttons_init(void) -{ - printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n"); - return platform_driver_register(&gpio_buttons_driver); -} - -static void __exit gpio_buttons_exit(void) -{ - platform_driver_unregister(&gpio_buttons_driver); -} - -module_init(gpio_buttons_init); -module_exit(gpio_buttons_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Gabor Juhos "); -MODULE_VERSION(DRV_VERSION); -MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs"); - diff --git a/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-morse.c deleted file mode 100644 index cb47480a36..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-morse.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * LED Morse Trigger - * - * Copyright (C) 2007 Gabor Juhos - * - * This file was based on: drivers/led/ledtrig-timer.c - * Copyright 2005-2006 Openedhand Ltd. - * Author: Richard Purdie - * - * also based on the patch '[PATCH] 2.5.59 morse code panics' posted - * in the LKML by Tomas Szepe at Thu, 30 Jan 2003 - * Copyright (C) 2002 Andrew Rodland - * Copyright (C) 2003 Tomas Szepe - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "leds.h" - -#define MORSE_DELAY_BASE (HZ/2) - -#define MORSE_STATE_BLINK_START 0 -#define MORSE_STATE_BLINK_STOP 1 - -#define MORSE_DIT_LEN 1 -#define MORSE_DAH_LEN 3 -#define MORSE_SPACE_LEN 7 - -struct morse_trig_data { - unsigned long delay; - char *msg; - - unsigned char morse; - unsigned char state; - char *msgpos; - struct timer_list timer; -}; - -const unsigned char morsetable[] = { - 0122, 0, 0310, 0, 0, 0163, /* "#$%&' */ - 055, 0155, 0, 0, 0163, 0141, 0152, 0051, /* ()*+,-./ */ - 077, 076, 074, 070, 060, 040, 041, 043, 047, 057, /* 0-9 */ - 0107, 0125, 0, 0061, 0, 0114, 0, /* :;<=>?@ */ - 006, 021, 025, 011, 002, 024, 013, 020, 004, /* A-I */ - 036, 015, 022, 007, 005, 017, 026, 033, 012, /* J-R */ - 010, 003, 014, 030, 016, 031, 035, 023, /* S-Z */ - 0, 0, 0, 0, 0154 /* [\]^_ */ -}; - -static inline unsigned char tomorse(char c) { - if (c >= 'a' && c <= 'z') - c = c - 'a' + 'A'; - if (c >= '"' && c <= '_') { - return morsetable[c - '"']; - } else - return 0; -} - -static inline unsigned long dit_len(struct morse_trig_data *morse_data) -{ - return MORSE_DIT_LEN*morse_data->delay; -} - -static inline unsigned long dah_len(struct morse_trig_data *morse_data) -{ - return MORSE_DAH_LEN*morse_data->delay; -} - -static inline unsigned long space_len(struct morse_trig_data *morse_data) -{ - return MORSE_SPACE_LEN*morse_data->delay; -} - -static void morse_timer_function(unsigned long data) -{ - struct led_classdev *led_cdev = (struct led_classdev *)data; - struct morse_trig_data *morse_data = led_cdev->trigger_data; - unsigned long brightness = LED_OFF; - unsigned long delay = 0; - - if (!morse_data->msg) - goto set_led; - - switch (morse_data->state) { - case MORSE_STATE_BLINK_START: - /* Starting a new blink. We have a valid code in morse. */ - delay = (morse_data->morse & 001) ? dah_len(morse_data): - dit_len(morse_data); - brightness = LED_FULL; - morse_data->state = MORSE_STATE_BLINK_STOP; - morse_data->morse >>= 1; - break; - case MORSE_STATE_BLINK_STOP: - /* Coming off of a blink. */ - morse_data->state = MORSE_STATE_BLINK_START; - - if (morse_data->morse > 1) { - /* Not done yet, just a one-dit pause. */ - delay = dit_len(morse_data); - break; - } - - /* Get a new char, figure out how much space. */ - /* First time through */ - if (!morse_data->msgpos) - morse_data->msgpos = (char *)morse_data->msg; - - if (!*morse_data->msgpos) { - /* Repeating */ - morse_data->msgpos = (char *)morse_data->msg; - delay = space_len(morse_data); - } else { - /* Inter-letter space */ - delay = dah_len(morse_data); - } - - if (!(morse_data->morse = tomorse(*morse_data->msgpos))) { - delay = space_len(morse_data); - /* And get us back here */ - morse_data->state = MORSE_STATE_BLINK_STOP; - } - morse_data->msgpos++; - break; - } - - mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay)); - -set_led: - led_set_brightness(led_cdev, brightness); -} - -static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - sprintf(buf, "%lu\n", morse_data->delay); - - return strlen(buf) + 1; -} - -static ssize_t _morse_delay_store(struct led_classdev *led_cdev, - const char *buf, size_t size) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - char *after; - unsigned long state = simple_strtoul(buf, &after, 10); - size_t count = after - buf; - int ret = -EINVAL; - - if (*after && isspace(*after)) - count++; - - if (count == size) { - morse_data->delay = state; - mod_timer(&morse_data->timer, jiffies + 1); - ret = count; - } - - return ret; -} - -static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - if (!morse_data->msg) - sprintf(buf, "\n"); - else - sprintf(buf, "%s\n", morse_data->msg); - - return strlen(buf) + 1; -} - -static ssize_t _morse_msg_store(struct led_classdev *led_cdev, - const char *buf, size_t size) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - char *m; - - m = kmalloc(size, GFP_KERNEL); - if (!m) - return -ENOMEM; - - memcpy(m,buf,size); - m[size]='\0'; - - if (morse_data->msg) - kfree(morse_data->msg); - - morse_data->msg = m; - morse_data->msgpos = NULL; - morse_data->state = MORSE_STATE_BLINK_STOP; - - mod_timer(&morse_data->timer, jiffies + 1); - - return size; -} - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) -static ssize_t morse_delay_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_delay_show(led_cdev, buf); -} - -static ssize_t morse_delay_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_delay_store(led_cdev, buf, size); -} - -static ssize_t morse_msg_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_msg_show(led_cdev, buf); -} - -static ssize_t morse_msg_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_msg_store(led_cdev, buf, size); -} - -static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store); -static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store); - -#define led_device_create_file(leddev, attr) \ - device_create_file(leddev->dev, &dev_attr_ ## attr) -#define led_device_remove_file(leddev, attr) \ - device_remove_file(leddev->dev, &dev_attr_ ## attr) - -#else -static ssize_t morse_delay_show(struct class_device *dev, char *buf) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_delay_show(led_cdev, buf); -} - -static ssize_t morse_delay_store(struct class_device *dev, const char *buf, - size_t size) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_delay_store(led_cdev, buf, size); -} - -static ssize_t morse_msg_show(struct class_device *dev, char *buf) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_msg_show(led_cdev, buf); -} - -static ssize_t morse_msg_store(struct class_device *dev, const char *buf, - size_t size) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_msg_store(led_cdev, buf, size); -} - -static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store); -static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store); - -#define led_device_create_file(leddev, attr) \ - class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr) -#define led_device_remove_file(leddev, attr) \ - class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr) - -#endif - -static void morse_trig_activate(struct led_classdev *led_cdev) -{ - struct morse_trig_data *morse_data; - int rc; - - morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL); - if (!morse_data) - return; - - morse_data->delay = MORSE_DELAY_BASE; - init_timer(&morse_data->timer); - morse_data->timer.function = morse_timer_function; - morse_data->timer.data = (unsigned long)led_cdev; - - rc = led_device_create_file(led_cdev, delay); - if (rc) goto err; - - rc = led_device_create_file(led_cdev, message); - if (rc) goto err_delay; - - led_cdev->trigger_data = morse_data; - - return; - -err_delay: - led_device_remove_file(led_cdev, delay); -err: - kfree(morse_data); -} - -static void morse_trig_deactivate(struct led_classdev *led_cdev) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - if (!morse_data) - return; - - led_device_remove_file(led_cdev, message); - led_device_remove_file(led_cdev, delay); - - del_timer_sync(&morse_data->timer); - if (morse_data->msg) - kfree(morse_data->msg); - - kfree(morse_data); -} - -static struct led_trigger morse_led_trigger = { - .name = "morse", - .activate = morse_trig_activate, - .deactivate = morse_trig_deactivate, -}; - -static int __init morse_trig_init(void) -{ - return led_trigger_register(&morse_led_trigger); -} - -static void __exit morse_trig_exit(void) -{ - led_trigger_unregister(&morse_led_trigger); -} - -module_init(morse_trig_init); -module_exit(morse_trig_exit); - -MODULE_AUTHOR("Gabor Juhos "); -MODULE_DESCRIPTION("Morse LED trigger"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c deleted file mode 100644 index 8dba8e654d..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/drivers/leds/ledtrig-netdev.c +++ /dev/null @@ -1,451 +0,0 @@ -/* - * LED Kernel Netdev Trigger - * - * Toggles the LED to reflect the link and traffic state of a named net device - * - * Copyright 2007 Oliver Jowett - * - * Derived from ledtrig-timer.c which is: - * Copyright 2005-2006 Openedhand Ltd. - * Author: Richard Purdie - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -#include -#endif - -#include "leds.h" - -/* - * Configurable sysfs attributes: - * - * device_name - network device name to monitor - * - * interval - duration of LED blink, in milliseconds - * - * mode - either "none" (LED is off) or a space separated list of one or more of: - * link: LED's normal state reflects whether the link is up (has carrier) or not - * tx: LED blinks on transmitted data - * rx: LED blinks on receive data - * - * Some suggestions: - * - * Simple link status LED: - * $ echo netdev >someled/trigger - * $ echo eth0 >someled/device_name - * $ echo link >someled/mode - * - * Ethernet-style link/activity LED: - * $ echo netdev >someled/trigger - * $ echo eth0 >someled/device_name - * $ echo "link tx rx" >someled/mode - * - * Modem-style tx/rx LEDs: - * $ echo netdev >led1/trigger - * $ echo ppp0 >led1/device_name - * $ echo tx >led1/mode - * $ echo netdev >led2/trigger - * $ echo ppp0 >led2/device_name - * $ echo rx >led2/mode - * - */ - -#define MODE_LINK 1 -#define MODE_TX 2 -#define MODE_RX 4 - -struct led_netdev_data { - rwlock_t lock; - - struct timer_list timer; - struct notifier_block notifier; - - struct led_classdev *led_cdev; - struct net_device *net_dev; - - char device_name[IFNAMSIZ]; - unsigned interval; - unsigned mode; - unsigned link_up; - unsigned last_activity; -}; - -static void set_baseline_state(struct led_netdev_data *trigger_data) -{ - if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) - led_set_brightness(trigger_data->led_cdev, LED_FULL); - else - led_set_brightness(trigger_data->led_cdev, LED_OFF); - - if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up) - mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); - else - del_timer(&trigger_data->timer); -} - -static ssize_t led_device_name_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - sprintf(buf, "%s\n", trigger_data->device_name); - read_unlock(&trigger_data->lock); - - return strlen(buf) + 1; -} - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) -extern struct net init_net; -#endif - -static ssize_t led_device_name_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - if (size < 0 || size >= IFNAMSIZ) - return -EINVAL; - - write_lock(&trigger_data->lock); - - strcpy(trigger_data->device_name, buf); - if (size > 0 && trigger_data->device_name[size-1] == '\n') - trigger_data->device_name[size-1] = 0; - - if (trigger_data->device_name[0] != 0) { - /* check for existing device to update from */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name); -#else - trigger_data->net_dev = dev_get_by_name(trigger_data->device_name); -#endif - if (trigger_data->net_dev != NULL) - trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0; - set_baseline_state(trigger_data); /* updates LEDs, may start timers */ - } - - write_unlock(&trigger_data->lock); - return size; -} - -static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store); - -static ssize_t led_mode_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - - if (trigger_data->mode == 0) { - strcpy(buf, "none\n"); - } else { - if (trigger_data->mode & MODE_LINK) - strcat(buf, "link "); - if (trigger_data->mode & MODE_TX) - strcat(buf, "tx "); - if (trigger_data->mode & MODE_RX) - strcat(buf, "rx "); - strcat(buf, "\n"); - } - - read_unlock(&trigger_data->lock); - - return strlen(buf)+1; -} - -static ssize_t led_mode_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - char copybuf[1024]; - int new_mode = -1; - char *p, *token; - - /* take a copy since we don't want to trash the inbound buffer when using strsep */ - strncpy(copybuf, buf, sizeof(copybuf)); - copybuf[1023] = 0; - p = copybuf; - - while ((token = strsep(&p, " \t\n")) != NULL) { - if (!*token) - continue; - - if (new_mode == -1) - new_mode = 0; - - if (!strcmp(token, "none")) - new_mode = 0; - else if (!strcmp(token, "tx")) - new_mode |= MODE_TX; - else if (!strcmp(token, "rx")) - new_mode |= MODE_RX; - else if (!strcmp(token, "link")) - new_mode |= MODE_LINK; - else - return -EINVAL; - } - - if (new_mode == -1) - return -EINVAL; - - write_lock(&trigger_data->lock); - trigger_data->mode = new_mode; - set_baseline_state(trigger_data); - write_unlock(&trigger_data->lock); - - return size; -} - -static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store); - -static ssize_t led_interval_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval)); - read_unlock(&trigger_data->lock); - - return strlen(buf) + 1; -} - -static ssize_t led_interval_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - int ret = -EINVAL; - char *after; - unsigned long value = simple_strtoul(buf, &after, 10); - size_t count = after - buf; - - if (*after && isspace(*after)) - count++; - - /* impose some basic bounds on the timer interval */ - if (count == size && value >= 5 && value <= 10000) { - write_lock(&trigger_data->lock); - trigger_data->interval = msecs_to_jiffies(value); - set_baseline_state(trigger_data); // resets timer - write_unlock(&trigger_data->lock); - ret = count; - } - - return ret; -} - -static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store); - -static int netdev_trig_notify(struct notifier_block *nb, - unsigned long evt, - void *dv) -{ - struct net_device *dev = dv; - struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier); - - if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) - return NOTIFY_DONE; - - write_lock(&trigger_data->lock); - - if (strcmp(dev->name, trigger_data->device_name)) - goto done; - - if (evt == NETDEV_REGISTER) { - if (trigger_data->net_dev != NULL) - dev_put(trigger_data->net_dev); - dev_hold(dev); - trigger_data->net_dev = dev; - trigger_data->link_up = 0; - goto done; - } - - if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) { - dev_put(trigger_data->net_dev); - trigger_data->net_dev = NULL; - goto done; - } - - /* UP / DOWN / CHANGE */ - - trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev)); - set_baseline_state(trigger_data); - -done: - write_unlock(&trigger_data->lock); - return NOTIFY_DONE; -} - -/* here's the real work! */ -static void netdev_trig_timer(unsigned long arg) -{ - struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; - const struct net_device_stats *dev_stats; - unsigned new_activity; - - write_lock(&trigger_data->lock); - - if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) { - /* we don't need to do timer work, just reflect link state. */ - led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); - goto no_restart; - } - - dev_stats = dev_get_stats(trigger_data->net_dev); - new_activity = - ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + - ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); - - if (trigger_data->mode & MODE_LINK) { - /* base state is ON (link present) */ - /* if there's no link, we don't get this far and the LED is off */ - - /* OFF -> ON always */ - /* ON -> OFF on activity */ - if (trigger_data->led_cdev->brightness == LED_OFF) { - led_set_brightness(trigger_data->led_cdev, LED_FULL); - } else if (trigger_data->last_activity != new_activity) { - led_set_brightness(trigger_data->led_cdev, LED_OFF); - } - } else { - /* base state is OFF */ - /* ON -> OFF always */ - /* OFF -> ON on activity */ - if (trigger_data->led_cdev->brightness == LED_FULL) { - led_set_brightness(trigger_data->led_cdev, LED_OFF); - } else if (trigger_data->last_activity != new_activity) { - led_set_brightness(trigger_data->led_cdev, LED_FULL); - } - } - - trigger_data->last_activity = new_activity; - mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); - -no_restart: - write_unlock(&trigger_data->lock); -} - -static void netdev_trig_activate(struct led_classdev *led_cdev) -{ - struct led_netdev_data *trigger_data; - int rc; - - trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL); - if (!trigger_data) - return; - - rwlock_init(&trigger_data->lock); - - trigger_data->notifier.notifier_call = netdev_trig_notify; - trigger_data->notifier.priority = 10; - - setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data); - - trigger_data->led_cdev = led_cdev; - trigger_data->net_dev = NULL; - trigger_data->device_name[0] = 0; - - trigger_data->mode = 0; - trigger_data->interval = msecs_to_jiffies(50); - trigger_data->link_up = 0; - trigger_data->last_activity = 0; - - led_cdev->trigger_data = trigger_data; - - rc = device_create_file(led_cdev->dev, &dev_attr_device_name); - if (rc) - goto err_out; - rc = device_create_file(led_cdev->dev, &dev_attr_mode); - if (rc) - goto err_out_device_name; - rc = device_create_file(led_cdev->dev, &dev_attr_interval); - if (rc) - goto err_out_mode; - - register_netdevice_notifier(&trigger_data->notifier); - return; - -err_out_mode: - device_remove_file(led_cdev->dev, &dev_attr_mode); -err_out_device_name: - device_remove_file(led_cdev->dev, &dev_attr_device_name); -err_out: - led_cdev->trigger_data = NULL; - kfree(trigger_data); -} - -static void netdev_trig_deactivate(struct led_classdev *led_cdev) -{ - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - if (trigger_data) { - unregister_netdevice_notifier(&trigger_data->notifier); - - device_remove_file(led_cdev->dev, &dev_attr_device_name); - device_remove_file(led_cdev->dev, &dev_attr_mode); - device_remove_file(led_cdev->dev, &dev_attr_interval); - - write_lock(&trigger_data->lock); - - if (trigger_data->net_dev) { - dev_put(trigger_data->net_dev); - trigger_data->net_dev = NULL; - } - - write_unlock(&trigger_data->lock); - - del_timer_sync(&trigger_data->timer); - - kfree(trigger_data); - } -} - -static struct led_trigger netdev_led_trigger = { - .name = "netdev", - .activate = netdev_trig_activate, - .deactivate = netdev_trig_deactivate, -}; - -static int __init netdev_trig_init(void) -{ - return led_trigger_register(&netdev_led_trigger); -} - -static void __exit netdev_trig_exit(void) -{ - led_trigger_unregister(&netdev_led_trigger); -} - -module_init(netdev_trig_init); -module_exit(netdev_trig_exit); - -MODULE_AUTHOR("Oliver Jowett "); -MODULE_DESCRIPTION("Netdev LED trigger"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/generic-2.6/files-2.6.31/include/linux/glamo-engine.h b/target/linux/generic-2.6/files-2.6.31/include/linux/glamo-engine.h deleted file mode 100644 index 516d45fa6e..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/include/linux/glamo-engine.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __GLAMO_ENGINE_H -#define __GLAMO_ENGINE_H - -enum glamo_engine { - GLAMO_ENGINE_CAPTURE = 0, - GLAMO_ENGINE_ISP = 1, - GLAMO_ENGINE_JPEG = 2, - GLAMO_ENGINE_MPEG_ENC = 3, - GLAMO_ENGINE_MPEG_DEC = 4, - GLAMO_ENGINE_LCD = 5, - GLAMO_ENGINE_CMDQ = 6, - GLAMO_ENGINE_2D = 7, - GLAMO_ENGINE_3D = 8, - GLAMO_ENGINE_MMC = 9, - GLAMO_ENGINE_MICROP0 = 10, - GLAMO_ENGINE_RISC = 11, - GLAMO_ENGINE_MICROP1_MPEG_ENC = 12, - GLAMO_ENGINE_MICROP1_MPEG_DEC = 13, -#if 0 - GLAMO_ENGINE_H264_DEC = 14, - GLAMO_ENGINE_RISC1 = 15, - GLAMO_ENGINE_SPI = 16, -#endif - __NUM_GLAMO_ENGINES -}; - -#endif diff --git a/target/linux/generic-2.6/files-2.6.31/include/linux/glamofb.h b/target/linux/generic-2.6/files-2.6.31/include/linux/glamofb.h deleted file mode 100644 index 5f9fab5a48..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/include/linux/glamofb.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _LINUX_GLAMOFB_H -#define _LINUX_GLAMOFB_H - -#include - -#ifdef __KERNEL__ - -struct glamo_core; -struct glamofb_handle; - -struct glamo_fb_platform_data { - int width, height; - - int num_modes; - struct fb_videomode *modes; - - struct glamo_core *core; -}; - -int glamofb_cmd_mode(struct glamofb_handle *gfb, int on); -int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val); - -#ifdef CONFIG_MFD_GLAMO -void glamo_lcm_reset(struct platform_device *pdev, int level); -#else -#define glamo_lcm_reset(...) do {} while (0) -#endif - -#endif - -#define GLAMOFB_ENGINE_ENABLE _IOW('F', 0x1, __u32) -#define GLAMOFB_ENGINE_DISABLE _IOW('F', 0x2, __u32) -#define GLAMOFB_ENGINE_RESET _IOW('F', 0x3, __u32) - -#endif diff --git a/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_buttons.h b/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_buttons.h deleted file mode 100644 index f5e6297258..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_buttons.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Definitions for the GPIO buttons interface driver - * - * Copyright (C) 2007,2008 Gabor Juhos - * - * This file was based on: /include/linux/gpio_keys.h - * The original gpio_keys.h seems not to have a license. - * - * 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. - * - */ - -#ifndef _GPIO_BUTTONS_H_ -#define _GPIO_BUTTONS_H_ - -struct gpio_button { - int gpio; /* GPIO line number */ - int active_low; - char *desc; /* button description */ - int type; /* input event type (EV_KEY, EV_SW) */ - int code; /* input event code (KEY_*, SW_*) */ - int count; - int threshold; /* count threshold */ -}; - -struct gpio_buttons_platform_data { - struct gpio_button *buttons; - int nbuttons; /* number of buttons */ - int poll_interval; /* polling interval */ -}; - -#endif /* _GPIO_BUTTONS_H_ */ - diff --git a/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_dev.h b/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_dev.h deleted file mode 100644 index 3f3c9c772c..0000000000 --- a/target/linux/generic-2.6/files-2.6.31/include/linux/gpio_dev.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _GPIODEV_H__ -#define _GPIODEV_H__ - -#define IOC_GPIODEV_MAGIC 'B' -#define GPIO_GET _IO(IOC_GPIODEV_MAGIC, 10) -#define GPIO_SET _IO(IOC_GPIODEV_MAGIC, 11) -#define GPIO_CLEAR _IO(IOC_GPIODEV_MAGIC, 12) -#define GPIO_DIR_IN _IO(IOC_GPIODEV_MAGIC, 13) -#define GPIO_DIR_OUT _IO(IOC_GPIODEV_MAGIC, 14) - -#endif diff --git a/target/linux/generic-2.6/files-2.6.32/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.32/drivers/char/gpio_dev.c deleted file mode 100644 index 8392fcf2d6..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/drivers/char/gpio_dev.c +++ /dev/null @@ -1,201 +0,0 @@ -/* - * character device wrapper for generic gpio layer - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA - * - * Feedback, Bugs... blogic@openwrt.org - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define DRVNAME "gpiodev" -#define DEVNAME "gpio" - -static int dev_major; -static unsigned int gpio_access_mask; -static struct class *gpiodev_class; - -/* Counter is 1, if the device is not opened and zero (or less) if opened. */ -static atomic_t gpio_open_cnt = ATOMIC_INIT(1); - -static int -gpio_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg) -{ - int retval = 0; - - if (((1 << arg) & gpio_access_mask) != (1 << arg)) - { - retval = -EINVAL; - goto out; - } - - switch (cmd) - { - case GPIO_GET: - retval = gpio_get_value(arg); - break; - - case GPIO_SET: - gpio_set_value(arg, 1); - break; - - case GPIO_CLEAR: - gpio_set_value(arg, 0); - break; - - case GPIO_DIR_IN: - gpio_direction_input(arg); - break; - - case GPIO_DIR_OUT: - gpio_direction_output(arg, 0); - break; - - default: - retval = -EINVAL; - break; - } - -out: - return retval; -} - -static int -gpio_open(struct inode *inode, struct file *file) -{ - int result = 0; - unsigned int dev_minor = MINOR(inode->i_rdev); - - if (dev_minor != 0) - { - printk(KERN_ERR DRVNAME ": trying to access unknown minor device -> %d\n", dev_minor); - result = -ENODEV; - goto out; - } - - /* FIXME: We should really allow multiple applications to open the device - * at the same time, as long as the apps access different IO pins. - * The generic gpio-registration functions can be used for that. - * Two new IOCTLs have to be introduced for that. Need to check userspace - * compatibility first. --mb */ - if (!atomic_dec_and_test(&gpio_open_cnt)) { - atomic_inc(&gpio_open_cnt); - printk(KERN_ERR DRVNAME ": Device with minor ID %d already in use\n", dev_minor); - result = -EBUSY; - goto out; - } - -out: - return result; -} - -static int -gpio_close(struct inode * inode, struct file * file) -{ - smp_mb__before_atomic_inc(); - atomic_inc(&gpio_open_cnt); - - return 0; -} - -struct file_operations gpio_fops = { - ioctl: gpio_ioctl, - open: gpio_open, - release: gpio_close -}; - -static int -gpio_probe(struct platform_device *dev) -{ - int result = 0; - - dev_major = register_chrdev(0, DEVNAME, &gpio_fops); - if (!dev_major) - { - printk(KERN_ERR DRVNAME ": Error whilst opening %s \n", DEVNAME); - result = -ENODEV; - goto out; - } - - gpiodev_class = class_create(THIS_MODULE, DRVNAME); - device_create(gpiodev_class, NULL, MKDEV(dev_major, 0), dev, DEVNAME); - - printk(KERN_INFO DRVNAME ": gpio device registered with major %d\n", dev_major); - - if (dev->num_resources != 1) - { - printk(KERN_ERR DRVNAME ": device may only have 1 resource\n"); - result = -ENODEV; - goto out; - } - - gpio_access_mask = dev->resource[0].start; - - printk(KERN_INFO DRVNAME ": gpio platform device registered with access mask %08X\n", gpio_access_mask); -out: - return result; -} - -static int -gpio_remove(struct platform_device *dev) -{ - unregister_chrdev(dev_major, DEVNAME); - return 0; -} - -static struct -platform_driver gpio_driver = { - .probe = gpio_probe, - .remove = gpio_remove, - .driver = { - .name = "GPIODEV", - .owner = THIS_MODULE, - }, -}; - -static int __init -gpio_mod_init(void) -{ - int ret = platform_driver_register(&gpio_driver); - if (ret) - printk(KERN_INFO DRVNAME ": Error registering platfom driver!"); - - return ret; -} - -static void __exit -gpio_mod_exit(void) -{ - platform_driver_unregister(&gpio_driver); -} - -module_init (gpio_mod_init); -module_exit (gpio_mod_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("John Crispin / OpenWrt"); -MODULE_DESCRIPTION("Character device for for generic gpio api"); diff --git a/target/linux/generic-2.6/files-2.6.32/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files-2.6.32/drivers/input/misc/gpio_buttons.c deleted file mode 100644 index 83a8178340..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/drivers/input/misc/gpio_buttons.c +++ /dev/null @@ -1,209 +0,0 @@ -/* - * Driver for buttons on GPIO lines not capable of generating interrupts - * - * Copyright (C) 2007,2008 Gabor Juhos - * - * This file was based on: /drivers/input/misc/cobalt_btns.c - * Copyright (C) 2007 Yoichi Yuasa - * - * also was based on: /drivers/input/keyboard/gpio_keys.c - * Copyright 2005 Phil Blundell - * - * 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 -#include -#include - -#include -#include -#include -#include - -#include - -#include - -#define DRV_NAME "gpio-buttons" -#define DRV_VERSION "0.1.1" -#define PFX DRV_NAME ": " - -struct gpio_buttons_dev { - struct input_polled_dev *poll_dev; - struct gpio_buttons_platform_data *pdata; -}; - -static void gpio_buttons_poll(struct input_polled_dev *dev) -{ - struct gpio_buttons_dev *bdev = dev->private; - struct gpio_buttons_platform_data *pdata = bdev->pdata; - struct input_dev *input = dev->input; - int i; - - for (i = 0; i < bdev->pdata->nbuttons; i++) { - struct gpio_button *button = &pdata->buttons[i]; - unsigned int type = button->type ?: EV_KEY; - int state; - - state = gpio_get_value(button->gpio) ? 1 : 0; - state ^= button->active_low; - - if (state) { - button->count++; - } else { - if (button->count >= button->threshold) { - input_event(input, type, button->code, 1); - input_sync(input); - } - button->count = 0; - } - - if (button->count == button->threshold) { - input_event(input, type, button->code, 0); - input_sync(input); - } - } -} - -static int __devinit gpio_buttons_probe(struct platform_device *pdev) -{ - struct gpio_buttons_platform_data *pdata = pdev->dev.platform_data; - struct gpio_buttons_dev *bdev; - struct input_polled_dev *poll_dev; - struct input_dev *input; - int error, i; - - - if (!pdata) - return -ENXIO; - - bdev = kzalloc(sizeof(*bdev), GFP_KERNEL); - if (!bdev) { - printk(KERN_ERR DRV_NAME "no memory for device\n"); - return -ENOMEM; - } - - poll_dev = input_allocate_polled_device(); - if (!poll_dev) { - printk(KERN_ERR DRV_NAME "no memory for polled device\n"); - error = -ENOMEM; - goto err_free_bdev; - } - - poll_dev->private = bdev; - poll_dev->poll = gpio_buttons_poll; - poll_dev->poll_interval = pdata->poll_interval; - - input = poll_dev->input; - - input->evbit[0] = BIT(EV_KEY); - input->name = pdev->name; - input->phys = "gpio-buttons/input0"; - input->dev.parent = &pdev->dev; - - input->id.bustype = BUS_HOST; - input->id.vendor = 0x0001; - input->id.product = 0x0001; - input->id.version = 0x0100; - - for (i = 0; i < pdata->nbuttons; i++) { - struct gpio_button *button = &pdata->buttons[i]; - unsigned int gpio = button->gpio; - unsigned int type = button->type ?: EV_KEY; - - error = gpio_request(gpio, button->desc ? - button->desc : DRV_NAME); - if (error) { - printk(KERN_ERR PFX "unable to claim gpio %u, " - "error %d\n", gpio, error); - goto err_free_gpio; - } - - error = gpio_direction_input(gpio); - if (error) { - printk(KERN_ERR PFX "unable to set direction on " - "gpio %u, error %d\n", gpio, error); - goto err_free_gpio; - } - - input_set_capability(input, type, button->code); - button->count = 0; - } - - bdev->poll_dev = poll_dev; - bdev->pdata = pdata; - platform_set_drvdata(pdev, bdev); - - error = input_register_polled_device(poll_dev); - if (error) { - printk(KERN_ERR PFX "unable to register polled device, " - "error %d\n", error); - goto err_free_gpio; - } - - return 0; - -err_free_gpio: - for (i = i - 1; i >= 0; i--) - gpio_free(pdata->buttons[i].gpio); - - input_free_polled_device(poll_dev); - -err_free_bdev: - kfree(bdev); - - platform_set_drvdata(pdev, NULL); - return error; -} - -static int __devexit gpio_buttons_remove(struct platform_device *pdev) -{ - struct gpio_buttons_dev *bdev = platform_get_drvdata(pdev); - struct gpio_buttons_platform_data *pdata = bdev->pdata; - int i; - - input_unregister_polled_device(bdev->poll_dev); - - for (i = 0; i < pdata->nbuttons; i++) - gpio_free(pdata->buttons[i].gpio); - - input_free_polled_device(bdev->poll_dev); - - kfree(bdev); - platform_set_drvdata(pdev, NULL); - - return 0; -} - -static struct platform_driver gpio_buttons_driver = { - .probe = gpio_buttons_probe, - .remove = __devexit_p(gpio_buttons_remove), - .driver = { - .name = DRV_NAME, - .owner = THIS_MODULE, - }, -}; - -static int __init gpio_buttons_init(void) -{ - printk(KERN_INFO DRV_NAME " driver version " DRV_VERSION "\n"); - return platform_driver_register(&gpio_buttons_driver); -} - -static void __exit gpio_buttons_exit(void) -{ - platform_driver_unregister(&gpio_buttons_driver); -} - -module_init(gpio_buttons_init); -module_exit(gpio_buttons_exit); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Gabor Juhos "); -MODULE_VERSION(DRV_VERSION); -MODULE_DESCRIPTION("Polled buttons driver for CPU GPIOs"); - diff --git a/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-morse.c deleted file mode 100644 index cb47480a36..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-morse.c +++ /dev/null @@ -1,365 +0,0 @@ -/* - * LED Morse Trigger - * - * Copyright (C) 2007 Gabor Juhos - * - * This file was based on: drivers/led/ledtrig-timer.c - * Copyright 2005-2006 Openedhand Ltd. - * Author: Richard Purdie - * - * also based on the patch '[PATCH] 2.5.59 morse code panics' posted - * in the LKML by Tomas Szepe at Thu, 30 Jan 2003 - * Copyright (C) 2002 Andrew Rodland - * Copyright (C) 2003 Tomas Szepe - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "leds.h" - -#define MORSE_DELAY_BASE (HZ/2) - -#define MORSE_STATE_BLINK_START 0 -#define MORSE_STATE_BLINK_STOP 1 - -#define MORSE_DIT_LEN 1 -#define MORSE_DAH_LEN 3 -#define MORSE_SPACE_LEN 7 - -struct morse_trig_data { - unsigned long delay; - char *msg; - - unsigned char morse; - unsigned char state; - char *msgpos; - struct timer_list timer; -}; - -const unsigned char morsetable[] = { - 0122, 0, 0310, 0, 0, 0163, /* "#$%&' */ - 055, 0155, 0, 0, 0163, 0141, 0152, 0051, /* ()*+,-./ */ - 077, 076, 074, 070, 060, 040, 041, 043, 047, 057, /* 0-9 */ - 0107, 0125, 0, 0061, 0, 0114, 0, /* :;<=>?@ */ - 006, 021, 025, 011, 002, 024, 013, 020, 004, /* A-I */ - 036, 015, 022, 007, 005, 017, 026, 033, 012, /* J-R */ - 010, 003, 014, 030, 016, 031, 035, 023, /* S-Z */ - 0, 0, 0, 0, 0154 /* [\]^_ */ -}; - -static inline unsigned char tomorse(char c) { - if (c >= 'a' && c <= 'z') - c = c - 'a' + 'A'; - if (c >= '"' && c <= '_') { - return morsetable[c - '"']; - } else - return 0; -} - -static inline unsigned long dit_len(struct morse_trig_data *morse_data) -{ - return MORSE_DIT_LEN*morse_data->delay; -} - -static inline unsigned long dah_len(struct morse_trig_data *morse_data) -{ - return MORSE_DAH_LEN*morse_data->delay; -} - -static inline unsigned long space_len(struct morse_trig_data *morse_data) -{ - return MORSE_SPACE_LEN*morse_data->delay; -} - -static void morse_timer_function(unsigned long data) -{ - struct led_classdev *led_cdev = (struct led_classdev *)data; - struct morse_trig_data *morse_data = led_cdev->trigger_data; - unsigned long brightness = LED_OFF; - unsigned long delay = 0; - - if (!morse_data->msg) - goto set_led; - - switch (morse_data->state) { - case MORSE_STATE_BLINK_START: - /* Starting a new blink. We have a valid code in morse. */ - delay = (morse_data->morse & 001) ? dah_len(morse_data): - dit_len(morse_data); - brightness = LED_FULL; - morse_data->state = MORSE_STATE_BLINK_STOP; - morse_data->morse >>= 1; - break; - case MORSE_STATE_BLINK_STOP: - /* Coming off of a blink. */ - morse_data->state = MORSE_STATE_BLINK_START; - - if (morse_data->morse > 1) { - /* Not done yet, just a one-dit pause. */ - delay = dit_len(morse_data); - break; - } - - /* Get a new char, figure out how much space. */ - /* First time through */ - if (!morse_data->msgpos) - morse_data->msgpos = (char *)morse_data->msg; - - if (!*morse_data->msgpos) { - /* Repeating */ - morse_data->msgpos = (char *)morse_data->msg; - delay = space_len(morse_data); - } else { - /* Inter-letter space */ - delay = dah_len(morse_data); - } - - if (!(morse_data->morse = tomorse(*morse_data->msgpos))) { - delay = space_len(morse_data); - /* And get us back here */ - morse_data->state = MORSE_STATE_BLINK_STOP; - } - morse_data->msgpos++; - break; - } - - mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay)); - -set_led: - led_set_brightness(led_cdev, brightness); -} - -static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - sprintf(buf, "%lu\n", morse_data->delay); - - return strlen(buf) + 1; -} - -static ssize_t _morse_delay_store(struct led_classdev *led_cdev, - const char *buf, size_t size) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - char *after; - unsigned long state = simple_strtoul(buf, &after, 10); - size_t count = after - buf; - int ret = -EINVAL; - - if (*after && isspace(*after)) - count++; - - if (count == size) { - morse_data->delay = state; - mod_timer(&morse_data->timer, jiffies + 1); - ret = count; - } - - return ret; -} - -static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - if (!morse_data->msg) - sprintf(buf, "\n"); - else - sprintf(buf, "%s\n", morse_data->msg); - - return strlen(buf) + 1; -} - -static ssize_t _morse_msg_store(struct led_classdev *led_cdev, - const char *buf, size_t size) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - char *m; - - m = kmalloc(size, GFP_KERNEL); - if (!m) - return -ENOMEM; - - memcpy(m,buf,size); - m[size]='\0'; - - if (morse_data->msg) - kfree(morse_data->msg); - - morse_data->msg = m; - morse_data->msgpos = NULL; - morse_data->state = MORSE_STATE_BLINK_STOP; - - mod_timer(&morse_data->timer, jiffies + 1); - - return size; -} - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) -static ssize_t morse_delay_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_delay_show(led_cdev, buf); -} - -static ssize_t morse_delay_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_delay_store(led_cdev, buf, size); -} - -static ssize_t morse_msg_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_msg_show(led_cdev, buf); -} - -static ssize_t morse_msg_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - - return _morse_msg_store(led_cdev, buf, size); -} - -static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store); -static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store); - -#define led_device_create_file(leddev, attr) \ - device_create_file(leddev->dev, &dev_attr_ ## attr) -#define led_device_remove_file(leddev, attr) \ - device_remove_file(leddev->dev, &dev_attr_ ## attr) - -#else -static ssize_t morse_delay_show(struct class_device *dev, char *buf) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_delay_show(led_cdev, buf); -} - -static ssize_t morse_delay_store(struct class_device *dev, const char *buf, - size_t size) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_delay_store(led_cdev, buf, size); -} - -static ssize_t morse_msg_show(struct class_device *dev, char *buf) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_msg_show(led_cdev, buf); -} - -static ssize_t morse_msg_store(struct class_device *dev, const char *buf, - size_t size) -{ - struct led_classdev *led_cdev = class_get_devdata(dev); - - return _morse_msg_store(led_cdev, buf, size); -} - -static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store); -static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store); - -#define led_device_create_file(leddev, attr) \ - class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr) -#define led_device_remove_file(leddev, attr) \ - class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr) - -#endif - -static void morse_trig_activate(struct led_classdev *led_cdev) -{ - struct morse_trig_data *morse_data; - int rc; - - morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL); - if (!morse_data) - return; - - morse_data->delay = MORSE_DELAY_BASE; - init_timer(&morse_data->timer); - morse_data->timer.function = morse_timer_function; - morse_data->timer.data = (unsigned long)led_cdev; - - rc = led_device_create_file(led_cdev, delay); - if (rc) goto err; - - rc = led_device_create_file(led_cdev, message); - if (rc) goto err_delay; - - led_cdev->trigger_data = morse_data; - - return; - -err_delay: - led_device_remove_file(led_cdev, delay); -err: - kfree(morse_data); -} - -static void morse_trig_deactivate(struct led_classdev *led_cdev) -{ - struct morse_trig_data *morse_data = led_cdev->trigger_data; - - if (!morse_data) - return; - - led_device_remove_file(led_cdev, message); - led_device_remove_file(led_cdev, delay); - - del_timer_sync(&morse_data->timer); - if (morse_data->msg) - kfree(morse_data->msg); - - kfree(morse_data); -} - -static struct led_trigger morse_led_trigger = { - .name = "morse", - .activate = morse_trig_activate, - .deactivate = morse_trig_deactivate, -}; - -static int __init morse_trig_init(void) -{ - return led_trigger_register(&morse_led_trigger); -} - -static void __exit morse_trig_exit(void) -{ - led_trigger_unregister(&morse_led_trigger); -} - -module_init(morse_trig_init); -module_exit(morse_trig_exit); - -MODULE_AUTHOR("Gabor Juhos "); -MODULE_DESCRIPTION("Morse LED trigger"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c deleted file mode 100644 index 8dba8e654d..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/drivers/leds/ledtrig-netdev.c +++ /dev/null @@ -1,451 +0,0 @@ -/* - * LED Kernel Netdev Trigger - * - * Toggles the LED to reflect the link and traffic state of a named net device - * - * Copyright 2007 Oliver Jowett - * - * Derived from ledtrig-timer.c which is: - * Copyright 2005-2006 Openedhand Ltd. - * Author: Richard Purdie - * - * 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) -#include -#endif - -#include "leds.h" - -/* - * Configurable sysfs attributes: - * - * device_name - network device name to monitor - * - * interval - duration of LED blink, in milliseconds - * - * mode - either "none" (LED is off) or a space separated list of one or more of: - * link: LED's normal state reflects whether the link is up (has carrier) or not - * tx: LED blinks on transmitted data - * rx: LED blinks on receive data - * - * Some suggestions: - * - * Simple link status LED: - * $ echo netdev >someled/trigger - * $ echo eth0 >someled/device_name - * $ echo link >someled/mode - * - * Ethernet-style link/activity LED: - * $ echo netdev >someled/trigger - * $ echo eth0 >someled/device_name - * $ echo "link tx rx" >someled/mode - * - * Modem-style tx/rx LEDs: - * $ echo netdev >led1/trigger - * $ echo ppp0 >led1/device_name - * $ echo tx >led1/mode - * $ echo netdev >led2/trigger - * $ echo ppp0 >led2/device_name - * $ echo rx >led2/mode - * - */ - -#define MODE_LINK 1 -#define MODE_TX 2 -#define MODE_RX 4 - -struct led_netdev_data { - rwlock_t lock; - - struct timer_list timer; - struct notifier_block notifier; - - struct led_classdev *led_cdev; - struct net_device *net_dev; - - char device_name[IFNAMSIZ]; - unsigned interval; - unsigned mode; - unsigned link_up; - unsigned last_activity; -}; - -static void set_baseline_state(struct led_netdev_data *trigger_data) -{ - if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) - led_set_brightness(trigger_data->led_cdev, LED_FULL); - else - led_set_brightness(trigger_data->led_cdev, LED_OFF); - - if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up) - mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); - else - del_timer(&trigger_data->timer); -} - -static ssize_t led_device_name_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - sprintf(buf, "%s\n", trigger_data->device_name); - read_unlock(&trigger_data->lock); - - return strlen(buf) + 1; -} - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21) -extern struct net init_net; -#endif - -static ssize_t led_device_name_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - if (size < 0 || size >= IFNAMSIZ) - return -EINVAL; - - write_lock(&trigger_data->lock); - - strcpy(trigger_data->device_name, buf); - if (size > 0 && trigger_data->device_name[size-1] == '\n') - trigger_data->device_name[size-1] = 0; - - if (trigger_data->device_name[0] != 0) { - /* check for existing device to update from */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) - trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name); -#else - trigger_data->net_dev = dev_get_by_name(trigger_data->device_name); -#endif - if (trigger_data->net_dev != NULL) - trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0; - set_baseline_state(trigger_data); /* updates LEDs, may start timers */ - } - - write_unlock(&trigger_data->lock); - return size; -} - -static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store); - -static ssize_t led_mode_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - - if (trigger_data->mode == 0) { - strcpy(buf, "none\n"); - } else { - if (trigger_data->mode & MODE_LINK) - strcat(buf, "link "); - if (trigger_data->mode & MODE_TX) - strcat(buf, "tx "); - if (trigger_data->mode & MODE_RX) - strcat(buf, "rx "); - strcat(buf, "\n"); - } - - read_unlock(&trigger_data->lock); - - return strlen(buf)+1; -} - -static ssize_t led_mode_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - char copybuf[1024]; - int new_mode = -1; - char *p, *token; - - /* take a copy since we don't want to trash the inbound buffer when using strsep */ - strncpy(copybuf, buf, sizeof(copybuf)); - copybuf[1023] = 0; - p = copybuf; - - while ((token = strsep(&p, " \t\n")) != NULL) { - if (!*token) - continue; - - if (new_mode == -1) - new_mode = 0; - - if (!strcmp(token, "none")) - new_mode = 0; - else if (!strcmp(token, "tx")) - new_mode |= MODE_TX; - else if (!strcmp(token, "rx")) - new_mode |= MODE_RX; - else if (!strcmp(token, "link")) - new_mode |= MODE_LINK; - else - return -EINVAL; - } - - if (new_mode == -1) - return -EINVAL; - - write_lock(&trigger_data->lock); - trigger_data->mode = new_mode; - set_baseline_state(trigger_data); - write_unlock(&trigger_data->lock); - - return size; -} - -static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store); - -static ssize_t led_interval_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - read_lock(&trigger_data->lock); - sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval)); - read_unlock(&trigger_data->lock); - - return strlen(buf) + 1; -} - -static ssize_t led_interval_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - int ret = -EINVAL; - char *after; - unsigned long value = simple_strtoul(buf, &after, 10); - size_t count = after - buf; - - if (*after && isspace(*after)) - count++; - - /* impose some basic bounds on the timer interval */ - if (count == size && value >= 5 && value <= 10000) { - write_lock(&trigger_data->lock); - trigger_data->interval = msecs_to_jiffies(value); - set_baseline_state(trigger_data); // resets timer - write_unlock(&trigger_data->lock); - ret = count; - } - - return ret; -} - -static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store); - -static int netdev_trig_notify(struct notifier_block *nb, - unsigned long evt, - void *dv) -{ - struct net_device *dev = dv; - struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier); - - if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER) - return NOTIFY_DONE; - - write_lock(&trigger_data->lock); - - if (strcmp(dev->name, trigger_data->device_name)) - goto done; - - if (evt == NETDEV_REGISTER) { - if (trigger_data->net_dev != NULL) - dev_put(trigger_data->net_dev); - dev_hold(dev); - trigger_data->net_dev = dev; - trigger_data->link_up = 0; - goto done; - } - - if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) { - dev_put(trigger_data->net_dev); - trigger_data->net_dev = NULL; - goto done; - } - - /* UP / DOWN / CHANGE */ - - trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev)); - set_baseline_state(trigger_data); - -done: - write_unlock(&trigger_data->lock); - return NOTIFY_DONE; -} - -/* here's the real work! */ -static void netdev_trig_timer(unsigned long arg) -{ - struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; - const struct net_device_stats *dev_stats; - unsigned new_activity; - - write_lock(&trigger_data->lock); - - if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) { - /* we don't need to do timer work, just reflect link state. */ - led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF); - goto no_restart; - } - - dev_stats = dev_get_stats(trigger_data->net_dev); - new_activity = - ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) + - ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0); - - if (trigger_data->mode & MODE_LINK) { - /* base state is ON (link present) */ - /* if there's no link, we don't get this far and the LED is off */ - - /* OFF -> ON always */ - /* ON -> OFF on activity */ - if (trigger_data->led_cdev->brightness == LED_OFF) { - led_set_brightness(trigger_data->led_cdev, LED_FULL); - } else if (trigger_data->last_activity != new_activity) { - led_set_brightness(trigger_data->led_cdev, LED_OFF); - } - } else { - /* base state is OFF */ - /* ON -> OFF always */ - /* OFF -> ON on activity */ - if (trigger_data->led_cdev->brightness == LED_FULL) { - led_set_brightness(trigger_data->led_cdev, LED_OFF); - } else if (trigger_data->last_activity != new_activity) { - led_set_brightness(trigger_data->led_cdev, LED_FULL); - } - } - - trigger_data->last_activity = new_activity; - mod_timer(&trigger_data->timer, jiffies + trigger_data->interval); - -no_restart: - write_unlock(&trigger_data->lock); -} - -static void netdev_trig_activate(struct led_classdev *led_cdev) -{ - struct led_netdev_data *trigger_data; - int rc; - - trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL); - if (!trigger_data) - return; - - rwlock_init(&trigger_data->lock); - - trigger_data->notifier.notifier_call = netdev_trig_notify; - trigger_data->notifier.priority = 10; - - setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data); - - trigger_data->led_cdev = led_cdev; - trigger_data->net_dev = NULL; - trigger_data->device_name[0] = 0; - - trigger_data->mode = 0; - trigger_data->interval = msecs_to_jiffies(50); - trigger_data->link_up = 0; - trigger_data->last_activity = 0; - - led_cdev->trigger_data = trigger_data; - - rc = device_create_file(led_cdev->dev, &dev_attr_device_name); - if (rc) - goto err_out; - rc = device_create_file(led_cdev->dev, &dev_attr_mode); - if (rc) - goto err_out_device_name; - rc = device_create_file(led_cdev->dev, &dev_attr_interval); - if (rc) - goto err_out_mode; - - register_netdevice_notifier(&trigger_data->notifier); - return; - -err_out_mode: - device_remove_file(led_cdev->dev, &dev_attr_mode); -err_out_device_name: - device_remove_file(led_cdev->dev, &dev_attr_device_name); -err_out: - led_cdev->trigger_data = NULL; - kfree(trigger_data); -} - -static void netdev_trig_deactivate(struct led_classdev *led_cdev) -{ - struct led_netdev_data *trigger_data = led_cdev->trigger_data; - - if (trigger_data) { - unregister_netdevice_notifier(&trigger_data->notifier); - - device_remove_file(led_cdev->dev, &dev_attr_device_name); - device_remove_file(led_cdev->dev, &dev_attr_mode); - device_remove_file(led_cdev->dev, &dev_attr_interval); - - write_lock(&trigger_data->lock); - - if (trigger_data->net_dev) { - dev_put(trigger_data->net_dev); - trigger_data->net_dev = NULL; - } - - write_unlock(&trigger_data->lock); - - del_timer_sync(&trigger_data->timer); - - kfree(trigger_data); - } -} - -static struct led_trigger netdev_led_trigger = { - .name = "netdev", - .activate = netdev_trig_activate, - .deactivate = netdev_trig_deactivate, -}; - -static int __init netdev_trig_init(void) -{ - return led_trigger_register(&netdev_led_trigger); -} - -static void __exit netdev_trig_exit(void) -{ - led_trigger_unregister(&netdev_led_trigger); -} - -module_init(netdev_trig_init); -module_exit(netdev_trig_exit); - -MODULE_AUTHOR("Oliver Jowett "); -MODULE_DESCRIPTION("Netdev LED trigger"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/generic-2.6/files-2.6.32/include/linux/glamo-engine.h b/target/linux/generic-2.6/files-2.6.32/include/linux/glamo-engine.h deleted file mode 100644 index 516d45fa6e..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/include/linux/glamo-engine.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef __GLAMO_ENGINE_H -#define __GLAMO_ENGINE_H - -enum glamo_engine { - GLAMO_ENGINE_CAPTURE = 0, - GLAMO_ENGINE_ISP = 1, - GLAMO_ENGINE_JPEG = 2, - GLAMO_ENGINE_MPEG_ENC = 3, - GLAMO_ENGINE_MPEG_DEC = 4, - GLAMO_ENGINE_LCD = 5, - GLAMO_ENGINE_CMDQ = 6, - GLAMO_ENGINE_2D = 7, - GLAMO_ENGINE_3D = 8, - GLAMO_ENGINE_MMC = 9, - GLAMO_ENGINE_MICROP0 = 10, - GLAMO_ENGINE_RISC = 11, - GLAMO_ENGINE_MICROP1_MPEG_ENC = 12, - GLAMO_ENGINE_MICROP1_MPEG_DEC = 13, -#if 0 - GLAMO_ENGINE_H264_DEC = 14, - GLAMO_ENGINE_RISC1 = 15, - GLAMO_ENGINE_SPI = 16, -#endif - __NUM_GLAMO_ENGINES -}; - -#endif diff --git a/target/linux/generic-2.6/files-2.6.32/include/linux/glamofb.h b/target/linux/generic-2.6/files-2.6.32/include/linux/glamofb.h deleted file mode 100644 index 5f9fab5a48..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/include/linux/glamofb.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef _LINUX_GLAMOFB_H -#define _LINUX_GLAMOFB_H - -#include - -#ifdef __KERNEL__ - -struct glamo_core; -struct glamofb_handle; - -struct glamo_fb_platform_data { - int width, height; - - int num_modes; - struct fb_videomode *modes; - - struct glamo_core *core; -}; - -int glamofb_cmd_mode(struct glamofb_handle *gfb, int on); -int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val); - -#ifdef CONFIG_MFD_GLAMO -void glamo_lcm_reset(struct platform_device *pdev, int level); -#else -#define glamo_lcm_reset(...) do {} while (0) -#endif - -#endif - -#define GLAMOFB_ENGINE_ENABLE _IOW('F', 0x1, __u32) -#define GLAMOFB_ENGINE_DISABLE _IOW('F', 0x2, __u32) -#define GLAMOFB_ENGINE_RESET _IOW('F', 0x3, __u32) - -#endif diff --git a/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_buttons.h b/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_buttons.h deleted file mode 100644 index f5e6297258..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_buttons.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Definitions for the GPIO buttons interface driver - * - * Copyright (C) 2007,2008 Gabor Juhos - * - * This file was based on: /include/linux/gpio_keys.h - * The original gpio_keys.h seems not to have a license. - * - * 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. - * - */ - -#ifndef _GPIO_BUTTONS_H_ -#define _GPIO_BUTTONS_H_ - -struct gpio_button { - int gpio; /* GPIO line number */ - int active_low; - char *desc; /* button description */ - int type; /* input event type (EV_KEY, EV_SW) */ - int code; /* input event code (KEY_*, SW_*) */ - int count; - int threshold; /* count threshold */ -}; - -struct gpio_buttons_platform_data { - struct gpio_button *buttons; - int nbuttons; /* number of buttons */ - int poll_interval; /* polling interval */ -}; - -#endif /* _GPIO_BUTTONS_H_ */ - diff --git a/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_dev.h b/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_dev.h deleted file mode 100644 index 3f3c9c772c..0000000000 --- a/target/linux/generic-2.6/files-2.6.32/include/linux/gpio_dev.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _GPIODEV_H__ -#define _GPIODEV_H__ - -#define IOC_GPIODEV_MAGIC 'B' -#define GPIO_GET _IO(IOC_GPIODEV_MAGIC, 10) -#define GPIO_SET _IO(IOC_GPIODEV_MAGIC, 11) -#define GPIO_CLEAR _IO(IOC_GPIODEV_MAGIC, 12) -#define GPIO_DIR_IN _IO(IOC_GPIODEV_MAGIC, 13) -#define GPIO_DIR_OUT _IO(IOC_GPIODEV_MAGIC, 14) - -#endif diff --git a/target/linux/generic-2.6/files-2.6.30/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files/drivers/char/gpio_dev.c similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/drivers/char/gpio_dev.c rename to target/linux/generic-2.6/files/drivers/char/gpio_dev.c diff --git a/target/linux/generic-2.6/files-2.6.30/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/drivers/input/misc/gpio_buttons.c rename to target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c diff --git a/target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-morse.c rename to target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c diff --git a/target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/drivers/leds/ledtrig-netdev.c rename to target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c diff --git a/target/linux/generic-2.6/files-2.6.30/include/linux/glamo-engine.h b/target/linux/generic-2.6/files/include/linux/glamo-engine.h similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/include/linux/glamo-engine.h rename to target/linux/generic-2.6/files/include/linux/glamo-engine.h diff --git a/target/linux/generic-2.6/files-2.6.30/include/linux/glamofb.h b/target/linux/generic-2.6/files/include/linux/glamofb.h similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/include/linux/glamofb.h rename to target/linux/generic-2.6/files/include/linux/glamofb.h diff --git a/target/linux/generic-2.6/files-2.6.30/include/linux/gpio_buttons.h b/target/linux/generic-2.6/files/include/linux/gpio_buttons.h similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/include/linux/gpio_buttons.h rename to target/linux/generic-2.6/files/include/linux/gpio_buttons.h diff --git a/target/linux/generic-2.6/files-2.6.30/include/linux/gpio_dev.h b/target/linux/generic-2.6/files/include/linux/gpio_dev.h similarity index 100% rename from target/linux/generic-2.6/files-2.6.30/include/linux/gpio_dev.h rename to target/linux/generic-2.6/files/include/linux/gpio_dev.h -- 2.25.1