From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 12/14] omap2/3: Fix initcalls for multi-omap
Date: Thu, 19 Aug 2010 12:35:49 +0300 [thread overview]
Message-ID: <20100819093548.GT12184@atomide.com> (raw)
In-Reply-To: <20100819090313.GC3003@shisha.kicks-ass.net>
* Alexander Shishkin <virtuoso@slind•org> [100819 12:04]:
> On Tue, Jan 26, 2010 at 12:13:04 -0800, Tony Lindgren wrote:
> > Otherwise the wrong initcalls can run.
> >
> > Signed-off-by: Tony Lindgren <tony@atomide•com>
> > ---
> > arch/arm/mach-omap2/clock2xxx.c | 2 +-
> > arch/arm/mach-omap2/clock34xx.c | 2 +-
> > arch/arm/mach-omap2/emu.c | 3 +++
>
> May I ask what stopped you from CCing me on this patch?
Hmm, sorry I don't follow you. Did I accidentally leave out something?
Regards,
Tony
> > 3 files changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c
> > index 43e7404..1a31b72 100644
> > --- a/arch/arm/mach-omap2/clock2xxx.c
> > +++ b/arch/arm/mach-omap2/clock2xxx.c
> > @@ -598,7 +598,7 @@ static int __init omap2_clk_arch_init(void)
> > struct clk *virt_prcm_set, *sys_ck, *dpll_ck, *mpu_ck;
> > unsigned long sys_ck_rate;
> >
> > - if (!mpurate)
> > + if (!(cpu_is_omap24xx() && mpurate))
> > return -EINVAL;
> >
> > virt_prcm_set = clk_get(NULL, "virt_prcm_set");
> > diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
> > index f485a89..03720bc 100644
> > --- a/arch/arm/mach-omap2/clock34xx.c
> > +++ b/arch/arm/mach-omap2/clock34xx.c
> > @@ -317,7 +317,7 @@ static int __init omap2_clk_arch_init(void)
> > struct clk *osc_sys_ck, *dpll1_ck, *arm_fck, *core_ck;
> > unsigned long osc_sys_rate;
> >
> > - if (!mpurate)
> > + if (!(cpu_is_omap34xx() && mpurate))
> > return -EINVAL;
> >
> > /* XXX test these for success */
> > diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c
> > index ec0d984..9c442e2 100644
> > --- a/arch/arm/mach-omap2/emu.c
> > +++ b/arch/arm/mach-omap2/emu.c
> > @@ -56,6 +56,9 @@ static struct amba_device omap3_etm_device = {
> >
> > static int __init emu_init(void)
> > {
> > + if (!cpu_is_omap34xx())
> > + return -ENODEV;
> > +
> > amba_device_register(&omap3_etb_device, &iomem_resource);
> > amba_device_register(&omap3_etm_device, &iomem_resource);
> >
> >
> >
>
> Regards,
> --
> Alex
next prev parent reply other threads:[~2010-08-19 9:35 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-26 20:12 [PATCH 00/14] omap DEBUG_LL and multiboot changes for 2.6.34 Tony Lindgren
2010-01-26 20:12 ` [PATCH 01/14] omap: Clean the serial port defines Tony Lindgren
2010-01-26 20:12 ` [PATCH 02/14] omap: Make uncompress code and DEBUG_LL code generic Tony Lindgren
2010-04-29 14:44 ` Kevin Hilman
2010-04-30 15:07 ` Kevin Hilman
2010-04-30 16:20 ` Cyril Chemparathy
2010-04-30 16:49 ` Tony Lindgren
2010-04-30 17:18 ` Russell King - ARM Linux
2010-04-30 18:47 ` Tony Lindgren
2010-04-30 21:16 ` Kevin Hilman
2010-01-26 20:12 ` [PATCH 03/14] omap: Remove old DEBUG_LL serial port options Tony Lindgren
2010-01-26 20:12 ` [PATCH 04/14] omap2/3: Make get_irqnr_and_base common for mach-omap2 multiboot Tony Lindgren
2010-01-26 20:12 ` [PATCH 05/14] omap2/3: Multiboot compile fixes to compile in omap2 and omap3 Tony Lindgren
2010-01-26 20:12 ` [PATCH 06/14] omap: Fix dmtimer.c for multi-omap boot Tony Lindgren
2010-01-26 20:12 ` [PATCH 07/14] omap2/3/4: Fix omap2_map_common_io for multi-omap Tony Lindgren
2010-01-26 20:12 ` [PATCH 08/14] omap2/3/4: Fix mbox init " Tony Lindgren
2010-01-26 20:12 ` [PATCH 09/14] omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 Tony Lindgren
2010-01-26 20:12 ` [PATCH 10/14] omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 Tony Lindgren
2010-01-26 20:13 ` [PATCH 11/14] omap2/3/4: Replace orred CONFIG_ARCH_OMAP2/3/4 with CONFIG_ARCH_OMAP2PLUS Tony Lindgren
2010-01-26 20:13 ` [PATCH 12/14] omap2/3: Fix initcalls for multi-omap Tony Lindgren
[not found] ` <20100819090313.GC3003@shisha.kicks-ass.net>
2010-08-19 9:35 ` Tony Lindgren [this message]
2010-01-26 20:13 ` [PATCH 13/14] omap2/3: Fix powerdomain init for multiomap Tony Lindgren
2010-01-27 2:26 ` Paul Walmsley
2010-01-27 2:29 ` Tony Lindgren
2010-01-26 20:13 ` [PATCH 14/14] omap2/3: Update omap3_defconfig to build in all the 2420 based boards Tony Lindgren
2010-03-24 11:43 ` [PATCH 00/14] omap DEBUG_LL and multiboot changes for 2.6.34 Gadiyar, Anand
2010-04-01 12:13 ` 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=20100819093548.GT12184@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox