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

Commit 686b634a authored May 01, 2010 by Cyril Chemparathy Committed by Kevin Hilman May 06, 2010

Davinci: gpio - controller type support



This patch allows for gpio controllers that deviate from those found on
traditional davinci socs.  davinci_soc_info has an added field to indicate the
soc-specific gpio controller type.  The gpio initialization code then bails
out if necessary.

More elements (tnetv107x) to be added later into enum davinci_gpio_type.

Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Tested-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

parent c12f415a

arch/arm/mach-davinci/da830.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <mach/common.h>		#include <mach/common.h>
	#include <mach/time.h>		#include <mach/time.h>
	#include <mach/da8xx.h>		#include <mach/da8xx.h>
			#include <mach/gpio.h>

	#include "clock.h"		#include "clock.h"
	#include "mux.h"		#include "mux.h"
	@@ -1199,6 +1200,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = {
	.intc_irq_prios = da830_default_priorities,		.intc_irq_prios = da830_default_priorities,
	.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_base = IO_ADDRESS(DA8XX_GPIO_BASE),		.gpio_base = IO_ADDRESS(DA8XX_GPIO_BASE),
	.gpio_num = 128,		.gpio_num = 128,
	.gpio_irq = IRQ_DA8XX_GPIO0,		.gpio_irq = IRQ_DA8XX_GPIO0,

arch/arm/mach-davinci/da850.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@
	#include <mach/da8xx.h>		#include <mach/da8xx.h>
	#include <mach/cpufreq.h>		#include <mach/cpufreq.h>
	#include <mach/pm.h>		#include <mach/pm.h>
			#include <mach/gpio.h>

	#include "clock.h"		#include "clock.h"
	#include "mux.h"		#include "mux.h"
	@@ -1084,6 +1085,7 @@ static struct davinci_soc_info davinci_soc_info_da850 = {
	.intc_irq_prios = da850_default_priorities,		.intc_irq_prios = da850_default_priorities,
	.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_base = IO_ADDRESS(DA8XX_GPIO_BASE),		.gpio_base = IO_ADDRESS(DA8XX_GPIO_BASE),
	.gpio_num = 144,		.gpio_num = 144,
	.gpio_irq = IRQ_DA8XX_GPIO0,		.gpio_irq = IRQ_DA8XX_GPIO0,

arch/arm/mach-davinci/dm355.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -859,6 +859,7 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
	.intc_irq_prios = dm355_default_priorities,		.intc_irq_prios = dm355_default_priorities,
	.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_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),
	.gpio_num = 104,		.gpio_num = 104,
	.gpio_irq = IRQ_DM355_GPIOBNK0,		.gpio_irq = IRQ_DM355_GPIOBNK0,

arch/arm/mach-davinci/dm365.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1064,6 +1064,7 @@ static struct davinci_soc_info davinci_soc_info_dm365 = {
	.intc_irq_prios = dm365_default_priorities,		.intc_irq_prios = dm365_default_priorities,
	.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_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),
	.gpio_num = 104,		.gpio_num = 104,
	.gpio_irq = IRQ_DM365_GPIO0,		.gpio_irq = IRQ_DM365_GPIO0,

arch/arm/mach-davinci/dm644x.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -748,6 +748,7 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {
	.intc_irq_prios = dm644x_default_priorities,		.intc_irq_prios = dm644x_default_priorities,
	.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_base = IO_ADDRESS(DAVINCI_GPIO_BASE),		.gpio_base = IO_ADDRESS(DAVINCI_GPIO_BASE),
	.gpio_num = 71,		.gpio_num = 71,
	.gpio_irq = IRQ_GPIOBNK0,		.gpio_irq = IRQ_GPIOBNK0,