Charulatha V <charu@xxxxxx> writes: > Access to some of the OMAP4 GPIO registers are not properly handled. > This patch fixes it. > Tested on... ? > Signed-off-by: Charulatha V <charu@xxxxxx> > --- > arch/arm/plat-omap/gpio.c | 61 +++++++++++++++++++++++++++++++++++--------- > 1 files changed, 55 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c > index 76a347b..3a9891c 100644 > --- a/arch/arm/plat-omap/gpio.c > +++ b/arch/arm/plat-omap/gpio.c > @@ -137,7 +137,11 @@ > #define OMAP4_GPIO_IRQSTATUSCLR1 0x0040 > #define OMAP4_GPIO_IRQWAKEN0 0x0044 > #define OMAP4_GPIO_IRQWAKEN1 0x0048 > -#define OMAP4_GPIO_SYSSTATUS 0x0104 > +#define OMAP4_GPIO_SYSSTATUS 0x0114 > +#define OMAP4_GPIO_IRQENABLE1 0x011c > +#define OMAP4_GPIO_WAKE_EN 0x0120 > +#define OMAP4_GPIO_IRQSTATUS2 0x0128 > +#define OMAP4_GPIO_IRQENABLE2 0x012c > #define OMAP4_GPIO_CTRL 0x0130 > #define OMAP4_GPIO_OE 0x0134 > #define OMAP4_GPIO_DATAIN 0x0138 > @@ -148,6 +152,10 @@ > #define OMAP4_GPIO_FALLINGDETECT 0x014c > #define OMAP4_GPIO_DEBOUNCENABLE 0x0150 > #define OMAP4_GPIO_DEBOUNCINGTIME 0x0154 > +#define OMAP4_GPIO_CLEARIRQENABLE1 0x0160 > +#define OMAP4_GPIO_SETIRQENABLE1 0x0164 > +#define OMAP4_GPIO_CLEARWKUENA 0x0180 > +#define OMAP4_GPIO_SETWKUENA 0x0184 > #define OMAP4_GPIO_CLEARDATAOUT 0x0190 [...] > @@ -1570,9 +1603,14 @@ static int gpio_is_input(struct gpio_bank *bank, int mask) > reg += OMAP7XX_GPIO_DIR_CONTROL; > break; > case METHOD_GPIO_24XX: > - case METHOD_GPIO_44XX: > reg += OMAP24XX_GPIO_OE; > break; > + case METHOD_GPIO_44XX: > + reg += OMAP4_GPIO_OE; > + break; > + default: > + WARN_ON(1); > + return -EINVAL; If you add a WARN, please add a helpful string. Otherwise, this looks OK to me. Acked-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
