mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

mxc: add arch_reset() function

Browse source 
This patch adds arch_reset() function for all mxc platforms.

It also removes (unsused) arch/arm/mach-mx2/system.c file.

This patch has been tested on i.MX1/27/31/35

Signed-off-by: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Ilya Yanok 2009-03-03 02:49:23 +03:00 committed by Sascha Hauer
parent 05fd8e73e1
commit 74bef9a4fa
4 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-mx2/Makefile
View file

@ -4,7 +4,7 @@
# Object file lists. # Object file lists.
obj-y := system.o generic.o devices.o serial.o obj-y := generic.o devices.o serial.o
obj-$(CONFIG_MACH_MX21) += clock_imx21.o obj-$(CONFIG_MACH_MX21) += clock_imx21.o

2
arch/arm/plat-mxc/Makefile
View file

@ -3,7 +3,7 @@
# #
# Common support # Common support
obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o
obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o

5
arch/arm/plat-mxc/include/mach/system.h
View file

@ -26,9 +26,6 @@ static inline void arch_idle(void)
cpu_do_idle(); cpu_do_idle();
} }
static inline void arch_reset(char mode, const char *cmd) void arch_reset(char mode, const char *cmd);
{
cpu_reset(0);
}
#endif /* __ASM_ARCH_MXC_SYSTEM_H__ */ #endif /* __ASM_ARCH_MXC_SYSTEM_H__ */

50
arch/arm/mach-mx2/system.c → arch/arm/plat-mxc/system.c
View file

@ -3,6 +3,7 @@
* Copyright (C) 2000 Deep Blue Solutions Ltd * Copyright (C) 2000 Deep Blue Solutions Ltd
* Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright 2008 Juergen Beisert, kernel@pengutronix.de * Copyright 2008 Juergen Beisert, kernel@pengutronix.de
* Copyright 2009 Ilya Yanok, Emcraft Systems Ltd, yanok@emcraft.com
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -22,42 +23,45 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/err.h>
#include <linux/delay.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/system.h> #include <asm/system.h>
/* #ifdef CONFIG_ARCH_MX1
* Put the CPU into idle mode. It is called by default_idle() #define WDOG_WCR_REG IO_ADDRESS(WDT_BASE_ADDR)
* in process.c file. #define WDOG_WCR_ENABLE (1 << 0)
*/ #else
void arch_idle(void) #define WDOG_WCR_REG IO_ADDRESS(WDOG_BASE_ADDR)
{ #define WDOG_WCR_ENABLE (1 << 2)
/* #endif
* This should do all the clock switching
* and wait for interrupt tricks.
*/
cpu_do_idle();
}
#define WDOG_WCR_REG IO_ADDRESS(WDOG_BASE_ADDR)
#define WDOG_WCR_SRS (1 << 4)
/* /*
* Reset the system. It is called by machine_restart(). * Reset the system. It is called by machine_restart().
*/ */
void arch_reset(char mode, const char *cmd) void arch_reset(char mode, const char *cmd)
{ {
struct clk *clk; if (!cpu_is_mx1()) {
struct clk *clk;
clk = clk_get(NULL, "wdog_clk"); clk = clk_get_sys("imx-wdt.0", NULL);
if (!clk) { if (!IS_ERR(clk))
printk(KERN_ERR"Cannot activate the watchdog. Giving up\n"); clk_enable(clk);
return;
} }
clk_enable(clk);
/* Assert SRS signal */ /* Assert SRS signal */
__raw_writew(__raw_readw(WDOG_WCR_REG) & ~WDOG_WCR_SRS, WDOG_WCR_REG); __raw_writew(WDOG_WCR_ENABLE, WDOG_WCR_REG);
/* wait for reset to assert... */
mdelay(500);
printk(KERN_ERR "Watchdog reset failed to assert reset\n");
/* delay to allow the serial port to show the message */
mdelay(50);
/* we'll take a jump through zero as a poor second */
cpu_reset(0);
} }