Commit cbaf7f80 authored by Bastian Hecht's avatar Bastian Hecht Committed by Dmitry Torokhov

ARM - shmobile: Armadillo800EVA: Move st1232 reset pin handling

We no longer need to set up the reset pin for the st1232 in the board
code, but can pass the GPIO number via the platform data to the driver.
This results in a cleaner grouping of the device setup.
Signed-off-by: default avatarBastian Hecht <hechtb+renesas@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e6a90810
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/platform_data/st1232_pdata.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/gpio.h> #include <linux/gpio.h>
...@@ -878,10 +879,15 @@ static struct platform_device i2c_gpio_device = { ...@@ -878,10 +879,15 @@ static struct platform_device i2c_gpio_device = {
}; };
/* I2C */ /* I2C */
static struct st1232_pdata st1232_i2c0_pdata = {
.reset_gpio = 166,
};
static struct i2c_board_info i2c0_devices[] = { static struct i2c_board_info i2c0_devices[] = {
{ {
I2C_BOARD_INFO("st1232-ts", 0x55), I2C_BOARD_INFO("st1232-ts", 0x55),
.irq = evt2irq(0x0340), .irq = evt2irq(0x0340),
.platform_data = &st1232_i2c0_pdata,
}, },
{ {
I2C_BOARD_INFO("wm8978", 0x1a), I2C_BOARD_INFO("wm8978", 0x1a),
...@@ -1005,7 +1011,6 @@ static void __init eva_init(void) ...@@ -1005,7 +1011,6 @@ static void __init eva_init(void)
/* Touchscreen */ /* Touchscreen */
gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */ gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */
gpio_request_one(GPIO_PORT166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
/* GETHER */ /* GETHER */
gpio_request(GPIO_FN_ET_CRS, NULL); gpio_request(GPIO_FN_ET_CRS, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment