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

Commit 74bef9a4 authored by Ilya Yanok's avatar Ilya Yanok Committed by Sascha Hauer
Browse files

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: default avatarIlya Yanok <yanok@emcraft.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 05fd8e73

arch/arm/mach-mx2/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/plat-mxc/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/plat-mxc/include/mach/system.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -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__ */

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

+27 −23
Original line number Original line Diff line number Diff line
@@ -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)

{

	/*

	 * 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_REG		IO_ADDRESS(WDOG_BASE_ADDR)

#define WDOG_WCR_SRS                    (1 << 4)

#define WDOG_WCR_ENABLE		(1 << 2)

#endif





/*

/*

 * 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)

{

{

	if (!cpu_is_mx1()) {

		struct clk *clk;

		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");

		return;

	}



			clk_enable(clk);

			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);

}
 
}