Thread (21 messages) 21 messages, 3 authors, 2012-05-31

[PATCH 2/3] OMAP: avoid build wdt platform device if with dt support

From: Jon Hunter <hidden>
Date: 2012-05-29 17:53:56
Also in: linux-devicetree, linux-omap, linux-watchdog, lkml


On 05/25/2012 05:42 AM, jgq516 at gmail.com wrote:
quoted hunk ↗ jump to hunk
From: Xiao Jiang <redacted>

If provided dt support, then skip add wdt platform device as usual.

Signed-off-by: Xiao Jiang <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 ae62ece..80d7e3f 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -759,7 +759,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);
Reviewed-by: Jon Hunter <redacted>

Cheers
Jon
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help