public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios

Browse source 
This change converts TSC2005 related GPIO requests to be done with
gpio_request_array() method and explicitly inits mux configuration for
these GPIOs.

Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Vladimir Zapolskiy 2012-03-05 11:08:35 -08:00 • committed by Tony Lindgren
parent afbb1893ef
commit d4860ebef4
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm/mach-omap2/board-rx51-peripherals.c
View file

@ -1105,6 +1105,11 @@ static struct tsc2005_platform_data tsc2005_pdata = {
.esd_timeout_ms = 8000, .esd_timeout_ms = 8000,
}; };
static struct gpio rx51_tsc2005_gpios[] __initdata = {
{ RX51_TSC2005_IRQ_GPIO, GPIOF_IN, "tsc2005 IRQ" },
{ RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "tsc2005 reset" },
};
static void rx51_tsc2005_set_reset(bool enable) static void rx51_tsc2005_set_reset(bool enable)
{ {
gpio_set_value(RX51_TSC2005_RESET_GPIO, enable); gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
@ -1114,20 +1119,18 @@ static void __init rx51_init_tsc2005(void)
{ {
int r; int r;
r = gpio_request_one(RX51_TSC2005_IRQ_GPIO, GPIOF_IN, "tsc2005 IRQ"); omap_mux_init_gpio(RX51_TSC2005_RESET_GPIO, OMAP_PIN_OUTPUT);
omap_mux_init_gpio(RX51_TSC2005_IRQ_GPIO, OMAP_PIN_INPUT_PULLUP);
r = gpio_request_array(rx51_tsc2005_gpios,
ARRAY_SIZE(rx51_tsc2005_gpios));
if (r < 0) { if (r < 0) {
printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ"); printk(KERN_ERR "tsc2005 board initialization failed\n");
rx51_peripherals_spi_board_info[RX51_SPI_TSC2005].irq = 0; tsc2005_pdata.esd_timeout_ms = 0;
return;
} }
r = gpio_request_one(RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
"tsc2005 reset");
if (r >= 0) {
tsc2005_pdata.set_reset = rx51_tsc2005_set_reset; tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
} else {
printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");
tsc2005_pdata.esd_timeout_ms = 0;
}
} }
void __init rx51_peripherals_init(void) void __init rx51_peripherals_init(void)