diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-15 09:47:55 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-24 10:07:16 +0100 |
| commit | bac3fcfad565c9bbceeed8b607f140c29df97355 (patch) | |
| tree | 63e89451b3c411416de61f5ed557cf50236ec616 /arch/arm/plat-mxc/include/mach/iomux-v1.h | |
| parent | e835d88e71f54c048a8cc907cc34084f1dd5846b (diff) | |
| download | kernel_samsung_smdk4412-bac3fcfad565c9bbceeed8b607f140c29df97355.zip kernel_samsung_smdk4412-bac3fcfad565c9bbceeed8b607f140c29df97355.tar.gz kernel_samsung_smdk4412-bac3fcfad565c9bbceeed8b607f140c29df97355.tar.bz2 | |
arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode
mxc_gpio_mode checks for invalid pins and so it returns zero for
success, -EINVAL for invalid pins.
While at it, remove definitions of GPIO_PORT_MAX removed as they are
unused now.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-v1.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v1.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h index 54abfc0..884f575 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v1.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h @@ -41,16 +41,9 @@ #define MXC_SWR(x) (0x3c + ((x) << 8)) #define MXC_PUEN(x) (0x40 + ((x) << 8)) -#ifdef CONFIG_ARCH_MX1 -# define GPIO_PORT_MAX 3 -#endif -#ifdef CONFIG_ARCH_MX2 -# define GPIO_PORT_MAX 5 -#endif - -#ifndef GPIO_PORT_MAX -# error "GPIO config port count unknown!" -#endif +#define MX1_NUM_GPIO_PORT 4 +#define MX21_NUM_GPIO_PORT 6 +#define MX27_NUM_GPIO_PORT 6 #define GPIO_PIN_MASK 0x1f @@ -102,9 +95,9 @@ #define IRQ_GPIOE(x) (IRQ_GPIOD(32) + x) #define IRQ_GPIOF(x) (IRQ_GPIOE(32) + x) -extern void mxc_gpio_mode(int gpio_mode); +extern int mxc_gpio_mode(int gpio_mode); extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, - const char *label); + const char *label); extern void mxc_gpio_release_multiple_pins(const int *pin_list, int count); #endif /* __MACH_IOMUX_V1_H__ */ |