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

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

arch/arm/mach-davinci/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ config ARCH_DAVINCI_DA830 
	bool "DA830/OMAP-L137/AM17x based system"

	depends on !ARCH_DAVINCI_DMx || AUTO_ZRELADDR

	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



config ARCH_DAVINCI_DA850

arch/arm/mach-davinci/board-dm355-evm.c

+1 −3
Original line number Diff line number Diff line
@@ -384,9 +384,7 @@ static __init void dm355_evm_init(void) 
	dm355evm_dm9000_rsrc[2].start = gpio_to_irq(1);



	aemif = clk_get(&dm355evm_dm9000.dev, "aemif");

	if (IS_ERR(aemif))

		WARN("%s: unable to get AEMIF clock\n", __func__);

	else

	if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))

		clk_prepare_enable(aemif);



	platform_add_devices(davinci_evm_devices,

arch/arm/mach-davinci/board-dm355-leopard.c

+1 −3
Original line number Diff line number Diff line
@@ -242,9 +242,7 @@ static __init void dm355_leopard_init(void) 
	dm355leopard_dm9000_rsrc[2].start = gpio_to_irq(9);



	aemif = clk_get(&dm355leopard_dm9000.dev, "aemif");

	if (IS_ERR(aemif))

		WARN("%s: unable to get AEMIF clock\n", __func__);

	else

	if (!WARN(IS_ERR(aemif), "unable to get AEMIF clock\n"))

		clk_prepare_enable(aemif);



	platform_add_devices(davinci_leopard_devices,

CRA Git | Maintained and supported by SUSTech CRA and CCSE