diff options
| author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-11-19 17:11:02 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:02 +0000 |
| commit | 4ebc574062d8aed2cb662a8360bc3c1222d5047b (patch) | |
| tree | be27e167622ce9dd16339e7ce2f156ab71e8097a /include/asm-arm | |
| parent | e98ad875b68c1205d30182d7a77391e6ae91c4ad (diff) | |
[ARM]: Move asm/arch/gpio.h to mach/ directory
This file was moved in the big file move, but some OpenMoko specific
changes did not make it. This patch peels out the relevant bits and
adds them to the gpio.h file in the upstream location.
The only OpenMoko specific change is the definition of gpio_to_irq and
irq_to_gpio. These functions should really be defined in gpio_chip and
asm-generic/gpio.h; this is coming soon, but until then we'll just use
the Moko definitions that we've been using up until now.
This is not strictly correct for the GTA02 case, but it works given
the configuration that's currently in use. This can be fixed (and
should become evident) when the configuration options are cleaned up.
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/gpio.h | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h deleted file mode 100644 index 15da41c9f84..00000000000 --- a/include/asm-arm/arch-s3c2410/gpio.h +++ /dev/null @@ -1,46 +0,0 @@ -/* linux/include/asm-arm/arch-s3c2410/gpio.h - * - * Copyright (c) 2008 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks <ben@simtec.co.uk> - * - * S3C2410 - GPIO lib support - * - * 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. -*/ - -#if 0 -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#endif -#define gpio_cansleep __gpio_cansleep - -#ifndef __ASM_ARCH_S3C2410_GPIO_H -#define __ASM_ARCH_S3C2410_GPIO_H - -#include <asm/irq.h> -#include <mach/hardware.h> -#include <mach/regs-gpio.h> - -int gpio_request(unsigned gpio, const char *label); -void gpio_free(unsigned gpio); -int gpio_direction_input(unsigned gpio); -int gpio_direction_output(unsigned gpio, int value); - -#define gpio_get_value(gpio) s3c2410_gpio_getpin(gpio) -#define gpio_set_value(gpio,value) s3c2410_gpio_setpin(gpio, value) - -#include <asm-generic/gpio.h> /* cansleep wrappers */ - -#ifdef CONFIG_CPU_S3C2400 -#define gpio_to_irq(gpio) s3c2400_gpio_getirq(gpio) -#else -#define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio) -#define irq_to_gpio(irq) s3c2410_gpio_irq2pin(irq) -#endif - -#include <asm-generic/gpio.h> -#endif - |