From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH] ARM: OMAP: 2430 PM: emul_ck is only available on 242x Date: Fri, 8 Jun 2007 03:26:58 -0700 Message-ID: <20070608102658.GJ28556@atomide.com> References: <11810916331121-git-send-email-khilman@mvista.com> <1181091633807-git-send-email-khilman@mvista.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1181091633807-git-send-email-khilman@mvista.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces@linux.omap.com Errors-To: linux-omap-open-source-bounces@linux.omap.com To: Kevin Hilman Cc: linux-omap-open-source@linux.omap.com List-Id: linux-omap@vger.kernel.org * Kevin Hilman [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 > --- > 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