From mboxrd@z Thu Jan 1 00:00:00 1970 From: balbi@ti.com (Felipe Balbi) Date: Mon, 28 Apr 2014 09:29:51 -0500 Subject: [PATCH] ARM: l2c: prima2: only call l2x0_of_init() on matching nodes In-Reply-To: <1398644860-22973-1-git-send-email-mporter@linaro.org> References: <1398644860-22973-1-git-send-email-mporter@linaro.org> Message-ID: <20140428142950.GB30292@saruman.home> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, Apr 27, 2014 at 08:27:40PM -0400, Matt Porter wrote: > l2x0_of_init() is executed unconditionally within the sirfsoc_l2x0_init() > early initcall. In a multi v7 kernel this causes bcm281xx and bcm21664 > platform to fail boot since they have their own pre l2x0 init sequence > that is required. Fix this by checking that a matching OF ID is present > before calling l2x0_of_init(). > > Reported-by: Kevin Hilman > Signed-off-by: Matt Porter > --- > Applies against next-20140424 to fix the issue introduced in > 50655e6 ARM: l2c: prima2: remove cache size override > > arch/arm/mach-prima2/l2x0.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c > index 09f68f0..1c2ed15 100644 > --- a/arch/arm/mach-prima2/l2x0.c > +++ b/arch/arm/mach-prima2/l2x0.c > @@ -8,10 +8,24 @@ > > #include > #include > +#include > #include > > +static const struct of_device_id sirf_l2x0_ids[] __initconst = { > + { .compatible = "sirf,prima2-pl310-cache" }, > + { .compatible = "sirf,marco-pl310-cache" }, that same commit removed these two from DTS, did you test with old DTS, btw any chance ? -- balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: