--- linux-2.6.21.1.orig/arch/arm/mach-at91/gpio.c 2007-04-27 23:49:26.000000000 +0200 +++ linux-2.6.21.1/arch/arm/mach-at91/gpio.c 2007-05-28 15:30:48.000000000 +0200 @@ -27,6 +27,7 @@ static struct at91_gpio_bank *gpio; static int gpio_banks; +static u32 pio_gpio_pin[4] = { 0, 0, 0, 0 }; static inline void __iomem *pin_to_controller(unsigned pin) @@ -71,9 +72,13 @@ { void __iomem *pio = pin_to_controller(pin); unsigned mask = pin_to_mask(pin); + int bank = (pin - PIN_BASE) / 32; if (!pio) return -EINVAL; + + pio_gpio_pin[bank] |= mask; + __raw_writel(mask, pio + PIO_IDR); __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); __raw_writel(mask, pio + PIO_PER); @@ -130,10 +135,13 @@ { void __iomem *pio = pin_to_controller(pin); unsigned mask = pin_to_mask(pin); + int bank = (pin - PIN_BASE) / 32; if (!pio) return -EINVAL; + pio_gpio_pin[bank] |= mask; + __raw_writel(mask, pio + PIO_IDR); __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR)); __raw_writel(mask, pio + PIO_ODR); @@ -151,10 +159,13 @@ { void __iomem *pio = pin_to_controller(pin); unsigned mask = pin_to_mask(pin); + int bank = (pin - PIN_BASE) / 32; if (!pio) return -EINVAL; + pio_gpio_pin[bank] |= mask; + __raw_writel(mask, pio + PIO_IDR); __raw_writel(mask, pio + PIO_PUDR); __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR)); @@ -262,6 +273,18 @@ } EXPORT_SYMBOL(at91_get_gpio_value); +int at91_is_pin_gpio(unsigned pin) +{ + void __iomem *pio = pin_to_controller(pin); + unsigned mask = pin_to_mask(pin); + int bank = (pin - PIN_BASE) / 32; + + if (!pio) + return -EINVAL; + return (pio_gpio_pin[bank] & mask) != 0; +} +EXPORT_SYMBOL(at91_is_pin_gpio); + /*--------------------------------------------------------------------------*/ #ifdef CONFIG_PM --- linux-2.6.21.1.orig/drivers/char/Kconfig 2007-05-28 12:22:29.000000000 +0200 +++ linux-2.6.21.1/drivers/char/Kconfig 2007-05-28 15:37:43.000000000 +0200 @@ -1087,5 +1087,12 @@ The SPI driver gives user mode access to this serial bus on the AT91RM9200 processor. +config AT91_VLIO + tristate "Versalink LED and GPIO interface" + depends on ARCH_AT91RM9200 && MACH_VLINK + default n + help + Provides a handler GPIO's in userspace + endmenu --- linux-2.6.21.1.orig/drivers/char/Makefile 2007-05-28 12:22:29.000000000 +0200 +++ linux-2.6.21.1/drivers/char/Makefile 2007-05-28 15:38:11.000000000 +0200 @@ -95,6 +95,7 @@ obj-$(CONFIG_TELCLOCK) += tlclk.o obj-$(CONFIG_AT91_SPI) += at91_spi.o obj-$(CONFIG_AT91_SPIDEV) += at91_spidev.o +obj-$(CONFIG_AT91_VLIO) += vlink_giu.o obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_MWAVE) += mwave/ --- linux-2.6.21.1.orig/drivers/char/vlink_giu.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.21.1/drivers/char/vlink_giu.c 2007-05-28 15:39:47.000000000 +0200 @@ -0,0 +1,256 @@ +/* + * Driver for FDL Versalink GPIO + * + * Copyright (C) 2005 Guthrie Consulting + * Author: Hamish Guthrie + * + * 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, MA 02111-1307 USA + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int major; /* default is dynamic major device number */ +module_param(major, int, 0); +MODULE_PARM_DESC(major, "Major device number"); + +#define VIO_NR_DEVS 96 + +struct vio_dev { + struct cdev cdev; +}; + +struct vio_dev *vio_devices; +static struct class *vio_class; + +static ssize_t gpio_read(struct file *file, char __user *buf, size_t len, + loff_t *ppos) +{ + unsigned int pin; + int retval; + char value = '0'; + + pin = iminor(file->f_dentry->d_inode); + + retval = at91_get_gpio_value(PIN_BASE + pin); + if (retval < 0) + return -EFAULT; + + value = retval + 0x30; + if (put_user(value, buf)) + return -EFAULT; + + return 1; +} + +static ssize_t gpio_write(struct file *file, const char __user *data, + size_t len, loff_t *ppos) +{ + unsigned int pin; + size_t i; + char c; + int retval = 0; + + pin = iminor(file->f_dentry->d_inode); + + for (i = 0; i < len; i++) { + if (get_user(c, data + i)) + return -EFAULT; + + switch (c) { + case '0': + case '1': + retval = at91_set_gpio_value(PIN_BASE + pin, (int)c - 0x30); + if (retval < 0) + return -EFAULT; + break; + default: + break; + } + + if (retval < 0) + break; + } + + return i; +} + +static int gpio_open(struct inode *inode, struct file *file) +{ + return nonseekable_open(inode, file); +} + +static int gpio_release(struct inode *inode, struct file *file) +{ + return 0; +} + +static struct file_operations vio_fops = { + .owner = THIS_MODULE, + .read = gpio_read, + .write = gpio_write, + .open = gpio_open, + .release = gpio_release, +}; + +static void vio_setup_cdev(struct vio_dev *dev, int index) +{ + int err, devno = MKDEV(major, index); + + cdev_init(&dev->cdev, &vio_fops); + dev->cdev.owner = THIS_MODULE; + dev->cdev.ops = &vio_fops; + err = cdev_add (&dev->cdev, devno, 1); + if (err) + printk(KERN_NOTICE "vio: Error %d adding vio%d", err, index); +} + +static int vio_remove(struct platform_device *dev) +{ + int i; + dev_t devno = MKDEV(major, 0); + + if (vio_devices) { + for(i=0; i"); +MODULE_DESCRIPTION("FDL Versalink GPIO Driver"); +MODULE_LICENSE("GPL");