Commit 6104dde0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "A collection of fixes:

   -  flexcan platform support (for m5441x)

   -  fix CONFIG_ROMKERNEL linking

   -  fix compilation when CONFIG_ISA_DMA_API is set

   -  fix local ColdFire clk_enable() for NULL clk"

* tag 'm68knommu-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
  m68k: coldfire: return success for clk_enable(NULL)
  m68k: m5441x: add flexcan support
  m68k: stmark2: update board setup
  m68k/nommu: prevent setting ROMKERNEL when ROM is not set
parents c07f1919 db87db65

arch/m68k/Kconfig.bus

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig" 


endif



if !MMU

if COLDFIRE



config ISA_DMA_API

	def_bool !M5272

arch/m68k/Kconfig.machine

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ config RAMKERNEL 


config ROMKERNEL

	bool "ROM"

	depends on ROM

	help

	  The kernel will be resident in FLASH/ROM when running. This is

	  often referred to as Execute-in-Place (XIP), since the kernel

arch/m68k/coldfire/clk.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int clk_enable(struct clk *clk) 
	unsigned long flags;



	if (!clk)

		return -EINVAL;

		return 0;



	spin_lock_irqsave(&clk_lock, flags);

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

arch/m68k/coldfire/device.c

+44 −0
Original line number Diff line number Diff line
@@ -581,6 +581,47 @@ static struct platform_device mcf_esdhc = { 
};

#endif /* MCFSDHC_BASE */



#if IS_ENABLED(CONFIG_CAN_FLEXCAN)



#include <linux/can/platform/flexcan.h>



static struct flexcan_platform_data mcf5441x_flexcan_info = {

	.clk_src = 1,

	.clock_frequency = 120000000,

};



static struct resource mcf5441x_flexcan0_resource[] = {

	{

		.start = MCFFLEXCAN_BASE0,

		.end = MCFFLEXCAN_BASE0 + MCFFLEXCAN_SIZE,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = MCF_IRQ_IFL0,

		.end = MCF_IRQ_IFL0,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = MCF_IRQ_BOFF0,

		.end = MCF_IRQ_BOFF0,

		.flags = IORESOURCE_IRQ,

	},

	{

		.start = MCF_IRQ_ERR0,

		.end = MCF_IRQ_ERR0,

		.flags = IORESOURCE_IRQ,

	},

};



static struct platform_device mcf_flexcan0 = {

	.name = "flexcan-mcf5441x",

	.id = 0,

	.num_resources = ARRAY_SIZE(mcf5441x_flexcan0_resource),

	.resource = mcf5441x_flexcan0_resource,

	.dev.platform_data = &mcf5441x_flexcan_info,

};

#endif /* IS_ENABLED(CONFIG_CAN_FLEXCAN) */



static struct platform_device *mcf_devices[] __initdata = {

	&mcf_uart,

#if IS_ENABLED(CONFIG_FEC)
@@ -616,6 +657,9 @@ static struct platform_device *mcf_devices[] __initdata = { 
#ifdef MCFSDHC_BASE

	&mcf_esdhc,

#endif

#if IS_ENABLED(CONFIG_CAN_FLEXCAN)

	&mcf_flexcan0,

#endif

};



/*

arch/m68k/coldfire/m5441x.c

+4 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <asm/mcfclk.h>



DEFINE_CLK(0, "flexbus", 2, MCF_CLK);

DEFINE_CLK(0, "mcfcan.0", 8, MCF_CLK);

DEFINE_CLK(0, "mcfcan.1", 9, MCF_CLK);

DEFINE_CLK(0, "flexcan.0", 8, MCF_CLK);

DEFINE_CLK(0, "flexcan.1", 9, MCF_CLK);

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

DEFINE_CLK(0, "mcfdspi.1", 15, MCF_CLK);

DEFINE_CLK(0, "edma", 17, MCF_CLK);
@@ -142,6 +142,8 @@ static struct clk_lookup m5411x_clk_lookup[] = { 


static struct clk * const enable_clks[] __initconst = {

	/* make sure these clocks are enabled */

	&__clk_0_8, /* flexcan.0 */

	&__clk_0_9, /* flexcan.1 */

	&__clk_0_15, /* dspi.1 */

	&__clk_0_17, /* eDMA */

	&__clk_0_18, /* intc0 */
@@ -162,8 +164,6 @@ static struct clk * const enable_clks[] __initconst = { 
	&__clk_1_37, /* gpio */

};

static struct clk * const disable_clks[] __initconst = {

	&__clk_0_8, /* can.0 */

	&__clk_0_9, /* can.1 */

	&__clk_0_14, /* i2c.1 */

	&__clk_0_22, /* i2c.0 */

	&__clk_0_23, /* dspi.0 */