Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a13f0795 authored by Kelvin Cheung's avatar Kelvin Cheung Committed by Ralf Baechle
Browse files

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: default avatarKelvin Cheung <keguang.zhang@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8022/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0dc294c0

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

+4 −7
Original line number Diff line number Diff line 
/*

 * 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

 * under  the terms of	the GNU General	 Public License as published by the
@@ -12,11 +12,8 @@ 
#ifndef __ASM_MACH_LOONGSON1_REGS_WDT_H

#define __ASM_MACH_LOONGSON1_REGS_WDT_H



#define LS1X_WDT_REG(x) \

		((void __iomem *)KSEG1ADDR(LS1X_WDT_BASE + (x)))



#define LS1X_WDT_EN			LS1X_WDT_REG(0x0)

#define LS1X_WDT_SET			LS1X_WDT_REG(0x4)

#define LS1X_WDT_TIMER			LS1X_WDT_REG(0x8)

#define WDT_EN			0x0

#define WDT_TIMER		0x4

#define WDT_SET			0x8



#endif /* __ASM_MACH_LOONGSON1_REGS_WDT_H */

arch/mips/loongson1/common/reset.c

+14 −6
Original line number Diff line number Diff line
@@ -14,12 +14,7 @@ 


#include <loongson1.h>



static void ls1x_restart(char *command)

{

	__raw_writel(0x1, LS1X_WDT_EN);

	__raw_writel(0x5000000, LS1X_WDT_TIMER);

	__raw_writel(0x1, LS1X_WDT_SET);

}

static void __iomem *wdt_base;



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)

{

	ls1x_halt();
@@ -36,6 +40,10 @@ static void ls1x_power_off(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_halt = ls1x_halt;

	pm_power_off = ls1x_power_off;