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 /arch | |
| 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 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/gpio.h | 7 | ||||
| -rw-r--r-- | arch/arm/plat-s3c24xx/neo1973_pm_gsm.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h index 3b52b86498a..7232f8ca474 100644 --- a/arch/arm/mach-s3c2410/include/mach/gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h @@ -15,4 +15,11 @@ #define gpio_set_value __gpio_set_value #define gpio_cansleep __gpio_cansleep +/* These two defines should be removed as soon as the + * generic irq handling makes it upstream */ +#include <mach/hardware.h> +#define gpio_to_irq(gpio) s3c2410_gpio_getirq(gpio) +#define irq_to_gpio(irq) s3c2410_gpio_irq2pin(irq) +/* -- cut to here when generic irq makes it */ + #include <asm-generic/gpio.h> diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c index b720db4e88f..ad0d9c8997d 100644 --- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c +++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c @@ -19,7 +19,7 @@ #include <linux/errno.h> #include <linux/interrupt.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> #include <asm/mach-types.h> #include <mach/gta01.h> #include <asm/plat-s3c24xx/neo1973.h> |