shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3168:ds1006h: move key config to board-rk3168-ds1006h.c

Browse Source
This commit is contained in:
kfx
2012-12-31 09:50:42 +08:00
parent aa3ce52a11
commit b57db18d94
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/mach-rk30/board-rk3168-ds1006h-key.c
View File

@@ -1,31 +0,0 @@
#include <mach/gpio.h>
#include <plat/key.h>
#define EV_ENCALL KEY_F4
#define EV_MENU KEY_F1
#define PRESS_LEV_LOW 1
#define PRESS_LEV_HIGH 0
static struct rk29_keys_button key_button[] = {
{
.desc = "play",
.code = KEY_POWER,
.gpio = RK30_PIN0_PA4,
.active_low = PRESS_LEV_LOW,
.wakeup = 1,
},
{
.desc = "esc",
.code = KEY_BACK,
.adc_value = 1,
.gpio = INVALID_GPIO,
.active_low = PRESS_LEV_LOW,
},
};
struct rk29_keys_platform_data rk29_keys_pdata = {
.buttons = key_button,
.nbuttons = ARRAY_SIZE(key_button),
.chn = 1, //chn: 0-7, if do not use ADC,set 'chn' -1
};

30
arch/arm/mach-rk30/board-rk3168-ds1006h.c
View File

@@ -76,7 +76,29 @@
#endif
#include "board-rk3168-ds1006h-camera.c"
#include "board-rk3168-ds1006h-key.c"
#include <plat/key.h>
static struct rk29_keys_button key_button[] = {
{
.desc = "play",
.code = KEY_POWER,
.gpio = RK30_PIN0_PA4,
.active_low = PRESS_LEV_LOW,
.wakeup = 1,
},
{
.desc = "esc",
.code = KEY_BACK,
.adc_value = 1,
.gpio = INVALID_GPIO,
.active_low = PRESS_LEV_LOW,
},
};
struct rk29_keys_platform_data rk29_keys_pdata = {
.buttons = key_button,
.nbuttons = ARRAY_SIZE(key_button),
.chn = 1, //chn: 0-7, if do not use ADC,set 'chn' -1
};
#if defined(CONFIG_CT36X_TS)
@@ -123,7 +145,8 @@ static int rk29_backlight_io_init(void)
{
int ret = 0;
iomux_set(PWM_MODE);
int pwm_gpio;
//iomux_set(PWM_MODE);
#ifdef LCD_DISP_ON_PIN
ret = gpio_request(BL_EN_PIN, NULL);
if (ret != 0) {
@@ -133,6 +156,9 @@ static int rk29_backlight_io_init(void)
gpio_direction_output(BL_EN_PIN, 0);
gpio_set_value(BL_EN_PIN, BL_EN_VALUE);
#endif
pwm_gpio = mode_to_gpio(PWM_MODE);
gpio_request(pwm_gpio, NULL);
gpio_direction_output(pwm_gpio, GPIO_HIGH);
return ret;
}