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

This project is archived. Its data is read-only.

Commit b8d44293 authored May 07, 2010 by Cyril Chemparathy Committed by Kevin Hilman May 13, 2010

Davinci: gpio - use ioremap()



This patch modifies the gpio_base definition in davinci_soc_info to be a
physical address, which is then ioremap()ed by the gpio initialization
function.

Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

parent a6374f53

arch/arm/mach-davinci/da830.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1201,7 +1201,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = {
	.intc_irq_num = DA830_N_CP_INTC_IRQ,		.intc_irq_num = DA830_N_CP_INTC_IRQ,
	.timer_info = &da830_timer_info,		.timer_info = &da830_timer_info,
	.gpio_type = GPIO_TYPE_DAVINCI,		.gpio_type = GPIO_TYPE_DAVINCI,
	.gpio_base = IO_ADDRESS(DA8XX_GPIO_BASE),		.gpio_base = DA8XX_GPIO_BASE,
	.gpio_num = 128,		.gpio_num = 128,
	.gpio_irq = IRQ_DA8XX_GPIO0,		.gpio_irq = IRQ_DA8XX_GPIO0,
	.serial_dev = &da8xx_serial_device,		.serial_dev = &da8xx_serial_device,

arch/arm/mach-davinci/da850.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1086,7 +1086,7 @@ static struct davinci_soc_info davinci_soc_info_da850 = {
	.intc_irq_num = DA850_N_CP_INTC_IRQ,		.intc_irq_num = DA850_N_CP_INTC_IRQ,
	.timer_info = &da850_timer_info,		.timer_info = &da850_timer_info,
	.gpio_type = GPIO_TYPE_DAVINCI,		.gpio_type = GPIO_TYPE_DAVINCI,
	.gpio_base = IO_ADDRESS(DA8XX_GPIO_BASE),		.gpio_base = DA8XX_GPIO_BASE,
	.gpio_num = 144,		.gpio_num = 144,
	.gpio_irq = IRQ_DA8XX_GPIO0,		.gpio_irq = IRQ_DA8XX_GPIO0,
	.serial_dev = &da8xx_serial_device,		.serial_dev = &da8xx_serial_device,

arch/arm/mach-davinci/dm355.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -855,7 +855,7 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
	.intc_irq_num = DAVINCI_N_AINTC_IRQ,		.intc_irq_num = DAVINCI_N_AINTC_IRQ,
	.timer_info = &dm355_timer_info,		.timer_info = &dm355_timer_info,
	.gpio_type = GPIO_TYPE_DAVINCI,		.gpio_type = GPIO_TYPE_DAVINCI,
	.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = DAVINCI_GPIO_BASE,
	.gpio_num = 104,		.gpio_num = 104,
	.gpio_irq = IRQ_DM355_GPIOBNK0,		.gpio_irq = IRQ_DM355_GPIOBNK0,
	.serial_dev = &dm355_serial_device,		.serial_dev = &dm355_serial_device,

arch/arm/mach-davinci/dm365.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1060,7 +1060,7 @@ static struct davinci_soc_info davinci_soc_info_dm365 = {
	.intc_irq_num = DAVINCI_N_AINTC_IRQ,		.intc_irq_num = DAVINCI_N_AINTC_IRQ,
	.timer_info = &dm365_timer_info,		.timer_info = &dm365_timer_info,
	.gpio_type = GPIO_TYPE_DAVINCI,		.gpio_type = GPIO_TYPE_DAVINCI,
	.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = DAVINCI_GPIO_BASE,
	.gpio_num = 104,		.gpio_num = 104,
	.gpio_irq = IRQ_DM365_GPIO0,		.gpio_irq = IRQ_DM365_GPIO0,
	.gpio_unbanked = 8, /* really 16 ... skip muxed GPIOs */		.gpio_unbanked = 8, /* really 16 ... skip muxed GPIOs */

arch/arm/mach-davinci/dm644x.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -746,7 +746,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {
	.intc_irq_num = DAVINCI_N_AINTC_IRQ,		.intc_irq_num = DAVINCI_N_AINTC_IRQ,
	.timer_info = &dm644x_timer_info,		.timer_info = &dm644x_timer_info,
	.gpio_type = GPIO_TYPE_DAVINCI,		.gpio_type = GPIO_TYPE_DAVINCI,
	.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = DAVINCI_GPIO_BASE,
	.gpio_num = 71,		.gpio_num = 71,
	.gpio_irq = IRQ_GPIOBNK0,		.gpio_irq = IRQ_GPIOBNK0,
	.serial_dev = &dm644x_serial_device,		.serial_dev = &dm644x_serial_device,