70 lines
1.6 KiB
Diff
70 lines
1.6 KiB
Diff
|
--- a/arch/arm/mach-cns3xxx/core.c
|
||
|
|
+++ b/arch/arm/mach-cns3xxx/core.c
|
||
|
|
@@ -305,13 +305,26 @@ void __init cns3xxx_timer_init(void)
|
||
|
|
|
||
|
|
#ifdef CONFIG_CACHE_L2X0
|
||
|
|
|
||
|
|
-void __init cns3xxx_l2x0_init(void)
|
||
|
|
+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);
|
||
|
|
+
|
||
|
|
+static int __init cns3xxx_l2x0_init(void)
|
||
|
|
{
|
||
|
|
- void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
|
||
|
|
+ void __iomem *base;
|
||
|
|
u32 val;
|
||
|
|
|
||
|
|
+ if (!cns3xxx_l2x0_enable)
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
+ base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
|
||
|
|
if (WARN_ON(!base))
|
||
|
|
- return;
|
||
|
|
+ return 0;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Tag RAM Control register
|
||
|
|
@@ -341,7 +354,10 @@ void __init cns3xxx_l2x0_init(void)
|
||
|
|
|
||
|
|
/* 32 KiB, 8-way, parity disable */
|
||
|
|
l2x0_init(base, 0x00500000, 0xfe0f0fff);
|
||
|
|
+
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
+arch_initcall(cns3xxx_l2x0_init);
|
||
|
|
|
||
|
|
#endif /* CONFIG_CACHE_L2X0 */
|
||
|
|
|
||
|
|
--- a/arch/arm/mach-cns3xxx/cns3420vb.c
|
||
|
|
+++ b/arch/arm/mach-cns3xxx/cns3420vb.c
|
||
|
|
@@ -239,8 +239,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();
|
||
|
|
--- a/arch/arm/mach-cns3xxx/core.h
|
||
|
|
+++ b/arch/arm/mach-cns3xxx/core.h
|
||
|
|
@@ -16,12 +16,6 @@
|
||
|
|
extern struct smp_operations cns3xxx_smp_ops;
|
||
|
|
extern void cns3xxx_timer_init(void);
|
||
|
|
|
||
|
|
-#ifdef CONFIG_CACHE_L2X0
|
||
|
|
-void __init cns3xxx_l2x0_init(void);
|
||
|
|
-#else
|
||
|
|
-static inline void cns3xxx_l2x0_init(void) {}
|
||
|
|
-#endif /* CONFIG_CACHE_L2X0 */
|
||
|
|
-
|
||
|
|
#ifdef CONFIG_PCI
|
||
|
|
extern void __init cns3xxx_pcie_init_late(void);
|
||
|
|
#else
|