rk29: reset: reset pwm while reboot

diff --git a/arch/arm/mach-rk29/reset.c b/arch/arm/mach-rk29/reset.c
index 10cca81fe05a9dcb414ec79c70c7c55e59acec42..fc7cdeb035597b917b1be905b144a62026307a0b 100755 (executable)
--- a/arch/arm/mach-rk29/reset.c
+++ b/arch/arm/mach-rk29/reset.c
@@ -70,7 +70,8 @@ static void  pwm2gpiodefault(void)
        *pGRF_GPIO2L_IOMUX &= ~(0x3<<6);\r
        // set gpio to input\r
        *pGPIO2_DIR &= ~(0x1<<3);\r
-//     testflag =1;\r
+\r
+       memset(RK29_PWM_BASE, 0, 0x40);\r
 } \r
 \r
 \r
@@ -93,24 +94,22 @@ void  rk29_arch_reset(int mode, const char *cmd)
 {\r
        u32 reg;\r
 \r
-       /* from panic? */\r
-       if (system_state != SYSTEM_RESTART)\r
-               machine_power_off();\r
-\r
        local_irq_disable();\r
        local_fiq_disable();\r
-       pwm2gpiodefault();\r
 \r
        cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_CPU_MODE_MASK) | CRU_CPU_MODE_SLOW, CRU_MODE_CON);\r
-\r
        delay_500ns();\r
 \r
-       cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_GENERAL_MODE_MASK) | CRU_GENERAL_MODE_SLOW, CRU_MODE_CON);\r
+       /* from panic? */\r
+       if (system_state != SYSTEM_RESTART)\r
+               machine_power_off();\r
 \r
+       pwm2gpiodefault();\r
+\r
+       cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_GENERAL_MODE_MASK) | CRU_GENERAL_MODE_SLOW, CRU_MODE_CON);\r
        delay_500ns();\r
 \r
        cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_CODEC_MODE_MASK) | CRU_CODEC_MODE_SLOW, CRU_MODE_CON);\r
-\r
        delay_500ns();\r
        \r
        cru_writel(0, CRU_CLKGATE0_CON);\r