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 <[email protected]> Signed-off-by: Matt Porter <[email protected]> --- 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" }, + {}, +}; + static int __init sirfsoc_l2x0_init(void) { - return l2x0_of_init(0, ~0); + struct device_node *np; + int ret = -EINVAL; + + np = of_find_matching_node(NULL, sirf_l2x0_ids); + if (np) + ret = l2x0_of_init(0, ~0); + + return ret; } early_initcall(sirfsoc_l2x0_init); -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
