|
|
@@ -0,0 +1,47 @@
|
|
|
+--- a/arch/arm/mach-cns3xxx/core.c
|
|
|
++++ b/arch/arm/mach-cns3xxx/core.c
|
|
|
+@@ -284,11 +284,24 @@ struct sys_timer cns3xxx_timer = {
|
|
|
+
|
|
|
+ #ifdef CONFIG_CACHE_L2X0
|
|
|
+
|
|
|
++static int cns3xxx_l2x0_enable = 1;
|
|
|
++
|
|
|
++static int __init cns3xxx_l2x0_disable(char *s)
|
|
|
++{
|
|
|
++ cns3xxx_l2x0_enable = 0;
|
|
|
++ return 1;
|
|
|
++}
|
|
|
++__setup("nol2x0", cns3xxx_l2x0_disable);
|
|
|
++
|
|
|
+ void __init cns3xxx_l2x0_init(void)
|
|
|
+ {
|
|
|
+- void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
|
|
|
++ void __iomem *base;
|
|
|
+ u32 val;
|
|
|
+
|
|
|
++ if (!cns3xxx_l2x0_enable)
|
|
|
++ return;
|
|
|
++
|
|
|
++ base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
|
|
|
+ if (WARN_ON(!base))
|
|
|
+ return;
|
|
|
+
|
|
|
+@@ -321,6 +334,7 @@ void __init cns3xxx_l2x0_init(void)
|
|
|
+ /* 32 KiB, 8-way, parity disable */
|
|
|
+ l2x0_init(base, 0x00540000, 0xfe000fff);
|
|
|
+ }
|
|
|
++arch_initcall(cns3xxx_l2x0_init);
|
|
|
+
|
|
|
+ #endif /* CONFIG_CACHE_L2X0 */
|
|
|
+
|
|
|
+--- a/arch/arm/mach-cns3xxx/cns3420vb.c
|
|
|
++++ b/arch/arm/mach-cns3xxx/cns3420vb.c
|
|
|
+@@ -193,8 +193,6 @@ static struct platform_device *cns3420_p
|
|
|
+
|
|
|
+ static void __init cns3420_init(void)
|
|
|
+ {
|
|
|
+- cns3xxx_l2x0_init();
|
|
|
+-
|
|
|
+ platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs));
|
|
|
+
|
|
|
+ cns3xxx_ahci_init();
|