Revert "modify playon key gpio"

This reverts commit 77d6dd51f9418632678f3c69b3a588df3d36fae4.

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 34d7751ff50e3da54c0693c29e728c219069c49b..1442b3bebaee96f2c91edc3775fe3c093b445ad3 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -108,7 +108,7 @@ CHECKFLAGS  += -D__arm__
 
 #Default value
 head-y         := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
-textofs-y      := 0x00608000
+textofs-y      := 0x00408000
 textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
 # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
 ifeq ($(CONFIG_ARCH_SA1100),y)

diff --git a/arch/arm/mach-rk2818/Makefile.boot b/arch/arm/mach-rk2818/Makefile.boot
index 1e39973a9961e2631aca3d26db039111a1d5a344..b1c79179d4eed0ba7a43a3866d3ad9df8dbc97c1 100644 (file)
--- a/arch/arm/mach-rk2818/Makefile.boot
+++ b/arch/arm/mach-rk2818/Makefile.boot
@@ -1,3 +1,3 @@
-  zreladdr-y           := 0x60608000
-params_phys-y          := 0x60088000
+  zreladdr-y           := 0x60408000
+params_phys-y          := 0x600f8000
 initrd_phys-y          := 0x60800000

diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c
index 5da8ae3e09404afb45140e1b21cfb4fd3129a26a..9a52e4fdc6175499405f87c55755aaac413047df 100755 (executable)
--- a/arch/arm/mach-rk2818/board-infosdk.c
+++ b/arch/arm/mach-rk2818/board-infosdk.c
@@ -697,7 +697,7 @@ static unsigned char gInitKeyCode[] =
 };
 
 struct adc_key_data rk2818_adc_key = {
-    .pin_playon     = RK2818_PIN_PE1,
+    .pin_playon     = RK2818_PIN_PA3,
     .playon_level   = 1,
     .adc_empty      = 900,
     .adc_invalid    = 20,
@@ -705,7 +705,7 @@ struct adc_key_data rk2818_adc_key = {
     .adc_chn        = 1,
     .adc_key_table  = gAdcValueTab,
     .initKeyCode    = gInitKeyCode,
-    .adc_key_cnt    = 7,
+    .adc_key_cnt    = 9,
 };
 
 static void __init machine_rk2818_init_irq(void)

diff --git a/arch/arm/mach-rk2818/board-phonesdk.c b/arch/arm/mach-rk2818/board-phonesdk.c
index 6e90215fa8cfaad02b368b27cab964c09d73d53d..b30f5fe7b4e639bd06e468733f35e3180af4f72f 100755 (executable)
--- a/arch/arm/mach-rk2818/board-phonesdk.c
+++ b/arch/arm/mach-rk2818/board-phonesdk.c
@@ -422,7 +422,7 @@ static struct spi_board_info board_spi_devices[] = {
 
 /*rk2818_fb gpio information*/
 static struct rk2818_fb_gpio rk2818_fb_gpio_info = {
-    .display_on = (GPIO_LOW<<16)|RK2818_PIN_PB1,
+    .display_on = (GPIO_LOW<<16)|RK2818_PIN_PA2,
     .lcd_standby = 0,
     .mcu_fmk_pin = 0,
 };
@@ -592,7 +592,7 @@ static struct platform_device *devices[] __initdata = {
 };
 
 extern struct sys_timer rk2818_timer;
-#define POWER_PIN      RK2818_PIN_PH7
+#define POWER_PIN      RK2818_PIN_PB1
 static void rk2818_power_on(void)
 {
        int ret;
@@ -752,7 +752,7 @@ MACHINE_START(RK2818, "RK28board")
 /* UART for LL DEBUG */
        .phys_io        = 0x18002000,
        .io_pg_offst    = ((0xFF100000) >> 18) & 0xfffc,
-       .boot_params    = RK2818_SDRAM_PHYS + 0x88000,
+       .boot_params    = RK2818_SDRAM_PHYS + 0xf8000,
        .map_io         = machine_rk2818_mapio,
        .init_irq       = machine_rk2818_init_irq,
        .init_machine   = machine_rk2818_board_init,

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index a360dcb19da9ed92baa5fd51c1dd8e4f41513b2d..5c8aa1314587a378f22ff552f56caa234258739e 100755 (executable)
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -1150,21 +1150,17 @@ static void __init machine_rk2818_board_init(void)
                        ARRAY_SIZE(board_i2c3_devices));
 #endif
        platform_add_devices(devices, ARRAY_SIZE(devices));     
-       printk("after platform_add_devices -- begin \n");
        spi_register_board_info(board_spi_devices, ARRAY_SIZE(board_spi_devices));
        rk2818_mux_api_set(GPIOB4_SPI0CS0_MMC0D4_NAME,IOMUXA_GPIO0_B4); //IOMUXA_SPI0_CSN0);//use for gpio SPI CS0
        rk2818_mux_api_set(GPIOB0_SPI0CSN1_MMC1PCA_NAME,IOMUXA_GPIO0_B0); //IOMUXA_SPI0_CSN1);//use for gpio SPI CS1
        rk2818_mux_api_set(GPIOB_SPI0_MMC0_NAME,IOMUXA_SPI0);//use for SPI CLK SDI SDO
 
        rk2818_mux_api_set(GPIOF5_APWM3_DPWM3_NAME,IOMUXB_GPIO1_B5);
-               
        if(0 != gpio_request(RK2818_PIN_PF5, NULL))
     {
         gpio_free(RK2818_PIN_PF5);
         printk(">>>>>> RK2818_PIN_PF5 gpio_request err \n "); 
     } 
-    
-   printk("after platform_add_devices -- end \n");
 }
 
 static void __init machine_rk2818_mapio(void)

diff --git a/drivers/power/rk2818_battery.c b/drivers/power/rk2818_battery.c
index be0e20523aa97c76d7c350cbc19ce8bb3546569b..a2589177c23d4b4644ccf9c45010c6da7c1bd937 100644 (file)
--- a/drivers/power/rk2818_battery.c
+++ b/drivers/power/rk2818_battery.c
@@ -544,7 +544,6 @@ static int rk2818_battery_probe(struct platform_device *pdev)
        int ret;
        struct rk2818_battery_data *data;
 
-  printk("enter rk2818_battery_probe\n");
        ret = gpio_request(CHARGEOK_PIN, NULL);
        if (ret) {
                printk("failed to request charge_ok gpio\n");