[PATCH 3/5] ARM: omap: move GPMC calls under config define

[Sascha Hauer]

On Mon, Apr 20, 2015 at 10:55:50AM +0200, Lucas Stach wrote:
> Fixes build failures on a few boards if CONFIG_OMAP_GPMC
> is not set.
> 
> Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
> ---
>  arch/arm/boards/beagle/board.c                   |  4 +++-
>  arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c  | 11 +++++++----
>  arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 10 +++++++---
>  arch/arm/boards/phytec-phycore-omap4460/board.c  |  9 +++++++--
>  4 files changed, 24 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
> index 775621069c27..c7fd5a30542e 100644
> --- a/arch/arm/boards/beagle/board.c
> +++ b/arch/arm/boards/beagle/board.c
> @@ -74,11 +74,13 @@ static struct i2c_board_info i2c_devices[] = {
>  	},
>  };
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.device_width = 16,
>  	.ecc_mode = OMAP_ECC_HAMMING_CODE_HW_ROMCODE,
>  	.nand_cfg = &omap3_nand_cfg,
>  };
> +#endif
>  
>  static int beagle_mem_init(void)
>  {
> @@ -100,8 +102,8 @@ static int beagle_devices_init(void)
>  #ifdef CONFIG_OMAP_GPMC
>  	/* WP is made high and WAIT1 active Low */
>  	gpmc_generic_init(0x10);
> -#endif
>  	omap_add_gpmc_nand_device(&nand_plat);
> +#endif

Maybe add a static inline no-op wrapper instead? This would save us some
ifdefs.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |