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

Commit 8e46ea3e authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'for_3.1/gpio-cleanup' of... 

Merge branch 'for_3.1/gpio-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
parents 2bc7c852 e5ff4440

arch/arm/mach-omap1/gpio15xx.c

+22 −0
Original line number Diff line number Diff line
@@ -34,11 +34,22 @@ static struct __initdata resource omap15xx_mpu_gpio_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {

	.revision       = USHRT_MAX,

	.direction	= OMAP_MPUIO_IO_CNTL,

	.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 = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.bank_type		= METHOD_MPUIO,

	.bank_width		= 16,

	.bank_stride		= 1,

	.regs			= &omap15xx_mpuio_regs,

};



static struct __initdata platform_device omap15xx_mpu_gpio = {
@@ -64,10 +75,21 @@ static struct __initdata resource omap15xx_gpio_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap15xx_gpio_regs = {

	.revision	= USHRT_MAX,

	.direction	= OMAP1510_GPIO_DIR_CONTROL,

	.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 = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_type		= METHOD_GPIO_1510,

	.bank_width		= 16,

	.regs                   = &omap15xx_gpio_regs,

};



static struct __initdata platform_device omap15xx_gpio = {

arch/arm/mach-omap1/gpio16xx.c

+28 −0
Original line number Diff line number Diff line
@@ -37,11 +37,22 @@ static struct __initdata resource omap16xx_mpu_gpio_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap16xx_mpuio_regs = {

	.revision       = USHRT_MAX,

	.direction	= OMAP_MPUIO_IO_CNTL,

	.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 = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.bank_type		= METHOD_MPUIO,

	.bank_width		= 16,

	.bank_stride		= 1,

	.regs                   = &omap16xx_mpuio_regs,

};



static struct __initdata platform_device omap16xx_mpu_gpio = {
@@ -67,10 +78,24 @@ static struct __initdata resource omap16xx_gpio1_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap16xx_gpio_regs = {

	.revision       = OMAP1610_GPIO_REVISION,

	.direction	= OMAP1610_GPIO_DIRECTION,

	.set_dataout	= OMAP1610_GPIO_SET_DATAOUT,

	.clr_dataout	= OMAP1610_GPIO_CLEAR_DATAOUT,

	.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 = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_type		= METHOD_GPIO_1610,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};



static struct __initdata platform_device omap16xx_gpio1 = {
@@ -100,6 +125,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 16,

	.bank_type		= METHOD_GPIO_1610,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};



static struct __initdata platform_device omap16xx_gpio2 = {
@@ -129,6 +155,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 32,

	.bank_type		= METHOD_GPIO_1610,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};



static struct __initdata platform_device omap16xx_gpio3 = {
@@ -158,6 +185,7 @@ static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 48,

	.bank_type		= METHOD_GPIO_1610,

	.bank_width		= 16,

	.regs                   = &omap16xx_gpio_regs,

};



static struct __initdata platform_device omap16xx_gpio4 = {

arch/arm/mach-omap1/gpio7xx.c

+27 −0
Original line number Diff line number Diff line
@@ -39,11 +39,22 @@ static struct __initdata resource omap7xx_mpu_gpio_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {

	.revision	= USHRT_MAX,

	.direction	= OMAP_MPUIO_IO_CNTL / 2,

	.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 = {

	.virtual_irq_start	= IH_MPUIO_BASE,

	.bank_type		= METHOD_MPUIO,

	.bank_width		= 32,

	.bank_stride		= 2,

	.regs                   = &omap7xx_mpuio_regs,

};



static struct __initdata platform_device omap7xx_mpu_gpio = {
@@ -69,10 +80,21 @@ static struct __initdata resource omap7xx_gpio1_resources[] = { 
	},

};



static struct omap_gpio_reg_offs omap7xx_gpio_regs = {

	.revision	= USHRT_MAX,

	.direction	= OMAP7XX_GPIO_DIR_CONTROL,

	.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 = {

	.virtual_irq_start	= IH_GPIO_BASE,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio1 = {
@@ -102,6 +124,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 32,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio2 = {
@@ -131,6 +154,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 64,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio3 = {
@@ -160,6 +184,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 96,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio4 = {
@@ -189,6 +214,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 128,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio5 = {
@@ -218,6 +244,7 @@ static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = { 
	.virtual_irq_start	= IH_GPIO_BASE + 160,

	.bank_type		= METHOD_GPIO_7XX,

	.bank_width		= 32,

	.regs			= &omap7xx_gpio_regs,

};



static struct __initdata platform_device omap7xx_gpio6 = {

arch/arm/mach-omap2/gpio.c

+32 −0
Original line number Diff line number Diff line
@@ -61,13 +61,45 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
	pdata->dbck_flag = dev_attr->dbck_flag;

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



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

	if (!pdata) {

		pr_err("gpio%d: Memory allocation failed\n", id);

		return -ENOMEM;

	}



	switch (oh->class->rev) {

	case 0:

	case 1:

		pdata->bank_type = METHOD_GPIO_24XX;

		pdata->regs->revision = OMAP24XX_GPIO_REVISION;

		pdata->regs->direction = OMAP24XX_GPIO_OE;

		pdata->regs->datain = OMAP24XX_GPIO_DATAIN;

		pdata->regs->dataout = OMAP24XX_GPIO_DATAOUT;

		pdata->regs->set_dataout = OMAP24XX_GPIO_SETDATAOUT;

		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;

		pdata->regs->debounce = OMAP24XX_GPIO_DEBOUNCE_VAL;

		pdata->regs->debounce_en = OMAP24XX_GPIO_DEBOUNCE_EN;

		break;

	case 2:

		pdata->bank_type = METHOD_GPIO_44XX;

		pdata->regs->revision = OMAP4_GPIO_REVISION;

		pdata->regs->direction = OMAP4_GPIO_OE;

		pdata->regs->datain = OMAP4_GPIO_DATAIN;

		pdata->regs->dataout = OMAP4_GPIO_DATAOUT;

		pdata->regs->set_dataout = OMAP4_GPIO_SETDATAOUT;

		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;

		pdata->regs->debounce = OMAP4_GPIO_DEBOUNCINGTIME;

		pdata->regs->debounce_en = OMAP4_GPIO_DEBOUNCENABLE;

		break;

	default:

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

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

+20 −0
Original line number Diff line number Diff line
@@ -174,12 +174,32 @@ struct omap_gpio_dev_attr { 
	bool dbck_flag;		/* dbck required or not - True for OMAP3&4 */

};



struct omap_gpio_reg_offs {

	u16 revision;

	u16 direction;

	u16 datain;

	u16 dataout;

	u16 set_dataout;

	u16 clr_dataout;

	u16 irqstatus;

	u16 irqstatus2;

	u16 irqenable;

	u16 set_irqenable;

	u16 clr_irqenable;

	u16 debounce;

	u16 debounce_en;



	bool irqenable_inv;

};



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 */

	bool dbck_flag;		/* dbck required or not - True for OMAP3&4 */



	struct omap_gpio_reg_offs *regs;

};



/* TODO: Analyze removing gpio_bank_count usage from driver code */