Re: [PATCH 2/3] OMAP: avoid build wdt platform device if with dt support |
|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [PATCH 2/3] OMAP: avoid build wdt platform device if with dt support
- From: Jon Hunter <jon-hunter@xxxxxx>
- Date: Tue, 29 May 2012 12:53:38 -0500
- Cc: <linux@xxxxxxxxxxxxxxxx>, <b-cousson@xxxxxx>, <rob.herring@xxxxxxxxxxx>, <grant.likely@xxxxxxxxxxxx>, <rnayak@xxxxxx>, <tony@xxxxxxxxxxx>, <wim@xxxxxxxxx>, <devicetree-discuss@xxxxxxxxxxxxxxxx>, <linux-omap@xxxxxxxxxxxxxxx>, <linux-kernel@xxxxxxxxxxxxxxx>, <linux-arm-kernel@xxxxxxxxxxxxxxxxxxx>, <linux-watchdog@xxxxxxxxxxxxxxx>
- In-reply-to: <1337942552-28218-3-git-send-email-jgq516@gmail.com>
- User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1
On 05/25/2012 05:42 AM, jgq516@xxxxxxxxx wrote:
> From: Xiao Jiang <jgq516@xxxxxxxxx>
>
> If provided dt support, then skip add wdt platform device as usual.
>
> Signed-off-by: Xiao Jiang <jgq516@xxxxxxxxx>
> ---
> 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 <jon-hunter@xxxxxx>
Cheers
Jon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
[Linux Arm (vger)]
[ARM Kernel]
[ARM MSM]
[Linux Tegra]
[Maemo Users]
[Linux USB Devel]
[Video for Linux]
[Linux Audio Users]
[Photo]
[Yosemite News]
[Yosemite Photos]
[Free Online Dating]
[Linux Kernel]
[Linux SCSI]
[XFree86]