Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-25 06:31:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

This pull request includes a fix for

Browse Source 
improper usage of WARN() and a fix
 for unmet 'select' dependencies.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJWb/f/AAoJEGFBu2jqvgRNKyQP/jIpuXiRm6NxXQZASGv2i7Qg
 +kzkxbMIj3Z6WKtteZkQoleA9xnBvPiK+ecTCug+TwNCOYeNZHPkYxY4Ce01YZj4
 NNzJTLyUgd92CY+3ovS5Vd1Prz6lPnSKGTLHBxLYptug56NhBcEmfqM65eAgoT22
 UKs19WvZjshc1FNhuY0jGTKAZF9pe6PvZji5NOb8ueCUV+P/mLJfA9iOeXnOmpEb
 bdsKNT5E3LxYSGF8LdRZ7e5Yl77o+dNh7yl+j9ias8cYu1BiPFUmtfLsnjNxmaE7
 erFRTlzYn6/sqYtIOpIj2vDSL+dVF8k9fVc3tzfpjeDzALgdmYOyDGpEB404a6Ml
 1NuWaZvsrJIVoL5v6nTcpP0U2Y/yC2T9bpDE/3SCZIIubPz08bVAdtx1yAyO8DHq
 wVeV9X6mF2RpslWHO02vALsmBXdyecNzYtiNFDPT+NMIoAuVRvaWkrgJMu9Kut/u
 CkY7wwZD4VQV54rd6kK0wrGyMWJCqQ4QhkVlK6DPAHqM/X81lBDPm33m68Pb/xF+
 V20G2q+Nfdfq7LJafoEIMrRaWAd+ZlhvqJ5W1LgL5YeCMylHNU87S6r7hWyeLQ+D
 cV0bq3qW0DGIzbwv2Tw+rq8ie4nywJb63jPQzNo1i0B5rWTUpS6pCisabFrUvji5
 fbIRKa1KyENz7Um1mgU2
 =u3KY
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-12-22 11:40:17 -08:00
commit 4749edf82f
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-davinci/Kconfig
View File

@ -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

4
arch/arm/mach-davinci/board-dm355-evm.c
View File

@ -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,

4
arch/arm/mach-davinci/board-dm355-leopard.c
View File

@ -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,