From: 21cnbao@gmail.com (Barry Song)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V3 04/10] ARM: sirf: drop MARCO machine
Date: Sat, 3 Jan 2015 16:27:38 +0800 [thread overview]
Message-ID: <1420273664-10438-5-git-send-email-21cnbao@gmail.com> (raw)
In-Reply-To: <1420273664-10438-1-git-send-email-21cnbao@gmail.com>
From: Barry Song <Baohua.Song@csr.com>
MARCO will not be supported any more. it has been replaced by CSR
atlas7.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-prima2/Kconfig | 9 ---------
arch/arm/mach-prima2/common.c | 17 -----------------
arch/arm/mach-prima2/rtciobrg.c | 1 -
3 files changed, 27 deletions(-)
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 042f693..cc1c323 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -28,15 +28,6 @@ config ARCH_PRIMA2
help
Support for CSR SiRFSoC ARM Cortex A9 Platform
-config ARCH_MARCO
- bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform"
- default y
- select ARM_GIC
- select HAVE_ARM_SCU if SMP
- select SMP_ON_UP if SMP
- help
- Support for CSR SiRFSoC ARM Cortex A9 Platform
-
config SIRF_IRQ
bool
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index a860ea2..bc53cc4 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -58,20 +58,3 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
.dt_compat = prima2_dt_match,
MACHINE_END
#endif
-
-#ifdef CONFIG_ARCH_MARCO
-static const char *marco_dt_match[] __initconst = {
- "sirf,marco",
- NULL
-};
-
-DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
- /* Maintainer: Barry Song <baohua.song@csr.com> */
- .l2c_aux_val = 0,
- .l2c_aux_mask = ~0,
- .smp = smp_ops(sirfsoc_smp_ops),
- .map_io = sirfsoc_map_io,
- .init_late = sirfsoc_init_late,
- .dt_compat = marco_dt_match,
-MACHINE_END
-#endif
diff --git a/arch/arm/mach-prima2/rtciobrg.c b/arch/arm/mach-prima2/rtciobrg.c
index 70a0b47..8f66d8f 100644
--- a/arch/arm/mach-prima2/rtciobrg.c
+++ b/arch/arm/mach-prima2/rtciobrg.c
@@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel);
static const struct of_device_id rtciobrg_ids[] = {
{ .compatible = "sirf,prima2-rtciobg" },
- { .compatible = "sirf,marco-rtciobg" },
{}
};
--
2.2.1
next prev parent reply other threads:[~2015-01-03 8:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-03 8:27 [PATCH V3 00/10] ARM: sirf: drop CSR marco and add atlas7 platform Barry Song
2015-01-03 8:27 ` [PATCH V3 01/10] ARM: sirf: drop MARCO low-level debug port Barry Song
2015-01-03 8:27 ` [PATCH V3 02/10] ARM: dts: drop MARCO platform DT stuff Barry Song
2015-01-03 8:27 ` [PATCH V3 03/10] ARM: sirf: drop MARCO support in reset controller module Barry Song
2015-01-03 8:27 ` Barry Song [this message]
2015-01-03 8:27 ` [PATCH V3 05/10] ARM: sirf: move platsmp to support atlas7 SoC Barry Song
2015-01-03 8:27 ` [PATCH V3 06/10] ARM: sirf: add two debug ports for CSRatlas7 SoC Barry Song
2015-01-03 8:27 ` [PATCH V3 07/10] ARM: sirf: move to debug_ll_io_init and drop map_io Barry Song
2015-01-03 8:27 ` [PATCH V3 08/10] ARM: sirf: add atlas7 machine support Barry Song
2015-01-03 8:27 ` [PATCH V3 09/10] ARM: dts: add init dts file for CSR atlas7 SoC Barry Song
2015-01-03 8:27 ` [PATCH V3 10/10] clocksource: marco: rename marco to atlas7 Barry Song
2015-01-05 15:24 ` [PATCH V3 00/10] ARM: sirf: drop CSR marco and add atlas7 platform Arnd Bergmann
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=1420273664-10438-5-git-send-email-21cnbao@gmail.com \
--to=21cnbao@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).