ARM: 8261/1: l2c: Get outer cache .write_sec callback from mach_desc only if not...

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / irq.c

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index ad857bada96ce75ad09a6a8d79fee364d245df87..350f188c92d29447b59cbdcf62e0f98be5eed484 100644 (file)
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -109,7 +109,8 @@ void __init init_IRQ(void)
 
        if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_CACHE_L2X0) &&
            (machine_desc->l2c_aux_mask || machine_desc->l2c_aux_val)) {
-               outer_cache.write_sec = machine_desc->l2c_write_sec;
+               if (!outer_cache.write_sec)
+                       outer_cache.write_sec = machine_desc->l2c_write_sec;
                ret = l2x0_of_init(machine_desc->l2c_aux_val,
                                   machine_desc->l2c_aux_mask);
                if (ret)