UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: Loongson1B: Fix reboot problem on LS1B 

- Correct the header file of watchdog registers
 - Use ioremap_nocache() to access watchdog registers instead

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8022/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Kelvin Cheung 2014-10-10 11:39:59 +08:00 committed by Ralf Baechle
parent 0dc294c05d
commit a13f079575
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/include/asm/mach-loongson1/regs-wdt.h
View File

@ -1,7 +1,7 @@
/* /*
* Copyright (c) 2011 Zhang, Keguang <keguang.zhang@gmail.com> * Copyright (c) 2011 Zhang, Keguang <keguang.zhang@gmail.com>
* *
* Loongson 1 watchdog register definitions. * Loongson 1 Watchdog Register Definitions.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -12,11 +12,8 @@
#ifndef __ASM_MACH_LOONGSON1_REGS_WDT_H #ifndef __ASM_MACH_LOONGSON1_REGS_WDT_H
#define __ASM_MACH_LOONGSON1_REGS_WDT_H #define __ASM_MACH_LOONGSON1_REGS_WDT_H
#define LS1X_WDT_REG(x) \ #define WDT_EN 0x0
((void __iomem *)KSEG1ADDR(LS1X_WDT_BASE + (x))) #define WDT_TIMER 0x4
#define WDT_SET 0x8
#define LS1X_WDT_EN LS1X_WDT_REG(0x0)
#define LS1X_WDT_SET LS1X_WDT_REG(0x4)
#define LS1X_WDT_TIMER LS1X_WDT_REG(0x8)
#endif /* __ASM_MACH_LOONGSON1_REGS_WDT_H */ #endif /* __ASM_MACH_LOONGSON1_REGS_WDT_H */

20
arch/mips/loongson1/common/reset.c
View File

@ -14,12 +14,7 @@
#include <loongson1.h> #include <loongson1.h>
static void ls1x_restart(char *command) static void __iomem *wdt_base;
{
__raw_writel(0x1, LS1X_WDT_EN);
__raw_writel(0x5000000, LS1X_WDT_TIMER);
__raw_writel(0x1, LS1X_WDT_SET);
}
static void ls1x_halt(void) static void ls1x_halt(void)
{ {
@ -29,6 +24,15 @@ static void ls1x_halt(void)
} }
} }
static void ls1x_restart(char *command)
{
__raw_writel(0x1, wdt_base + WDT_EN);
__raw_writel(0x1, wdt_base + WDT_TIMER);
__raw_writel(0x1, wdt_base + WDT_SET);
ls1x_halt();
}
static void ls1x_power_off(void) static void ls1x_power_off(void)
{ {
ls1x_halt(); ls1x_halt();
@ -36,6 +40,10 @@ static void ls1x_power_off(void)
static int __init ls1x_reboot_setup(void) static int __init ls1x_reboot_setup(void)
{ {
wdt_base = ioremap_nocache(LS1X_WDT_BASE, 0x0f);
if (!wdt_base)
panic("Failed to remap watchdog registers");
_machine_restart = ls1x_restart; _machine_restart = ls1x_restart;
_machine_halt = ls1x_halt; _machine_halt = ls1x_halt;
pm_power_off = ls1x_power_off; pm_power_off = ls1x_power_off;