shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk29: enable reset while panic

Browse Source
This commit is contained in:
黄涛
2011-05-23 14:42:09 +08:00
parent c89e0c824c
commit c27ccedf23
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-rk29/reset.c
View File

@@ -126,10 +126,6 @@ void rk29_arch_reset(int mode, const char *cmd)
cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_CPU_MODE_MASK) | CRU_CPU_MODE_SLOW, CRU_MODE_CON);
LOOP(LOOPS_PER_USEC);
/* from panic? */
if (system_state != SYSTEM_RESTART)
machine_power_off();
pwm2gpiodefault();
cru_writel((cru_readl(CRU_MODE_CON) & ~CRU_GENERAL_MODE_MASK) | CRU_GENERAL_MODE_SLOW, CRU_MODE_CON);
@@ -183,9 +179,9 @@ void rk29_arch_reset(int mode, const char *cmd)
cru_writel((cru_readl(CRU_CLKSEL8_CON) & ~(7 | (0x3f << 14) | (3 << 20))) | (2 << 20), CRU_CLKSEL8_CON);
// remap bit control = 0, normal mode
writel(readl(RK29_GRF_PHYS + 0xc0) & ~(1 << 21), RK29_GRF_PHYS + 0xc0);
writel(readl(RK29_GRF_BASE + 0xc0) & ~(1 << 21), RK29_GRF_BASE + 0xc0);
// emmc_and_boot_en control=0, normal mode
writel(readl(RK29_GRF_PHYS + 0xbc) & ~(1 << 9), RK29_GRF_PHYS + 0xbc);
writel(readl(RK29_GRF_BASE + 0xbc) & ~(1 << 9), RK29_GRF_BASE + 0xbc);
dsb();
writel(0, RK29_CPU_AXI_BUS0_PHYS);