]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP: avoid build wdt platform device if with dt support
authorXiao Jiang <jgq516@gmail.com>
Fri, 1 Jun 2012 04:44:15 +0000 (12:44 +0800)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 08:55:36 +0000 (01:55 -0700)
If provided dt support, then skip add wdt platform device as usual.

Signed-off-by: Xiao Jiang <jgq516@gmail.com>
Reviewed-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/devices.c

index 7b4b9327e54332e1edc3bacec2a35269169fd6b2..527c0046064d71c4ea048dd78a698bce4204dd8c 100644 (file)
@@ -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);