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

Commit a6930aae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "The bulk of the changes here are to clean up the ColdFire 5441x SoC
  support so that it can run with MMU enabled. We have only supported it
  with MMU disabled up to now.

  There is also a few individual bug fixes across the ColdFire support
  code"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: let clk_disable() return immediately if clk is NULL
  m68knommu: convert printk(KERN_INFO) to pr_info()
  m68knommu: clean up uClinux boot log output
  m68k: generalize uboot command line support
  m68k: don't panic if no hardware FPU defined
  m68k: only generate FPU instructions if CONFIG_FPU enabled
  m68k: always make available dump_fpu()
  m68k: generalize io memory region setup for ColdFire ACR registers
  m68k: move ColdFire _bootmem_alloc code
  m68k: report correct FPU type on ColdFire MMU platforms
  m68k: set appropriate machine type for m5411x SoC platforms
  m68k: move CONFIG_FPU set to per-CPU configuration
  m68knommu: fix IO write size in nettel pin set
  m68knommu: switch to using IO access methods in WildFire board code
  m68knommu: fix early setup to not access variables
parents d8ea757b 742859ad

arch/m68k/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config M68K 
	select GENERIC_IOMAP

	select GENERIC_STRNCPY_FROM_USER if MMU

	select GENERIC_STRNLEN_USER if MMU

	select FPU if MMU

	select ARCH_WANT_IPC_PARSE_VERSION

	select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE

	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX

arch/m68k/Kconfig.cpu

+6 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ config MCPU32 
config M68020

	bool "68020 support"

	depends on MMU

	select FPU

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68020
@@ -72,6 +73,7 @@ config M68020 
config M68030

	bool "68030 support"

	depends on MMU && !MMU_SUN3

	select FPU

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68030
@@ -81,6 +83,7 @@ config M68030 
config M68040

	bool "68040 support"

	depends on MMU && !MMU_SUN3

	select FPU

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68LC040
@@ -91,6 +94,7 @@ config M68040 
config M68060

	bool "68060 support"

	depends on MMU && !MMU_SUN3

	select FPU

	select CPU_HAS_ADDRESS_SPACES

	help

	  If you anticipate running this kernel on a computer with a MC68060
@@ -259,6 +263,7 @@ config M547x 
	bool "MCF547x"

	select M54xx

	select MMU_COLDFIRE if MMU

	select FPU if MMU

	select HAVE_CACHE_CB

	select HAVE_MBAR

	select CPU_NO_EFFICIENT_FFS
@@ -268,6 +273,7 @@ config M547x 
config M548x

	bool "MCF548x"

	select MMU_COLDFIRE if MMU

	select FPU if MMU

	select M54xx

	select HAVE_CACHE_CB

	select HAVE_MBAR

arch/m68k/coldfire/clk.c

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ EXPORT_SYMBOL(clk_enable); 
void clk_disable(struct clk *clk)

{

	unsigned long flags;



	if (!clk)

		return;



	spin_lock_irqsave(&clk_lock, flags);

	if ((--clk->enabled == 0) && clk->clk_ops)

		clk->clk_ops->disable(clk);

arch/m68k/coldfire/head.S

+4 −4
Original line number Diff line number Diff line
@@ -280,10 +280,10 @@ _clear_bss: 
	movel	%d0,m68k_cputype		/* Mark us as a ColdFire */

	movel	#MMU_COLDFIRE,%d0

	movel	%d0,m68k_mmutype

	movel	#FPU_COLDFIRE,%d0

	movel	%d0,m68k_fputype

	movel	#MACH_M54XX,%d0

	movel	%d0,m68k_machtype		/* Mark us as a 54xx machine */

	movel	#FPUTYPE,%d0

	movel	%d0,m68k_fputype		/* Mark FPU type */

	movel	#MACHINE,%d0

	movel	%d0,m68k_machtype		/* Mark machine type */

	lea	init_task,%a2			/* Set "current" init task */

#endif

arch/m68k/coldfire/m528x.c

+4 −4
Original line number Diff line number Diff line
@@ -102,14 +102,14 @@ void wildfiremod_halt(void) 
	printk(KERN_INFO "WildFireMod hibernating...\n");



	/* Set portE.5 to Digital IO */

	MCF5282_GPIO_PEPAR &= ~(1 << (5 * 2));

	writew(readw(MCFGPIO_PEPAR) & ~(1 << (5 * 2)), MCFGPIO_PEPAR);



	/* Make portE.5 an output */

	MCF5282_GPIO_DDRE |= (1 << 5);

	writeb(readb(MCFGPIO_PDDR_E) | (1 << 5), MCFGPIO_PDDR_E);



	/* Now toggle portE.5 from low to high */

	MCF5282_GPIO_PORTE &= ~(1 << 5);

	MCF5282_GPIO_PORTE |= (1 << 5);

	writeb(readb(MCFGPIO_PODR_E) & ~(1 << 5), MCFGPIO_PODR_E);

	writeb(readb(MCFGPIO_PODR_E) | (1 << 5), MCFGPIO_PODR_E);



	printk(KERN_EMERG "Failed to hibernate. Halting!\n");

}