Commit 4749edf8 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'davinci-for-v4.5/fixes' of...

Merge tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/fixes-non-critical

This pull request includes a fix for improper usage of WARN() and a fix
for unmet 'select' dependencies.

* tag 'davinci-for-v4.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: fix a problematic usage of WARN()
  ARM: davinci: only select WT cache if cache is enabled
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a436848c 5bcd9272
...@@ -34,7 +34,8 @@ config ARCH_DAVINCI_DA830 ...@@ -34,7 +34,8 @@ config ARCH_DAVINCI_DA830
bool "DA830/OMAP-L137/AM17x based system" bool "DA830/OMAP-L137/AM17x based system"
depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR
select ARCH_DAVINCI_DA8XX select ARCH_DAVINCI_DA8XX
select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1 # needed on silicon revs 1.0, 1.1:
select CPU_DCACHE_WRITETHROUGH if !CPU_DCACHE_DISABLE
select CP_INTC select CP_INTC
config ARCH_DAVINCI_DA850 config ARCH_DAVINCI_DA850
......
...@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void) ...@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void)
dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1); dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);
aemif = clk_get(&dm355evm_dm9000.dev, "aemif"); aemif = clk_get(&dm355evm_dm9000.dev, "aemif");
if (IS_ERR(aemif)) if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))
WARN("%s: unable to get AEMIF clock\n", __func__);
else
clk_prepare_enable(aemif); clk_prepare_enable(aemif);
platform_add_devices(davinci_evm_devices, platform_add_devices(davinci_evm_devices,
......
...@@ -242,9 +242,7 @@ static __init void dm355_leopard_init(void) ...@@ -242,9 +242,7 @@ static __init void dm355_leopard_init(void)
dm355leopard_dm9000_rsrc[2].start = gpio_to_irq(9); dm355leopard_dm9000_rsrc[2].start = gpio_to_irq(9);
aemif = clk_get(&dm355leopard_dm9000.dev, "aemif"); aemif = clk_get(&dm355leopard_dm9000.dev, "aemif");
if (IS_ERR(aemif)) if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))
WARN("%s: unable to get AEMIF clock\n", __func__);
else
clk_prepare_enable(aemif); clk_prepare_enable(aemif);
platform_add_devices(davinci_leopard_devices, platform_add_devices(davinci_leopard_devices,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment