Merge branch develop-3.10 into develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rockchip / common.c

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index e2fa463f8c56a1ce065b94ac8dbd93ba5f8a5c22..a3d129a0a2728c9be80a85ce4a28e2d14ab37fea 100755 (executable)
--- a/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@ -21,7 +21,9 @@
 #include <linux/of_platform.h>
 #include <linux/of_fdt.h>
 #include <asm/cputype.h>
+#ifdef CONFIG_CACHE_L2X0
 #include <asm/hardware/cache-l2x0.h>
+#endif
 #include <linux/rockchip/common.h>
 #include <linux/rockchip/pmu.h>
 #include <linux/memblock.h>
@@ -103,7 +105,7 @@ static int __init rockchip_cpu_axi_init(void)
                                iounmap(base);
                }
        }
-       dsb();
+       dsb(sy);
 
 #undef MAP
 
@@ -111,6 +113,7 @@ static int __init rockchip_cpu_axi_init(void)
 }
 early_initcall(rockchip_cpu_axi_init);
 
+#ifdef CONFIG_CACHE_L2X0
 static int __init rockchip_pl330_l2_cache_init(void)
 {
        struct device_node *np;
@@ -150,6 +153,7 @@ static int __init rockchip_pl330_l2_cache_init(void)
        return 0;
 }
 early_initcall(rockchip_pl330_l2_cache_init);
+#endif
 
 struct gen_pool *rockchip_sram_pool = NULL;
 struct pie_chunk *rockchip_pie_chunk = NULL;