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 <khil...@linaro.org> > Signed-off-by: Matt Porter <mpor...@linaro.org> > --- > 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 <linux/init.h> > #include <linux/kernel.h> > +#include <linux/of.h> > #include <asm/hardware/cache-l2x0.h> > > +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
signature.asc
Description: Digital signature