diff options
| author |   Xiao Jiang <jgq516@gmail.com> | 2012-06-01 12:44:15 +0800 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2012-07-09 01:55:36 -0700 |
| commit | 6e152231995aa4ed5eafd87a6a8348563248f843 (patch) | |
| tree | 6af18f45956a37978f9d78ecc923923ba8a739dc /arch/arm/mach-omap2/devices.c | |
| parent | arm/dts: add wdt node for omap3 and omap4 (diff) | |
| download | linux-dev-6e152231995aa4ed5eafd87a6a8348563248f843.tar.xz linux-dev-6e152231995aa4ed5eafd87a6a8348563248f843.zip | |
ARM: OMAP: avoid build wdt platform device if with dt support
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>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | 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 7b4b9327e543..527c0046064d 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); |