From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Sat, 1 May 2010 10:46:56 -0700 Subject: [PATCH 06/11] omap4: Fix omap_l2_cache_init not to run for other omaps In-Reply-To: References: <20100430202603.25812.41834.stgit@baageli.muru.com> <20100430203359.25812.56284.stgit@baageli.muru.com> Message-ID: <20100501174656.GN29604@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Shilimkar, Santosh [100430 23:13]: > Tony, > > > -----Original Message----- > > From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-arm-kernel- > > bounces at lists.infradead.org] On Behalf Of Tony Lindgren > > Sent: Saturday, May 01, 2010 2:04 AM > > To: linux-arm-kernel at lists.infradead.org > > Cc: linux-omap at vger.kernel.org > > Subject: [PATCH 06/11] omap4: Fix omap_l2_cache_init not to run for other omaps > > > > In multi-omap configuration all the initcalls run. To avoid > > bad things from happening with 44xx specific initcalls on > > other omaps, we need to check that the booted system is > > omap4 before running. > > > > Signed-off-by: Tony Lindgren > > --- > > arch/arm/mach-omap2/board-4430sdp.c | 3 +++ > > 1 files changed, 3 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c > > index b88f28c..e603b00 100644 > > --- a/arch/arm/mach-omap2/board-4430sdp.c > > +++ b/arch/arm/mach-omap2/board-4430sdp.c > > @@ -55,6 +55,9 @@ static int __init omap_l2_cache_init(void) > > extern void omap_smc1(u32 fn, u32 arg); > > void __iomem *l2cache_base; > > > > + if (!cpu_is_omap44xx()) > > + return -ENODEV; > > + > > This check is already present just 3 lines below. Oops. Thanks for pointing that out, dropping this patch. Tony