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

Commit 4e25651b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull a m68knommu fix from Greg Ungerer:
 "It contains a single fix for including the ColdFire QSPI interface
  setup code when enabled as a module.  This was broken in the
  consolidation of the ColdFire SoC device tables in the 3.4 merge
  window."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m
parents 1b76b02f 83ca6009

arch/m68k/platform/520x/config.c

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


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



#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)



static void __init m520x_qspi_init(void)

{
@@ -35,7 +35,7 @@ static void __init m520x_qspi_init(void) 
	writew(par, MCF_GPIO_PAR_UART);

}



#endif /* CONFIG_SPI_COLDFIRE_QSPI */

#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */



/***************************************************************************/
@@ -79,7 +79,7 @@ void __init config_BSP(char *commandp, int size) 
	mach_sched_init = hw_timer_init;

	m520x_uarts_init();

	m520x_fec_init();

#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	m520x_qspi_init();

#endif

}

arch/m68k/platform/523x/config.c

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


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



#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)



static void __init m523x_qspi_init(void)

{
@@ -36,7 +36,7 @@ static void __init m523x_qspi_init(void) 
	writew(par, MCFGPIO_PAR_TIMER);

}



#endif /* CONFIG_SPI_COLDFIRE_QSPI */

#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */



/***************************************************************************/
@@ -58,7 +58,7 @@ void __init config_BSP(char *commandp, int size) 
{

	mach_sched_init = hw_timer_init;

	m523x_fec_init();

#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	m523x_qspi_init();

#endif

}

arch/m68k/platform/5249/config.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static struct platform_device *m5249_devices[] __initdata = { 


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



#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)



static void __init m5249_qspi_init(void)

{
@@ -61,7 +61,7 @@ static void __init m5249_qspi_init(void) 
	mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI);

}



#endif /* CONFIG_SPI_COLDFIRE_QSPI */

#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */



/***************************************************************************/
@@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size) 
#ifdef CONFIG_M5249C3

	m5249_smc91x_init();

#endif

#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	m5249_qspi_init();

#endif

}

arch/m68k/platform/527x/config.c

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


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



#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)



static void __init m527x_qspi_init(void)

{
@@ -42,7 +42,7 @@ static void __init m527x_qspi_init(void) 
#endif

}



#endif /* CONFIG_SPI_COLDFIRE_QSPI */

#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */



/***************************************************************************/
@@ -90,7 +90,7 @@ void __init config_BSP(char *commandp, int size) 
	mach_sched_init = hw_timer_init;

	m527x_uarts_init();

	m527x_fec_init();

#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	m527x_qspi_init();

#endif

}

arch/m68k/platform/528x/config.c

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


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



#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)



static void __init m528x_qspi_init(void)

{
@@ -32,7 +32,7 @@ static void __init m528x_qspi_init(void) 
	__raw_writeb(0x07, MCFGPIO_PQSPAR);

}



#endif /* CONFIG_SPI_COLDFIRE_QSPI */

#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */



/***************************************************************************/
@@ -98,7 +98,7 @@ void __init config_BSP(char *commandp, int size) 
	mach_sched_init = hw_timer_init;

	m528x_uarts_init();

	m528x_fec_init();

#ifdef CONFIG_SPI_COLDFIRE_QSPI

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	m528x_qspi_init();

#endif

}