Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758985Ab2FADwX (ORCPT ); Thu, 31 May 2012 23:52:23 -0400 Received: from mail.windriver.com ([147.11.1.11]:47833 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758895Ab2FADwT (ORCPT ); Thu, 31 May 2012 23:52:19 -0400 From: To: , , , , , , , , CC: , , , , , Subject: [PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support Date: Fri, 1 Jun 2012 12:44:15 +0800 Message-ID: <1338525856-4359-3-git-send-email-jgq516@gmail.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1338525856-4359-1-git-send-email-jgq516@gmail.com> References: <1338525856-4359-1-git-send-email-jgq516@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 980 Lines: 31 From: Xiao Jiang If provided dt support, then skip add wdt platform device as usual. Signed-off-by: Xiao Jiang Reviewed-by: Jon Hunter --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/