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

Commit 2101dd64 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 m68k updates from Greg Ungerer:
 "The bulk of the changes are to support the ColdFire 5441x SoC family
  with their MMU enabled. The parts have been supported for a long time
  now, but only in no-MMU mode.

  Angelo Dureghello has a new board with a 5441x and we have ironed out
  the last problems with MMU enabled on it. So there is also some
  changes to properly support that board too.

  Also a fix for a link problem when selecting the traditional 68k beep
  device in no-MMU configurations"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: add Sysam stmark2 open board support
  m68k: coldfire: add dspi0 module support
  m68k: pull mach_beep in setup.c
  m68k: allow ColdFire m5441x parts to run with MMU enabled
  m68k: fix ColdFire node shift size calculation
  m68k: move coldfire MMU initialization code
parents b33e3cc5 c8b61d50

arch/m68k/Kconfig.cpu

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ config M548x 


config M5441x

	bool "MCF5441x"

	depends on !MMU

	select MMU_COLDFIRE if MMU

	select GENERIC_CLOCKEVENTS

	select HAVE_CACHE_CB

	help

arch/m68k/Kconfig.machine

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,12 @@ config AMCORE 
	help

	  Support for the Sysam AMCORE open-hardware generic board.



config STMARK2

        bool "Sysam stmark2 board support"

        depends on M5441x

        help

          Support for the Sysam stmark2 open-hardware generic board.



config FIREBEE

	bool "FireBee board support"

	depends on M547x

arch/m68k/coldfire/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_CLEOPATRA) += nettel.o 
obj-$(CONFIG_FIREBEE)	+= firebee.o

obj-$(CONFIG_MCF8390)	+= mcf8390.o

obj-$(CONFIG_AMCORE)	+= amcore.o

obj-$(CONFIG_STMARK2)	+= stmark2.o



obj-$(CONFIG_PCI)	+= pci.o

arch/m68k/coldfire/m5441x.c

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ DEFINE_CLK(0, "intc.0", 18, MCF_CLK); 
DEFINE_CLK(0, "intc.1", 19, MCF_CLK);

DEFINE_CLK(0, "intc.2", 20, MCF_CLK);

DEFINE_CLK(0, "imx1-i2c.0", 22, MCF_CLK);

DEFINE_CLK(0, "mcfdspi.0", 23, MCF_CLK);

DEFINE_CLK(0, "fsl-dspi.0", 23, MCF_CLK);

DEFINE_CLK(0, "mcfuart.0", 24, MCF_BUSCLK);

DEFINE_CLK(0, "mcfuart.1", 25, MCF_BUSCLK);

DEFINE_CLK(0, "mcfuart.2", 26, MCF_BUSCLK);
@@ -140,6 +140,7 @@ static struct clk * const enable_clks[] __initconst = { 
	&__clk_0_18, /* intc0 */

	&__clk_0_19, /* intc0 */

	&__clk_0_20, /* intc0 */

	&__clk_0_23, /* dspi.0 */

	&__clk_0_24, /* uart0 */

	&__clk_0_25, /* uart1 */

	&__clk_0_26, /* uart2 */

arch/m68k/coldfire/m54xx.c

+0 −4
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ static void mcf54xx_reset(void) 


void __init config_BSP(char *commandp, int size)

{

#ifdef CONFIG_MMU

	cf_bootmem_alloc();

	mmu_context_init();

#endif

	mach_reset = mcf54xx_reset;

	mach_sched_init = hw_timer_init;

	m54xx_uarts_init();