diff options
| author | Charulatha V <charu@ti.com> | 2011-05-25 11:23:50 +0530 |
|---|---|---|
| committer | Nishanth Menon <nm@ti.com> | 2011-07-14 11:53:40 -0700 |
| commit | 9877cd098e03484d483beb481170cda014423662 (patch) | |
| tree | 332da4ac7e1a6c69eff17798c88a373b7d04800d | |
| parent | 2e39056d8be434b15d40b46c150cb648724bd46b (diff) | |
| download | kernel_samsung_tuna-9877cd098e03484d483beb481170cda014423662.zip kernel_samsung_tuna-9877cd098e03484d483beb481170cda014423662.tar.gz kernel_samsung_tuna-9877cd098e03484d483beb481170cda014423662.tar.bz2 | |
GPIO: OMAP15xx: 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>
| -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 2adfece..950e467 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 ae2e776..2f53501 100644 --- a/arch/arm/plat-omap/include/plat/gpio.h +++ b/arch/arm/plat-omap/include/plat/gpio.h @@ -202,6 +202,7 @@ struct omap_gpio_reg_offs { u16 edgectrl2; /* Not applicable for OMAP2+ as hwmod layer takes care of sysconfig */ u16 sysconfig; + u16 pinctrl; bool irqenable_inv; }; diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 01733d8..7d578e8 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -500,15 +500,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; |