Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad96ea8 authored by Charulatha V's avatar Charulatha V Committed by Tarun Kanti DebBarma
Browse files

gpio/omap: use pinctrl offset instead of macro 



Use regs->pinctrl field instead of using the macro OMAP1510_GPIO_PIN_CONTROL

Signed-off-by: default avatarCharulatha V <charu@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent ab985f0f

arch/arm/mach-omap1/gpio15xx.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

arch/arm/plat-omap/include/plat/gpio.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ struct omap_gpio_reg_offs { 
	u16 irqctrl;

	u16 edgectrl1;

	u16 edgectrl2;

	u16 pinctrl;



	bool irqenable_inv;

};

drivers/gpio/gpio-omap.c

+3 −5
Original line number Diff line number Diff line
@@ -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;