summaryrefslogtreecommitdiff
path: root/target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-16 07:40:41 +0000
committerJohn Crispin <john@openwrt.org>2015-03-16 07:40:41 +0000
commit518d9fd2a0bef9b05c48cebb061b6b462961b3c7 (patch)
treeef1ba97d3cf4335a441084d2dcec23317974463e /target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch
parent43c66cb43416a6cac063a2b2213b79603dcc0dbf (diff)
downloadmtk-20170518-518d9fd2a0bef9b05c48cebb061b6b462961b3c7.zip
mtk-20170518-518d9fd2a0bef9b05c48cebb061b6b462961b3c7.tar.gz
mtk-20170518-518d9fd2a0bef9b05c48cebb061b6b462961b3c7.tar.bz2
cns3xxx: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44817
Diffstat (limited to 'target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch
deleted file mode 100644
index 73619ba..0000000
--- a/target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -273,13 +273,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
-@@ -309,7 +322,10 @@ void __init cns3xxx_l2x0_init(void)
-
- /* 32 KiB, 8-way, parity disable */
- l2x0_init(base, 0x00540000, 0xfe000fff);
-+
-+ 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();