rk30:sdk:pmu enter sleep when pmu_sleep is high,sys_pwr:short on key to boot

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
index a7f9f336463fa6d4f37a03e004b0f2c74397116d..b7babb99f2a6282bea30c6371b21c017fa19574e 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
@@ -97,7 +97,7 @@ static int wm831x_pre_init(struct wm831x *parm)
        Wm831x = parm;
 //     printk("%s\n", __func__);
        gpio_request(PMU_POWER_SLEEP, "NULL");
-       gpio_direction_output(PMU_POWER_SLEEP, GPIO_HIGH);
+       gpio_direction_output(PMU_POWER_SLEEP, GPIO_LOW);
        
        ret = wm831x_reg_read(parm, WM831X_POWER_STATE) & 0xffff;
        wm831x_reg_write(parm, WM831X_POWER_STATE, (ret & 0xfff8) | 0x04);
@@ -655,7 +655,7 @@ static int wm831x_init_pin_type(struct wm831x *wm831x)
                                wm831x_set_bits(wm831x,
                                                WM831X_GPIO1_CONTROL + i,
                                                WM831X_GPN_POL_MASK,
-                                               0x0000);
+                                               0x0400);
                                wm831x_set_bits(wm831x,
                                                WM831X_GPIO1_CONTROL + i,
                                                WM831X_GPN_FN_MASK,
@@ -679,12 +679,7 @@ static int wm831x_init_pin_type(struct wm831x *wm831x)
                                                1 << WM831X_GPN_POL_SHIFT | 1 << WM831X_GPN_PWR_DOM_SHIFT | 1 << 0);
 
                        }       // set gpio3 as clkout output 32.768K
-                       else {
-                               wm831x_set_bits(wm831x,
-                                               WM831X_GPIO1_CONTROL + i,
-                                               WM831X_GPN_PWR_DOM_MASK,
-                                               ~WM831X_GPN_PWR_DOM);
-                       }
+                       
                }
        }
 
@@ -708,13 +703,13 @@ void __sramfunc board_pmu_suspend(void)
 {      
        cru_writel(CRU_CLKGATE5_GRFCLK_ON,CRU_CLKGATE5_CON_ADDR); //open grf clk
        grf_writel(GPIO6_PB1_DIR_OUT, GRF_GPIO6L_DIR_ADDR);
-       grf_writel(GPIO6_PB1_DO_LOW, GRF_GPIO6L_DO_ADDR);  //set gpio6_b1 output low
+       grf_writel(GPIO6_PB1_DO_HIGH, GRF_GPIO6L_DO_ADDR);  //set gpio6_b1 output low
        grf_writel(GPIO6_PB1_EN_MASK, GRF_GPIO6L_EN_ADDR);
 }
 void __sramfunc board_pmu_resume(void)
 {
        grf_writel(GPIO6_PB1_DIR_OUT, GRF_GPIO6L_DIR_ADDR);
-       grf_writel(GPIO6_PB1_DO_HIGH, GRF_GPIO6L_DO_ADDR);     //set gpio6_b1 output high
+       grf_writel(GPIO6_PB1_DO_LOW, GRF_GPIO6L_DO_ADDR);     //set gpio6_b1 output high
        grf_writel(GPIO6_PB1_EN_MASK, GRF_GPIO6L_EN_ADDR);
        sram_udelay(10000);
 }

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 91fcac4d93d1c699cb5f778dfe5a1ce0c97d7ecb..0a35bc83ca46c29fad2737ca22f2e5fd16b3876e 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -1373,6 +1373,7 @@ static void rk30_pm_power_off(void)
        printk(KERN_ERR "rk30_pm_power_off start...\n");
        gpio_direction_output(POWER_ON_PIN, GPIO_LOW);
 #if defined(CONFIG_MFD_WM831X)
+       wm831x_set_bits(Wm831x,WM831X_GPIO_LEVEL,0x0001,0x0000);  //set sys_pwr 0
        wm831x_device_shutdown(Wm831x);//wm8326 shutdown
 #endif
        while (1);