| From f1f2cdcdd22c1c750f6cee76e6af0ce531fa5b21 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 22 Apr 2012 23:54:14 -0700 |
| Subject: ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key |
| |
| This patch adds extra GPIO via PCF8757 chip, |
| and use it as gpio-key. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Tested-by: Simon Horman <horms@verge.net.au> |
| Acked-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit d5fbabd3d5ab8c06d4f576efb63cd2af65a729ae) |
| |
| Conflicts: |
| |
| arch/arm/mach-shmobile/board-kzm9g.c |
| |
| N.B: Not present in mainline yet |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-kzm9g.c | 59 ++++++++++++++++++++++++++++++++++++ |
| 1 file changed, 59 insertions(+) |
| |
| diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c |
| index a964e56..7289ed5 100644 |
| --- a/arch/arm/mach-shmobile/board-kzm9g.c |
| +++ b/arch/arm/mach-shmobile/board-kzm9g.c |
| @@ -19,9 +19,12 @@ |
| |
| #include <linux/delay.h> |
| #include <linux/gpio.h> |
| +#include <linux/gpio_keys.h> |
| #include <linux/io.h> |
| #include <linux/irq.h> |
| #include <linux/i2c.h> |
| +#include <linux/i2c/pcf857x.h> |
| +#include <linux/input.h> |
| #include <linux/mmc/host.h> |
| #include <linux/mmc/sh_mmcif.h> |
| #include <linux/mmc/sh_mobile_sdhi.h> |
| @@ -37,6 +40,18 @@ |
| #include <asm/mach/arch.h> |
| #include <video/sh_mobile_lcdc.h> |
| |
| +/* |
| + * external GPIO |
| + */ |
| +#define GPIO_PCF8575_BASE (GPIO_NR) |
| +#define GPIO_PCF8575_PORT10 (GPIO_NR + 8) |
| +#define GPIO_PCF8575_PORT11 (GPIO_NR + 9) |
| +#define GPIO_PCF8575_PORT12 (GPIO_NR + 10) |
| +#define GPIO_PCF8575_PORT13 (GPIO_NR + 11) |
| +#define GPIO_PCF8575_PORT14 (GPIO_NR + 12) |
| +#define GPIO_PCF8575_PORT15 (GPIO_NR + 13) |
| +#define GPIO_PCF8575_PORT16 (GPIO_NR + 14) |
| + |
| /* LCDC */ |
| static struct fb_videomode kzm_lcdc_mode = { |
| .name = "WVGA Panel", |
| @@ -165,7 +180,38 @@ static struct platform_device sdhi0_device = { |
| }, |
| }; |
| |
| +/* KEY */ |
| +#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 } |
| + |
| +static struct gpio_keys_button gpio_buttons[] = { |
| + GPIO_KEY(KEY_BACK, GPIO_PCF8575_PORT10, "SW3"), |
| + GPIO_KEY(KEY_RIGHT, GPIO_PCF8575_PORT11, "SW2-R"), |
| + GPIO_KEY(KEY_LEFT, GPIO_PCF8575_PORT12, "SW2-L"), |
| + GPIO_KEY(KEY_ENTER, GPIO_PCF8575_PORT13, "SW2-P"), |
| + GPIO_KEY(KEY_UP, GPIO_PCF8575_PORT14, "SW2-U"), |
| + GPIO_KEY(KEY_DOWN, GPIO_PCF8575_PORT15, "SW2-D"), |
| + GPIO_KEY(KEY_HOME, GPIO_PCF8575_PORT16, "SW1"), |
| +}; |
| + |
| +static struct gpio_keys_platform_data gpio_key_info = { |
| + .buttons = gpio_buttons, |
| + .nbuttons = ARRAY_SIZE(gpio_buttons), |
| + .poll_interval = 250, /* poling at this point */ |
| +}; |
| + |
| +static struct platform_device gpio_keys_device = { |
| + /* gpio-pcf857x.c driver doesn't support gpio_to_irq() */ |
| + .name = "gpio-keys-polled", |
| + .dev = { |
| + .platform_data = &gpio_key_info, |
| + }, |
| +}; |
| + |
| /* I2C */ |
| +static struct pcf857x_platform_data pcf8575_pdata = { |
| + .gpio_base = GPIO_PCF8575_BASE, |
| +}; |
| + |
| static struct i2c_board_info i2c1_devices[] = { |
| { |
| I2C_BOARD_INFO("st1232-ts", 0x55), |
| @@ -173,10 +219,18 @@ static struct i2c_board_info i2c1_devices[] = { |
| }, |
| }; |
| |
| +static struct i2c_board_info i2c3_devices[] = { |
| + { |
| + I2C_BOARD_INFO("pcf8575", 0x20), |
| + .platform_data = &pcf8575_pdata, |
| + }, |
| +}; |
| + |
| static struct platform_device *kzm_devices[] __initdata = { |
| &lcdc_device, |
| &mmc_device, |
| &sdhi0_device, |
| + &gpio_keys_device, |
| }; |
| |
| /* |
| @@ -304,12 +358,17 @@ static void __init kzm_init(void) |
| gpio_request(GPIO_PORT15, NULL); |
| gpio_direction_output(GPIO_PORT15, 1); /* power */ |
| |
| + /* I2C 3 */ |
| + gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL); |
| + gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL); |
| + |
| #ifdef CONFIG_CACHE_L2X0 |
| /* Early BRESP enable, Shared attribute override enable, 64K*8way */ |
| l2x0_init(__io(0xf0100000), 0x40460000, 0x82000fff); |
| #endif |
| |
| i2c_register_board_info(1, i2c1_devices, ARRAY_SIZE(i2c1_devices)); |
| + i2c_register_board_info(3, i2c3_devices, ARRAY_SIZE(i2c3_devices)); |
| |
| sh73a0_add_standard_devices(); |
| platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices)); |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |