diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-11-26 18:01:29 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-11-26 18:01:29 +0000 |
| commit | 2c22edd98f3d88925b7e76c0d4451d256fd08879 (patch) | |
| tree | 69da99e42b8e3084e47027c85990faa7f5665e58 /target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch | |
| parent | 9035847d75d9453f4f55eef1c6f5a8fffa29800c (diff) | |
| download | master-187ad058-2c22edd98f3d88925b7e76c0d4451d256fd08879.tar.gz master-187ad058-2c22edd98f3d88925b7e76c0d4451d256fd08879.tar.bz2 master-187ad058-2c22edd98f3d88925b7e76c0d4451d256fd08879.zip | |
cns3xxx: update to linux 3.14
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43397 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 54 |
1 files changed, 54 insertions, 0 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 new file mode 100644 index 0000000000..73619ba920 --- /dev/null +++ b/target/linux/cns3xxx/patches-3.14/097-l2x0_cmdline_disable.patch @@ -0,0 +1,54 @@ +--- 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(); |