m68knommu: move CPU reset code for the 520x ColdFire into its platform code (25ce4a90) · Commits · 戴 / test

arch/m68k/include/asm/m520xsim.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -59,5 +59,14 @@
		#define MCFPIT_IMR MCFINTC_IMRL
		#define MCFPIT_IMR_IBIT (1 << MCFINT_PIT1)

		/*
		* Reset Controll Unit.
		*/
		#define MCF_RCR 0xFC0A0000
		#define MCF_RSR 0xFC0A0001

		#define MCF_RCR_SWRESET 0x80 /* Software reset bit */
		#define MCF_RCR_FRCSTOUT 0x40 /* Force external reset */

		/****************************************************************************/
		#endif /* m520xsim_h */

+9 −6

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <linux/kernel.h>
		#include <linux/param.h>
		#include <linux/init.h>
		#include <linux/interrupt.h>
		#include <linux/io.h>
		#include <asm/machdep.h>
		#include <asm/coldfire.h>
		@@ -23,10 +22,6 @@

		/***************************************************************************/

		void coldfire_reset(void);

		/***************************************************************************/

		static struct mcf_platform_uart m520x_uart_platform[] = {
		{
		.mapbase = MCF_MBAR + MCFUART_BASE1,
		@@ -169,9 +164,17 @@ void mcf_autovector(unsigned int vec)

		/***************************************************************************/

		static void m520x_cpu_reset(void)
		{
		local_irq_disable();
		__raw_writeb(MCF_RCR_SWRESET, MCF_RCR);
		}

		/***************************************************************************/

		void __init config_BSP(char *commandp, int size)
		{
		mach_reset = coldfire_reset;
		mach_reset = m520x_cpu_reset;
		m520x_uarts_init();
		m520x_fec_init();
		}