[uClinux-dev] [PATCH v2] m68knommu: enable qspi support when SPI_COLDFIRE_QSPI = m

Greg Ungerer gerg at snapgear.com
Mon May 7 23:38:46 EDT 2012


Hi Steven,

On 07/05/12 05:22, Steven King wrote:
> Enable Coldfire QSPI support when SPI_COLDFIRE_QSPI is built as a module.
>
> This version of the patch combines changes to the config files and  device.c
> and uses IF_ENABLED (thanks to Sam Ravnborg for the suggestion).
>
> Signed-off-by: Steven King<sfking at fdwdc.com>

Looks good. I'll queue this up in the m68knommu git tree.

Thanks
Greg



> ---
>   arch/m68k/platform/520x/config.c     |    6 +++---
>   arch/m68k/platform/523x/config.c     |    6 +++---
>   arch/m68k/platform/5249/config.c     |    6 +++---
>   arch/m68k/platform/527x/config.c     |    6 +++---
>   arch/m68k/platform/528x/config.c     |    6 +++---
>   arch/m68k/platform/532x/config.c     |    6 +++---
>   arch/m68k/platform/coldfire/device.c |    6 +++---
>   7 files changed, 21 insertions(+), 21 deletions(-)
>
> diff --git a/arch/m68k/platform/520x/config.c b/arch/m68k/platform/520x/config.c
> index 2359478..09df4b8 100644
> --- a/arch/m68k/platform/520x/config.c
> +++ b/arch/m68k/platform/520x/config.c
> @@ -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
>   }
> diff --git a/arch/m68k/platform/523x/config.c b/arch/m68k/platform/523x/config.c
> index c8b405d..d47dfd8 100644
> --- a/arch/m68k/platform/523x/config.c
> +++ b/arch/m68k/platform/523x/config.c
> @@ -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
>   }
> diff --git a/arch/m68k/platform/5249/config.c b/arch/m68k/platform/5249/config.c
> index bbf0513..300e729 100644
> --- a/arch/m68k/platform/5249/config.c
> +++ b/arch/m68k/platform/5249/config.c
> @@ -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
>   }
> diff --git a/arch/m68k/platform/527x/config.c b/arch/m68k/platform/527x/config.c
> index f91a532..b3cb378 100644
> --- a/arch/m68k/platform/527x/config.c
> +++ b/arch/m68k/platform/527x/config.c
> @@ -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
>   }
> diff --git a/arch/m68k/platform/528x/config.c b/arch/m68k/platform/528x/config.c
> index d449292..c5f11ba 100644
> --- a/arch/m68k/platform/528x/config.c
> +++ b/arch/m68k/platform/528x/config.c
> @@ -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
>   }
> diff --git a/arch/m68k/platform/532x/config.c b/arch/m68k/platform/532x/config.c
> index 2bec347..37082d0 100644
> --- a/arch/m68k/platform/532x/config.c
> +++ b/arch/m68k/platform/532x/config.c
> @@ -30,7 +30,7 @@
>
>   /***************************************************************************/
>
> -#ifdef CONFIG_SPI_COLDFIRE_QSPI
> +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>
>   static void __init m532x_qspi_init(void)
>   {
> @@ -38,7 +38,7 @@ static void __init m532x_qspi_init(void)
>   	writew(0x01f0, MCF_GPIO_PAR_QSPI);
>   }
>
> -#endif /* CONFIG_SPI_COLDFIRE_QSPI */
> +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
>
>   /***************************************************************************/
>
> @@ -77,7 +77,7 @@ void __init config_BSP(char *commandp, int size)
>   	mach_sched_init = hw_timer_init;
>   	m532x_uarts_init();
>   	m532x_fec_init();
> -#ifdef CONFIG_SPI_COLDFIRE_QSPI
> +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>   	m532x_qspi_init();
>   #endif
>
> diff --git a/arch/m68k/platform/coldfire/device.c b/arch/m68k/platform/coldfire/device.c
> index 7af9736..3aa77dd 100644
> --- a/arch/m68k/platform/coldfire/device.c
> +++ b/arch/m68k/platform/coldfire/device.c
> @@ -121,7 +121,7 @@ static struct platform_device mcf_fec1 = {
>   #endif /* MCFFEC_BASE1 */
>   #endif /* CONFIG_FEC */
>
> -#ifdef CONFIG_SPI_COLDFIRE_QSPI
> +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>   /*
>    *	The ColdFire QSPI module is an SPI protocol hardware block used
>    *	on a number of different ColdFire CPUs.
> @@ -274,7 +274,7 @@ static struct platform_device mcf_qspi = {
>   	.resource		= mcf_qspi_resources,
>   	.dev.platform_data	=&mcf_qspi_data,
>   };
> -#endif /* CONFIG_SPI_COLDFIRE_QSPI */
> +#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
>
>   static struct platform_device *mcf_devices[] __initdata = {
>   	&mcf_uart,
> @@ -284,7 +284,7 @@ static struct platform_device *mcf_devices[] __initdata = {
>   	&mcf_fec1,
>   #endif
>   #endif
> -#ifdef CONFIG_SPI_COLDFIRE_QSPI
> +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
>   	&mcf_qspi,
>   #endif
>   };
>
>
>


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg at snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close                             FAX:         +61 7 3217 5323
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com



More information about the uClinux-dev mailing list