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

Commit 28f3b5a0 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

gpio/omap: conslidate enable/disable of GPIO IRQs, remove ifdefs 



Cleanup GPIO IRQ enable/disable handling by removing SoC-specific

Also split enable/disable IRQ into separate functions for better
readability and also facilitate potentially moving to generic irq_chip
in the future.

Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent eef4bec7

arch/arm/mach-omap1/gpio15xx.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = { 
	.datain		= OMAP_MPUIO_INPUT_LATCH,

	.dataout	= OMAP_MPUIO_OUTPUT,

	.irqstatus	= OMAP_MPUIO_GPIO_INT,

	.irqenable	= OMAP_MPUIO_GPIO_MASKIT,

	.irqenable_inv	= true,

};



static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
@@ -77,6 +79,8 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = { 
	.datain		= OMAP1510_GPIO_DATA_INPUT,

	.dataout	= OMAP1510_GPIO_DATA_OUTPUT,

	.irqstatus	= OMAP1510_GPIO_INT_STATUS,

	.irqenable	= OMAP1510_GPIO_INT_MASK,

	.irqenable_inv	= true,

};



static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {

arch/arm/mach-omap1/gpio16xx.c

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = { 
	.datain		= OMAP_MPUIO_INPUT_LATCH,

	.dataout	= OMAP_MPUIO_OUTPUT,

	.irqstatus	= OMAP_MPUIO_GPIO_INT,

	.irqenable	= OMAP_MPUIO_GPIO_MASKIT,

	.irqenable_inv	= true,

};



static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
@@ -82,6 +84,9 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = { 
	.datain		= OMAP1610_GPIO_DATAIN,

	.dataout	= OMAP1610_GPIO_DATAOUT,

	.irqstatus	= OMAP1610_GPIO_IRQSTATUS1,

	.irqenable	= OMAP1610_GPIO_IRQENABLE1,

	.set_irqenable	= OMAP1610_GPIO_SET_IRQENABLE1,

	.clr_irqenable	= OMAP1610_GPIO_CLEAR_IRQENABLE1,

};



static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {

arch/arm/mach-omap1/gpio7xx.c

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = { 
	.datain		= OMAP_MPUIO_INPUT_LATCH / 2,

	.dataout	= OMAP_MPUIO_OUTPUT / 2,

	.irqstatus	= OMAP_MPUIO_GPIO_INT / 2,

	.irqenable	= OMAP_MPUIO_GPIO_MASKIT / 2,

	.irqenable_inv	= true,

};



static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
@@ -82,6 +84,8 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = { 
	.datain		= OMAP7XX_GPIO_DATA_INPUT,

	.dataout	= OMAP7XX_GPIO_DATA_OUTPUT,

	.irqstatus	= OMAP7XX_GPIO_INT_STATUS,

	.irqenable	= OMAP7XX_GPIO_INT_MASK,

	.irqenable_inv	= true,

};



static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {

arch/arm/mach-omap2/gpio.c

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		pdata->regs->clr_dataout = OMAP24XX_GPIO_CLEARDATAOUT;

		pdata->regs->irqstatus = OMAP24XX_GPIO_IRQSTATUS1;

		pdata->regs->irqstatus2 = OMAP24XX_GPIO_IRQSTATUS2;

		pdata->regs->irqenable = OMAP24XX_GPIO_IRQENABLE1;

		pdata->regs->set_irqenable = OMAP24XX_GPIO_SETIRQENABLE1;

		pdata->regs->clr_irqenable = OMAP24XX_GPIO_CLEARIRQENABLE1;

		break;

	case 2:

		pdata->bank_type = METHOD_GPIO_44XX;
@@ -88,6 +91,9 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT;

		pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;

		pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;

		pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;

		pdata->regs->set_irqenable = OMAP4_GPIO_IRQSTATUSSET0;

		pdata->regs->clr_irqenable = OMAP4_GPIO_IRQSTATUSCLR0;

		break;

	default:

		WARN(1, "Invalid gpio bank_type\n");

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

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ struct omap_gpio_reg_offs { 
	u16 clr_dataout;

	u16 irqstatus;

	u16 irqstatus2;

	u16 irqenable;

	u16 set_irqenable;

	u16 clr_irqenable;



	bool irqenable_inv;

};



struct omap_gpio_platform_data {