diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-18 08:53:11 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-18 08:53:20 +0200 |
| commit | a100caaf12c871f040d34437229156b8b5670059 (patch) | |
| tree | ce2364b86eb2342f78bde84fb870b15444eab0ec /arch/arm/mach-davinci/da8xx-dt.c | |
| parent | Merge tag 'msm-core-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/da... (diff) | |
| parent | ARM: davinci: ensure global variables are declared (diff) | |
| download | linux-a100caaf12c871f040d34437229156b8b5670059.tar.xz linux-a100caaf12c871f040d34437229156b8b5670059.zip | |
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>
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
| -rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index d83de8f8fa6b..b1c0a5958275 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -20,7 +20,7 @@ #define DA8XX_NUM_UARTS 3 -void __init da8xx_uart_clk_enable(void) +static void __init da8xx_uart_clk_enable(void) { int i; for (i = 0; i < DA8XX_NUM_UARTS; i++) @@ -37,7 +37,7 @@ 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), |