diff options
| author | Charulatha V <charu@ti.com> | 2011-05-25 11:23:50 +0530 |
|---|---|---|
| committer | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-02-06 14:13:43 +0530 |
| commit | fad96ea825e7a8ee0c5b77292b470e4978157ee7 (patch) | |
| tree | 1e013b7a881a3abaa6a6e6b1812bfdd38537cae1 | |
| parent | ab985f0f7c2c0ef90b7c832f0c04f470dda0593d (diff) | |
| download | linux-3.10-fad96ea825e7a8ee0c5b77292b470e4978157ee7.tar.gz linux-3.10-fad96ea825e7a8ee0c5b77292b470e4978157ee7.tar.bz2 linux-3.10-fad96ea825e7a8ee0c5b77292b470e4978157ee7.zip | |
gpio/omap: use pinctrl offset instead of macro
Use regs->pinctrl field instead of using the macro OMAP1510_GPIO_PIN_CONTROL
Signed-off-by: Charulatha V <charu@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
| -rw-r--r-- | arch/arm/mach-omap1/gpio15xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpio.h | 1 | ||||
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 8 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index 2adfece30ce..950e467361d 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c @@ -85,6 +85,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = { .irqenable = OMAP1510_GPIO_INT_MASK, .irqenable_inv = true, .irqctrl = OMAP1510_GPIO_INT_CONTROL, + .pinctrl = OMAP1510_GPIO_PIN_CONTROL, }; static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = { diff --git a/arch/arm/plat-omap/include/plat/gpio.h b/arch/arm/plat-omap/include/plat/gpio.h index 9e403e54f6f..8be165108aa 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h @@ -198,6 +198,7 @@ struct omap_gpio_reg_offs { u16 irqctrl; u16 edgectrl1; u16 edgectrl2; + u16 pinctrl; bool irqenable_inv; }; diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index a948351ad6c..485b6b207ef 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -490,15 +490,13 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) */ _set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); -#ifdef CONFIG_ARCH_OMAP15XX - if (bank->method == METHOD_GPIO_1510) { - void __iomem *reg; + if (bank->regs->pinctrl) { + void __iomem *reg = bank->base + bank->regs->pinctrl; /* Claim the pin for MPU */ - reg = bank->base + OMAP1510_GPIO_PIN_CONTROL; __raw_writel(__raw_readl(reg) | (1 << offset), reg); } -#endif + if (bank->regs->ctrl && !bank->mod_usage) { void __iomem *reg = bank->base + bank->regs->ctrl; u32 ctrl; |