m68knommu: move CPU reset code for the 527x ColdFire into its platform code (4c0b008d) · Commits · 戴 / test

arch/m68k/include/asm/m527xsim.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -70,5 +70,14 @@
		#define UART2_ENABLE_MASK 0x3f00
		#endif

		/*
		* Reset Controll Unit (relative to IPSBAR).
		*/
		#define MCF_RCR 0x110000
		#define MCF_RSR 0x110001

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

		/****************************************************************************/
		#endif /* m527xsim_h */

+9 −6

Original line number	Diff line number	Diff line
		@@ -15,7 +15,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>
		@@ -24,10 +23,6 @@

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

		void coldfire_reset(void);

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

		static struct mcf_platform_uart m527x_uart_platform[] = {
		{
		.mapbase = MCF_MBAR + MCFUART_BASE1,
		@@ -227,10 +222,18 @@ void mcf_autovector(unsigned int vec)

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

		static void m527x_cpu_reset(void)
		{
		local_irq_disable();
		__raw_writeb(MCF_RCR_SWRESET, MCF_IPSBAR + MCF_RCR);
		}

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

		void __init config_BSP(char *commandp, int size)
		{
		mcf_disableall();
		mach_reset = coldfire_reset;
		mach_reset = m527x_cpu_reset;
		m527x_uarts_init();
		m527x_fec_init();
		}