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

Commit e5ff4440 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

gpio/omap: cleanup show revision, remove cpu_is checks, display only once 



Remove cpu_is_* checks from gpio_show_revision() by passing in the
revision address offset from platform data.  SoCs with no revision
register (15xx, 7xx, and all MPUIOs) use -1 (actually, USHRT_MAX) to
signify no register.

While here, all GPIO banks are assumed to be the same revision, so fix
show_revision() to only show the revision for the first bank it finds.
This removes duplicate GPIO revision prints during boot.

Thanks to Charulatha V <charu@ti.com> for finding/fixing a few -1s
that were missed in the original patch.

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

arch/arm/mach-omap1/gpio15xx.c

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 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,
@@ -75,6 +76,7 @@ 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,

arch/arm/mach-omap1/gpio16xx.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 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,
@@ -78,6 +79,7 @@ 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,

arch/arm/mach-omap1/gpio7xx.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 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,
@@ -80,6 +81,7 @@ 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,

arch/arm/mach-omap2/gpio.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
	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;
@@ -86,6 +87,7 @@ static int omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		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;

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

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ struct omap_gpio_dev_attr { 
};



struct omap_gpio_reg_offs {

	u16 revision;

	u16 direction;

	u16 datain;

	u16 dataout;