From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Apr 2013 06:53:11 +0000 (-0700)
Subject: Merge tag 'davinci-for-v3.10/soc-2-v2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: next-20130422~16^2~23^2~1
X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=a100caaf12c871f040d34437229156b8b5670059

Merge tag 'davinci-for-v3.10/soc-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

From Sekhar Nori:
v3.10 SoC updates for DaVinci

This set of patches add support for remoteproc
used to control the DSP and also fix sparse
errors existing for quite some time.

* tag 'davinci-for-v3.10/soc-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  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

Signed-off-by: Olof Johansson <olof@lixom.net>
---

a100caaf12c871f040d34437229156b8b5670059
diff --cc arch/arm/mach-davinci/da8xx-dt.c
index d83de8f8fa6b,57e14a8774db..b1c0a5958275
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@@ -37,10 -37,9 +37,10 @@@ static void __init da8xx_init_irq(void
  	of_irq_init(da8xx_irq_match);
  }
  
- struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
+ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
  	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),
  	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),
 +	OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),
  	{}
  };