diff options
author | Ilya Yanok <yanok@emcraft.com> | 2009-03-03 02:49:23 +0300 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-27 14:51:14 +0100 |
commit | 74bef9a4fa978669b234c4454daa596c0494c09a (patch) | |
tree | 4c08bfcfb3e59889143491837991d7cf521fed72 /arch/arm/mach-mx2 | |
parent | 05fd8e73e1357feaea9c48938d937eae76b4aef4 (diff) | |
download | kernel_samsung_smdk4412-74bef9a4fa978669b234c4454daa596c0494c09a.zip kernel_samsung_smdk4412-74bef9a4fa978669b234c4454daa596c0494c09a.tar.gz kernel_samsung_smdk4412-74bef9a4fa978669b234c4454daa596c0494c09a.tar.bz2 |
mxc: add arch_reset() function
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>
Diffstat (limited to 'arch/arm/mach-mx2')
-rw-r--r-- | arch/arm/mach-mx2/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx2/system.c | 63 |
2 files changed, 1 insertions, 64 deletions
diff --git a/arch/arm/mach-mx2/Makefile b/arch/arm/mach-mx2/Makefile index 6e1a2bf..950649a 100644 --- a/arch/arm/mach-mx2/Makefile +++ b/arch/arm/mach-mx2/Makefile @@ -4,7 +4,7 @@ # 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 diff --git a/arch/arm/mach-mx2/system.c b/arch/arm/mach-mx2/system.c deleted file mode 100644 index 92c79d4..0000000 --- a/arch/arm/mach-mx2/system.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 1999 ARM Limited - * Copyright (C) 2000 Deep Blue Solutions Ltd - * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved. - * Copyright 2008 Juergen Beisert, kernel@pengutronix.de - * - * 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 Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <linux/kernel.h> -#include <linux/clk.h> -#include <linux/io.h> - -#include <mach/hardware.h> -#include <asm/proc-fns.h> -#include <asm/system.h> - -/* - * Put the CPU into idle mode. It is called by default_idle() - * in process.c file. - */ -void arch_idle(void) -{ - /* - * 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(). - */ -void arch_reset(char mode, const char *cmd) -{ - struct clk *clk; - - clk = clk_get(NULL, "wdog_clk"); - if (!clk) { - printk(KERN_ERR"Cannot activate the watchdog. Giving up\n"); - return; - } - - clk_enable(clk); - - /* Assert SRS signal */ - __raw_writew(__raw_readw(WDOG_WCR_REG) & ~WDOG_WCR_SRS, WDOG_WCR_REG); -} |