All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Kevin Hilman <khilman@mvista.com>
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH] ARM: OMAP: 2430 PM: emul_ck is only available on 242x
Date: Fri, 8 Jun 2007 03:26:58 -0700	[thread overview]
Message-ID: <20070608102658.GJ28556@atomide.com> (raw)
In-Reply-To: <1181091633807-git-send-email-khilman@mvista.com>

* Kevin Hilman <khilman@mvista.com> [070605 18:04]:
> omap2_pm_init: on 2430,  don't fail if emul_ck is not available.  It
> is only available on 2420
> 
> Signed-off-by: Kevin Hilman <khilman@mvista.com>
> ---
>  arch/arm/mach-omap2/pm.c |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index a1655c2..974fdc5 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -783,11 +783,13 @@ int __init omap2_pm_init(void)
>  		return -ENODEV;
>  	}
>  
> -	emul_ck = clk_get(NULL, "emul_ck");
> -	if (IS_ERR(emul_ck)) {
> -		printk(KERN_ERR "could not get emul_ck\n");
> -		clk_put(osc_ck);
> -		return -ENODEV;
> +	if (cpu_is_omap242x()) {
> +		emul_ck = clk_get(NULL, "emul_ck");
> +		if (IS_ERR(emul_ck)) {
> +			printk(KERN_ERR "could not get emul_ck\n");
> +			clk_put(osc_ck);
> +			return -ENODEV;
> +		}
>  	}
>  
>  	prcm_setup_regs();

Pushing today.

Tony

  reply	other threads:[~2007-06-08 10:26 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-06-06  1:00 [PATCH] ARM: OMAP: compile fix for CONFIG_PM_DEBUG=y Kevin Hilman
2007-06-06  1:00 ` [PATCH] ARM: OMAP: 2430 PM: emul_ck is only available on 242x Kevin Hilman
2007-06-08 10:26   ` Tony Lindgren [this message]
2007-06-06  1:00 ` [PATCH] ARM: OMAP: init section mismatch for omap2/timer-gp Kevin Hilman
2007-06-06  1:43   ` Nishanth Menon
2007-06-06  1:00 ` [PATCH] ARM: OMAP: 2430SDP: minor fixups for fb driver Kevin Hilman
2007-06-08 10:28   ` Tony Lindgren
2007-06-08 10:26 ` [PATCH] ARM: OMAP: compile fix for CONFIG_PM_DEBUG=y Tony Lindgren

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=20070608102658.GJ28556@atomide.com \
    --to=tony@atomide.com \
    --cc=khilman@mvista.com \
    --cc=linux-omap-open-source@linux.omap.com \
    /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.