diff options
| author | Justin Waters <justin.waters@timesys.com> | 2008-05-29 11:42:28 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2008-05-29 11:42:28 -0400 |
| commit | 8797924dd12ab54b3f6cc7cdfec50064970e4ef8 (patch) | |
| tree | c63d357fd139d71280f3dced26f58b1b0d7014d7 | |
| parent | 6e6cc5e0205c1a939405c4ab296b85e7c48aa6c5 (diff) | |
MXC GPIO: Add method for masking/unmasking interrupts on the port level
The GPIO interrupts on the MXC platforms can be masked on either the pin or
port level, but no method existed to mask them on the port level. This patch
adds that support and unmasks the ports on the MX27 when an IRQ is unmasked.
Signed-off-by: Justin Waters <justin.waters@timesys.com>
| -rw-r--r-- | arch/arm/plat-mxc/gpio.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index 5c2e2d933187..e9458cfa8b8f 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c @@ -57,6 +57,8 @@ enum gpio_reg { GPIO_SWR = 0x3C, GPIO_PUEN = 0x40, }; + +#define GPIO_PMASK (IO_ADDRESS(GPIO_BASE_ADDR) + 0x600) #else enum gpio_reg { GPIO_DR = 0x00, @@ -258,6 +260,24 @@ static inline void _set_gpio_irqenable(struct gpio_port *port, u32 index, __raw_writel(l, reg); } +/* + * Enable/disable a GPIO port's interrupt. + * + * @param port gpio port number (A=0, B=1, etc.) + * @param enable \b #true for enabling the interrupt; \b #false otherwise + */ +static inline void _set_gpio_port_irqenable(u32 port, bool enable) +{ + u32 reg = GPIO_PMASK; + u32 mask = (!enable) ? 0 : 1; + u32 l; + + /* Enable IRQ on port level */ + l = __raw_readl(reg); + l = (l & (~(1 << port))) | (mask << port); + __raw_writel(l,reg); +} + static inline int _request_gpio(struct gpio_port *port, u32 index) { spin_lock(&port->lock); @@ -441,6 +461,10 @@ static void gpio_unmask_irq(u32 irq) struct gpio_port *port = get_gpio_port(gpio); _set_gpio_irqenable(port, GPIO_TO_INDEX(gpio), 1); + +#if defined(CONFIG_ARCH_MX27) + _set_gpio_port_irqenable(GPIO_TO_PORT(gpio), 1); +#endif } /* |