From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Apr 2013 06:54:41 +0000 (-0700)
Subject: Merge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~581^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1556f4b4d0abadb5df5e7678cbe7c30d27e7256c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'davinci-for-v3.10/board-2-v2' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/boards

From Sekhar Nori:
v3.10 board updates for DaVinci

This set of patches enables remoteproc support
on DA850 EVM and fixes some sparse warnings for
the same board.

* tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da850 evm: fix const qualifier placement
  ARM: davinci: da850 board: add remoteproc support
  ARM: davinci: ensure global variables are declared
  ARM: davinci: sram.c: fix incorrect type in assignment
  ARM: davinci: da8xx dt: make file local symbols static
  ARM: davinci: da8xx: add remoteproc support
  ARM: davinci: remove test for undefined Kconfig macro
  ARM: davinci: mmc: derive version information from device name
  ARM: davinci: da850: add ECAP & EHRPWM clock nodes
  ARM: davinci: clk framework support for enable/disable functionality
---

1556f4b4d0abadb5df5e7678cbe7c30d27e7256c
diff --cc arch/arm/mach-davinci/board-neuros-osd2.c
index ea6728be53ba,b70e83c03bed..2bc112adf565
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@@ -164,12 -164,22 +164,11 @@@ static void __init davinci_ntosd2_map_i
  
  static struct davinci_mmc_config davinci_ntosd2_mmc_config = {
  	.wires		= 4,
- 	.version	= MMC_CTLR_VERSION_1
  };
  
 +#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)
  
 -#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
 -	defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
 -#define HAS_ATA 1
 -#else
 -#define HAS_ATA 0
 -#endif
 -
 -#if defined(CONFIG_MTD_NAND_DAVINCI) || \
 -	defined(CONFIG_MTD_NAND_DAVINCI_MODULE)
 -#define HAS_NAND 1
 -#else
 -#define HAS_NAND 0
 -#endif
 +#define HAS_NAND	IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)
  
  static __init void davinci_ntosd2_init(void)
  {