From: kfx Date: Sat, 1 Dec 2012 07:16:01 +0000 (+0800) Subject: rk2928_defconfig: add 'module_param(gs_type, int, 0644)' X-Git-Tag: firefly_0821_release~8146 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9de7ff86845dfe8ed945dad2f39d2c09735a4c05;p=firefly-linux-kernel-4.4.55.git rk2928_defconfig: add 'module_param(gs_type, int, 0644)' --- diff --git a/arch/arm/mach-rk2928/board-rk2928-config.c b/arch/arm/mach-rk2928/board-rk2928-config.c index 3d4ddcdbf7ee..125d498820bb 100644 --- a/arch/arm/mach-rk2928/board-rk2928-config.c +++ b/arch/arm/mach-rk2928/board-rk2928-config.c @@ -158,7 +158,7 @@ static inline int check_lcd_param(void) /* gsensor */ static int gs_type = DEF_GS_TYPE; - +module_param(gs_type, int, 0644); static int gs_i2c = DEF_GS_I2C; module_param(gs_i2c, int, 0644); static int gs_addr = DEF_GS_ADDR; diff --git a/arch/arm/mach-rk2928/include/mach/config.h b/arch/arm/mach-rk2928/include/mach/config.h index 761a7a9ec810..f25790052f38 100755 --- a/arch/arm/mach-rk2928/include/mach/config.h +++ b/arch/arm/mach-rk2928/include/mach/config.h @@ -2,12 +2,12 @@ #define __MACH_CONFIG_H #include -#define RK2926_TB_DEFAULT_CONFIG +//#define RK2926_TB_DEFAULT_CONFIG //#define RK2928_TB_DEFAULT_CONFIG //#define RK2926_V86_DEFAULT_CONFIG //#define RK2926_SDK_DEFAULT_CONFIG //#define RK2928_SDK_DEFAULT_CONFIG -//#define RK2928_PHONEPAD_DEFAULT_CONFIG +#define RK2928_PHONEPAD_DEFAULT_CONFIG /* camera id */ @@ -901,13 +901,13 @@ enum { /* keyboard */ enum{ DEF_KEY_ADC = -1, - DEF_PLAY_KEY = -1, - DEF_VOLDN_KEY = -1, - DEF_VOLUP_KEY = 0, - DEF_MENU_KEY = 0, - DEF_ESC_KEY = 0, - DEF_HOME_KEY = 0, - DEF_CAM_KEY = 0, + DEF_PLAY_KEY = 0x80000000, + DEF_VOLDN_KEY = 0x80000000, + DEF_VOLUP_KEY = 0x80000000, + DEF_MENU_KEY = 0x80000000, + DEF_ESC_KEY = 0x80000000, + DEF_HOME_KEY = 0x80000000, + DEF_CAM_KEY = 0x80000000, }; /* backlight */ enum{