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

Commit 453007cf authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'for_3.5/gpio/cleanup' of... 

Merge branch 'for_3.5/gpio/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
parents 7563bbf8 1b128703

arch/arm/mach-omap1/gpio15xx.c

+0 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.is_mpuio		= true,

	.bank_width		= 16,

	.bank_stride		= 1,
@@ -89,7 +88,6 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_width		= 16,

	.regs                   = &omap15xx_gpio_regs,

};

arch/arm/mach-omap1/gpio16xx.c

+0 −5
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.is_mpuio		= true,

	.bank_width		= 16,

	.bank_stride		= 1,
@@ -99,7 +98,6 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};
@@ -128,7 +126,6 @@ static struct __initdata resource omap16xx_gpio2_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 16,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};
@@ -157,7 +154,6 @@ static struct __initdata resource omap16xx_gpio3_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 32,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};
@@ -186,7 +182,6 @@ static struct __initdata resource omap16xx_gpio4_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 48,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};

arch/arm/mach-omap1/gpio7xx.c

+0 −7
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.is_mpuio		= true,

	.bank_width		= 16,

	.bank_stride		= 2,
@@ -93,7 +92,6 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};
@@ -122,7 +120,6 @@ static struct __initdata resource omap7xx_gpio2_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 32,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};
@@ -151,7 +148,6 @@ static struct __initdata resource omap7xx_gpio3_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 64,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};
@@ -180,7 +176,6 @@ static struct __initdata resource omap7xx_gpio4_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 96,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};
@@ -209,7 +204,6 @@ static struct __initdata resource omap7xx_gpio5_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 128,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};
@@ -238,7 +232,6 @@ static struct __initdata resource omap7xx_gpio6_resources[] = { 
};



static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = {

	.virtual_irq_start	= IH_GPIO_BASE + 160,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};

arch/arm/mach-omap2/gpio.c

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
	dev_attr = (struct omap_gpio_dev_attr *)oh->dev_attr;

	pdata->bank_width = dev_attr->bank_width;

	pdata->dbck_flag = dev_attr->dbck_flag;

	pdata->virtual_irq_start = IH_GPIO_BASE + 32 * (id - 1);

	pdata->get_context_loss_count = omap_pm_get_dev_context_loss_count;

	pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);

	if (!pdata) {
@@ -102,6 +101,8 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		pdata->regs->dataout = OMAP4_GPIO_DATAOUT;

		pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT;

		pdata->regs->clr_dataout = OMAP4_GPIO_CLEARDATAOUT;

		pdata->regs->irqstatus_raw0 = OMAP4_GPIO_IRQSTATUSRAW0;

		pdata->regs->irqstatus_raw1 = OMAP4_GPIO_IRQSTATUSRAW1;

		pdata->regs->irqstatus = OMAP4_GPIO_IRQSTATUS0;

		pdata->regs->irqstatus2 = OMAP4_GPIO_IRQSTATUS1;

		pdata->regs->irqenable = OMAP4_GPIO_IRQSTATUSSET0;

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

+2 −1
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ struct omap_gpio_reg_offs { 
	u16 clr_dataout;

	u16 irqstatus;

	u16 irqstatus2;

	u16 irqstatus_raw0;

	u16 irqstatus_raw1;

	u16 irqenable;

	u16 irqenable2;

	u16 set_irqenable;
@@ -193,7 +195,6 @@ struct omap_gpio_reg_offs { 
};



struct omap_gpio_platform_data {

	u16 virtual_irq_start;

	int bank_type;

	int bank_width;		/* GPIO bank width */

	int bank_stride;	/* Only needed for omap1 MPUIO */