All of lore.kernel.org
 help / color / mirror / Atom feed
From: <jgq516@gmail.com>
To: <grant.likely@secretlab.ca>, <rob.herring@calxeda.com>,
	<rob@landley.net>, <linux@arm.linux.org.uk>, <b-cousson@ti.com>,
	<rnayak@ti.com>, <tony@atomide.com>, <wim@iguana.be>,
	<jon-hunter@ti.com>
Cc: <devicetree-discuss@lists.ozlabs.org>,
	<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-omap@vger.kernel.org>, <linux-watchdog@vger.kernel.org>
Subject: [PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support
Date: Fri, 1 Jun 2012 12:44:15 +0800	[thread overview]
Message-ID: <1338525856-4359-3-git-send-email-jgq516@gmail.com> (raw)
In-Reply-To: <1338525856-4359-1-git-send-email-jgq516@gmail.com>

From: Xiao Jiang <jgq516@gmail.com>

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>
---
 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


WARNING: multiple messages have this Message-ID (diff)
From: <jgq516@gmail.com>
To: grant.likely@secretlab.ca, rob.herring@calxeda.com,
	rob@landley.net, linux@arm.linux.org.uk, b-cousson@ti.com,
	rnayak@ti.com, tony@atomide.com, wim@iguana.be,
	jon-hunter@ti.com
Cc: devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
	linux-watchdog@vger.kernel.org
Subject: [PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support
Date: Fri, 1 Jun 2012 12:44:15 +0800	[thread overview]
Message-ID: <1338525856-4359-3-git-send-email-jgq516@gmail.com> (raw)
In-Reply-To: <1338525856-4359-1-git-send-email-jgq516@gmail.com>

From: Xiao Jiang <jgq516@gmail.com>

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>
---
 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


WARNING: multiple messages have this Message-ID (diff)
From: jgq516@gmail.com (jgq516 at gmail.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support
Date: Fri, 1 Jun 2012 12:44:15 +0800	[thread overview]
Message-ID: <1338525856-4359-3-git-send-email-jgq516@gmail.com> (raw)
In-Reply-To: <1338525856-4359-1-git-send-email-jgq516@gmail.com>

From: Xiao Jiang <jgq516@gmail.com>

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>
---
 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

  parent reply	other threads:[~2012-06-01  3:52 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-01  4:44 [PATCHv2 0/3] omap3 and omap4: add device tree support for wdt jgq516
2012-06-01  4:44 ` jgq516 at gmail.com
2012-06-01  4:44 ` jgq516
2012-06-01  4:44 ` [PATCHv2 1/3] arm/dts: add wdt node for omap3 and omap4 jgq516
2012-06-01  4:44   ` jgq516 at gmail.com
2012-06-01  4:44   ` jgq516
2012-06-01  4:44 ` jgq516 [this message]
2012-06-01  4:44   ` [PATCHv3 2/3] OMAP: avoid build wdt platform device if with dt support jgq516 at gmail.com
2012-06-01  4:44   ` jgq516
2012-06-01  4:44 ` [PATCHv2 3/3] watchdog: omap_wdt: add device tree support jgq516
2012-06-01  4:44   ` jgq516 at gmail.com
2012-06-01  4:44   ` jgq516
2012-07-06  8:28   ` Tony Lindgren
2012-07-06  8:28     ` Tony Lindgren
2012-07-06  8:28     ` Tony Lindgren
2012-07-07 12:07     ` Wim Van Sebroeck
2012-07-07 12:07       ` Wim Van Sebroeck
2012-07-09  8:57       ` Tony Lindgren
2012-07-09  8:57         ` Tony Lindgren
2012-07-09  8:57         ` Tony Lindgren
2012-06-01 13:54 ` [PATCHv2 0/3] omap3 and omap4: add device tree support for wdt Jon Hunter
2012-06-01 13:54   ` Jon Hunter
2012-06-01 13:54   ` Jon Hunter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1338525856-4359-3-git-send-email-jgq516@gmail.com \
    --to=jgq516@gmail.com \
    --cc=b-cousson@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=grant.likely@secretlab.ca \
    --cc=jon-hunter@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=rnayak@ti.com \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    --cc=tony@atomide.com \
    --cc=wim@iguana.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.