From: rmk+kernel@arm•linux.org.uk (Russell King)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 08/16] ARM: l2c: convert prima2 to generic l2c initialisation
Date: Mon, 28 Apr 2014 17:58:27 +0100 [thread overview]
Message-ID: <E1Weost-0002Pn-OT@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20140428165631.GM26756@n2100.arm.linux.org.uk>
Along with this change, we can delete l2x0.c from prima2.
Signed-off-by: Russell King <rmk+kernel@arm•linux.org.uk>
---
arch/arm/mach-prima2/Makefile | 1 -
arch/arm/mach-prima2/common.c | 6 ++++++
arch/arm/mach-prima2/l2x0.c | 17 -----------------
3 files changed, 6 insertions(+), 18 deletions(-)
delete mode 100644 arch/arm/mach-prima2/l2x0.c
diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile
index 7a6b4a323125..8846e7d87ea5 100644
--- a/arch/arm/mach-prima2/Makefile
+++ b/arch/arm/mach-prima2/Makefile
@@ -2,7 +2,6 @@ obj-y += rstc.o
obj-y += common.o
obj-y += rtciobrg.o
obj-$(CONFIG_DEBUG_LL) += lluart.o
-obj-$(CONFIG_CACHE_L2X0) += l2x0.o
obj-$(CONFIG_SUSPEND) += pm.o sleep.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 47c7819edb9b..1cdb8b565cfe 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -34,6 +34,8 @@ static const char *atlas6_dt_match[] __initconst = {
DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr•com> */
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.map_io = sirfsoc_map_io,
.init_late = sirfsoc_init_late,
.dt_compat = atlas6_dt_match,
@@ -48,6 +50,8 @@ static const char *prima2_dt_match[] __initconst = {
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr•com> */
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.map_io = sirfsoc_map_io,
.dma_zone_size = SZ_256M,
.init_late = sirfsoc_init_late,
@@ -64,6 +68,8 @@ static const char *marco_dt_match[] __initconst = {
DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr•com> */
.smp = smp_ops(sirfsoc_smp_ops),
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.map_io = sirfsoc_map_io,
.init_late = sirfsoc_init_late,
.dt_compat = marco_dt_match,
diff --git a/arch/arm/mach-prima2/l2x0.c b/arch/arm/mach-prima2/l2x0.c
deleted file mode 100644
index 09f68f046830..000000000000
--- a/arch/arm/mach-prima2/l2x0.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * l2 cache initialization for CSR SiRFprimaII
- *
- * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
- *
- * Licensed under GPLv2 or later.
- */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <asm/hardware/cache-l2x0.h>
-
-static int __init sirfsoc_l2x0_init(void)
-{
- return l2x0_of_init(0, ~0);
-}
-early_initcall(sirfsoc_l2x0_init);
--
1.8.3.1
next prev parent reply other threads:[~2014-04-28 16:58 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-28 16:56 [PATCH 00/16] Another 16 L2C patches Russell King - ARM Linux
2014-04-28 16:57 ` [PATCH 01/16] ARM: l2c: bcm - remove UL (needs folding into earlier patch) Russell King
2014-04-28 16:57 ` [PATCH 02/16] ARM: l2c: add platform independent core L2 cache initialisation Russell King
2014-04-28 17:54 ` Rob Herring
2014-04-28 18:23 ` Russell King - ARM Linux
2014-04-28 18:50 ` Rob Herring
2014-04-28 19:12 ` Russell King - ARM Linux
2014-04-28 16:58 ` [PATCH 03/16] ARM: l2c: convert rockchip to generic l2c initialisation Russell King
2014-04-28 16:58 ` [PATCH 04/16] ARM: l2c: convert nomadik " Russell King
2014-04-28 16:58 ` [PATCH 05/16] ARM: l2c: convert zynq " Russell King
2014-04-28 16:58 ` [PATCH 06/16] ARM: l2c: convert highbank " Russell King
2014-04-28 16:58 ` [PATCH 07/16] ARM: l2c: convert tegra " Russell King
2014-04-28 17:28 ` Stephen Warren
2014-04-28 17:41 ` Russell King - ARM Linux
2014-04-28 16:58 ` Russell King [this message]
2014-04-28 17:34 ` [PATCH 08/16] ARM: l2c: convert prima2 " Matt Porter
2014-04-28 18:21 ` Russell King - ARM Linux
2014-04-28 16:58 ` [PATCH 09/16] ARM: l2c: convert vexpress " Russell King
2014-04-28 16:58 ` [PATCH 10/16] ARM: l2c: convert mvebu " Russell King
2014-04-28 16:58 ` [PATCH 11/16] ARM: l2c: convert bcm_5301x " Russell King
2014-04-28 16:58 ` [PATCH 12/16] ARM: l2c: convert imx vf610 " Russell King
2014-04-28 16:58 ` [PATCH 13/16] ARM: l2c: convert sti " Russell King
2014-04-28 16:58 ` [PATCH 14/16] ARM: l2c: convert exynos to generic l2c initialisation (and thereby fix it) Russell King
2014-04-28 16:59 ` [PATCH 15/16] ARM: l2c: convert socfpga to generic l2c initialisation Russell King
2014-04-28 17:56 ` Dinh Nguyen
2014-04-28 16:59 ` [PATCH 16/16] ARM: l2c: convert berlin " Russell King
2014-04-28 17:12 ` [PATCH 00/16] Another 16 L2C patches Stephen Warren
2014-04-28 17:27 ` Stephen Warren
2014-04-28 17:39 ` Russell King - ARM Linux
2014-04-28 18:08 ` Stephen Warren
2014-04-28 18:19 ` Russell King - ARM Linux
2014-04-28 18:40 ` Stephen Warren
2014-04-28 19:10 ` Russell King - ARM Linux
2014-04-28 19:00 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Weost-0002Pn-OT@rmk-PC.arm.linux.org.uk \
--to=rmk+kernel@arm$(echo .)linux.org.uk \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox