提交 2a555582 编写于 作者: J Joonyoung Shim 提交者: Kukjin Kim

ARM: S5PV210: Add keypad device to the GONI board

This patch is to support keypad device to the GONI board.
Signed-off-by: NJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 8f3b9cff
...@@ -84,7 +84,9 @@ config MACH_GONI ...@@ -84,7 +84,9 @@ config MACH_GONI
select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select S5P_DEV_ONENAND select S5P_DEV_ONENAND
select SAMSUNG_DEV_KEYPAD
select S5PV210_SETUP_FB_24BPP select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI select S5PV210_SETUP_SDHCI
help help
Machine support for Samsung GONI board Machine support for Samsung GONI board
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <plat/devs.h> #include <plat/devs.h>
#include <plat/cpu.h> #include <plat/cpu.h>
#include <plat/fb.h> #include <plat/fb.h>
#include <plat/keypad.h>
#include <plat/sdhci.h> #include <plat/sdhci.h>
/* Following are default values for UCON, ULCON and UFCON UART registers */ /* Following are default values for UCON, ULCON and UFCON UART registers */
...@@ -111,6 +112,28 @@ static struct s3c_fb_platdata goni_lcd_pdata __initdata = { ...@@ -111,6 +112,28 @@ static struct s3c_fb_platdata goni_lcd_pdata __initdata = {
.setup_gpio = s5pv210_fb_gpio_setup_24bpp, .setup_gpio = s5pv210_fb_gpio_setup_24bpp,
}; };
/* KEYPAD */
static uint32_t keymap[] __initdata = {
/* KEY(row, col, keycode) */
KEY(0, 1, KEY_MENU), /* Send */
KEY(0, 2, KEY_BACK), /* End */
KEY(1, 1, KEY_CONFIG), /* Half shot */
KEY(1, 2, KEY_VOLUMEUP),
KEY(2, 1, KEY_CAMERA), /* Full shot */
KEY(2, 2, KEY_VOLUMEDOWN),
};
static struct matrix_keymap_data keymap_data __initdata = {
.keymap = keymap,
.keymap_size = ARRAY_SIZE(keymap),
};
static struct samsung_keypad_platdata keypad_data __initdata = {
.keymap_data = &keymap_data,
.rows = 3,
.cols = 3,
};
/* MAX8998 regulators */ /* MAX8998 regulators */
#if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE) #if defined(CONFIG_REGULATOR_MAX8998) || defined(CONFIG_REGULATOR_MAX8998_MODULE)
...@@ -465,6 +488,7 @@ static struct platform_device *goni_devices[] __initdata = { ...@@ -465,6 +488,7 @@ static struct platform_device *goni_devices[] __initdata = {
&s3c_device_hsmmc0, &s3c_device_hsmmc0,
&s3c_device_hsmmc1, &s3c_device_hsmmc1,
&s3c_device_hsmmc2, &s3c_device_hsmmc2,
&samsung_device_keypad,
}; };
static void __init goni_map_io(void) static void __init goni_map_io(void)
...@@ -486,6 +510,9 @@ static void __init goni_machine_init(void) ...@@ -486,6 +510,9 @@ static void __init goni_machine_init(void)
/* FB */ /* FB */
s3c_fb_set_platdata(&goni_lcd_pdata); s3c_fb_set_platdata(&goni_lcd_pdata);
/* KEYPAD */
samsung_keypad_set_platdata(&keypad_data);
platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices)); platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册