modify play/wakeup key and lcd backlight

diff --git a/arch/arm/mach-rk2818/board-phonesdk.c b/arch/arm/mach-rk2818/board-phonesdk.c
old mode 100644 (file)
new mode 100755 (executable)
index 401bd72..c65f561
--- a/arch/arm/mach-rk2818/board-phonesdk.c
+++ b/arch/arm/mach-rk2818/board-phonesdk.c
@@ -444,9 +444,9 @@ struct rk2818_fb_mach_info rk2818_fb_mach_info = {
 
 struct rk2818bl_info rk2818_bl_info = {
         .pwm_id   = 0,
-        .pw_pin   = GPIO_HIGH | (RK2818_PIN_PA3<< 8) ,
+        .pw_pin   = GPIO_HIGH | (RK2818_PIN_PF4<< 8) ,
         .bl_ref   = 0,
-        .pw_iomux = GPIOA23_UART2_SEL_NAME,
+        .pw_iomux = GPIOF34_UART3_SEL_NAME,
 };
 
 static struct platform_device *devices[] __initdata = {

diff --git a/drivers/input/keyboard/rk2818_adckey.c b/drivers/input/keyboard/rk2818_adckey.c
index 3fe99d23fa5759a93964dca5265712a6d1293fde..33c87fd8da983fa9081bcf25e5b04297b0d2bc49 100755 (executable)
--- a/drivers/input/keyboard/rk2818_adckey.c
+++ b/drivers/input/keyboard/rk2818_adckey.c
@@ -44,7 +44,11 @@
 #define ENDCALL                                        62
 #define        KEYSTART                                28                      //ENTER
 #define KEYMENU                                        AD2KEY6         ///CALL
+#ifndef CONFIG_MACH_RK2818PHONE
 #define KEY_PLAYON_PIN                 RK2818_PIN_PE1
+#else
+#define KEY_PLAYON_PIN                 RK2818_PIN_PA3
+#endif
 #define        KEY_PLAY_SHORT_PRESS    KEYSTART        //code for short press the play key
 #define        KEY_PLAY_LONG_PRESS             ENDCALL         //code for long press the play key
 
@@ -59,7 +63,11 @@
 #define ADKEYNUM               10
 
 #define ADKEYCH                        1       //ADͨµÀ
+#ifndef CONFIG_MACH_RK2818PHONE
 #define KEYPLAY_ON             0       //°´¼ü½ÓͨʱµÄµçƽֵ
+#else
+#define KEYPLAY_ON             1       //°´¼ü½ÓͨʱµÄµçƽֵ
+#endif
 #define KEY_PHYS_NAME  "rk2818_adckey/input0"
 
 volatile int gADSampleTimes = 0;