Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754845Ab2E2Rx4 (ORCPT ); Tue, 29 May 2012 13:53:56 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:40866 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754545Ab2E2Rxz (ORCPT ); Tue, 29 May 2012 13:53:55 -0400 Message-ID: <4FC50D22.4090409@ti.com> Date: Tue, 29 May 2012 12:53:38 -0500 From: Jon Hunter User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: CC: , , , , , , , , , , , Subject: Re: [PATCH 2/3] OMAP: avoid build wdt platform device if with dt support References: <1337942552-28218-1-git-send-email-jgq516@gmail.com> <1337942552-28218-3-git-send-email-jgq516@gmail.com> In-Reply-To: <1337942552-28218-3-git-send-email-jgq516@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.157.144.139] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1076 Lines: 35 On 05/25/2012 05:42 AM, jgq516@gmail.com wrote: > From: Xiao Jiang > > If provided dt support, then skip add wdt platform device as usual. > > Signed-off-by: Xiao Jiang > --- > 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 Cheers Jon -- 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/