[PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support
From: jgq516 at gmail.com <hidden>
Date: 2012-06-01 03:52:23
Also in:
linux-devicetree, linux-omap, linux-watchdog, lkml
Subsystem:
arm port, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
From: Xiao Jiang <redacted> If provided dt support, then skip add wdt platform device as usual. Signed-off-by: Xiao Jiang <redacted> Reviewed-by: Jon Hunter <redacted> --- arch/arm/mach-omap2/devices.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 7b4b932..527c004 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c@@ -772,7 +772,7 @@ static int __init omap_init_wdt(void) char *oh_name = "wd_timer2"; char *dev_name = "omap_wdt"; - if (!cpu_class_is_omap2()) + if (!cpu_class_is_omap2() || of_have_populated_dt()) return 0; oh = omap_hwmod_lookup(oh_name);
--
1.7.3