From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 09/22] ARM: Orion: Move cache-feroceon-l2.h out of plat-orion
Date: Sat, 22 Feb 2014 20:14:51 +0100 [thread overview]
Message-ID: <1393096504-11844-10-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1393096504-11844-1-git-send-email-andrew@lunn.ch>
With the gradual move to DT, kirkwood has become a lot less dependent
on plat-orion. cache-feroceon-l2.h is the last dependency. Move it out
so we can drop plat-orion when building DT only kirkwood boards.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
---
arch/arm/include/asm/hardware/cache-feroceon-l2.h | 11 +++++++++++
arch/arm/mach-kirkwood/board-dt.c | 2 +-
arch/arm/mach-kirkwood/common.c | 2 +-
arch/arm/mach-mv78xx0/common.c | 2 +-
arch/arm/mm/cache-feroceon-l2.c | 2 +-
arch/arm/plat-orion/include/plat/cache-feroceon-l2.h | 11 -----------
6 files changed, 15 insertions(+), 15 deletions(-)
create mode 100644 arch/arm/include/asm/hardware/cache-feroceon-l2.h
delete mode 100644 arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
diff --git a/arch/arm/include/asm/hardware/cache-feroceon-l2.h b/arch/arm/include/asm/hardware/cache-feroceon-l2.h
new file mode 100644
index 000000000000..8edd330aabf6
--- /dev/null
+++ b/arch/arm/include/asm/hardware/cache-feroceon-l2.h
@@ -0,0 +1,11 @@
+/*
+ * arch/arm/include/asm/hardware/cache-feroceon-l2.h
+ *
+ * Copyright (C) 2008 Marvell Semiconductor
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+extern void __init feroceon_l2_init(int l2_wt_override);
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index d5d8f4996722..29c246858d5a 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -20,11 +20,11 @@
#include <linux/dma-mapping.h>
#include <linux/irqchip.h>
#include <linux/kexec.h>
+#include <asm/hardware/cache-feroceon-l2.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/bridge-regs.h>
#include <plat/common.h>
-#include <plat/cache-feroceon-l2.h>
#include <plat/pcie.h>
#include "pm.h"
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 52aca25432a7..255f33a3903c 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -25,10 +25,10 @@
#include <asm/page.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
+#include <asm/hardware/cache-feroceon-l2.h>
#include <mach/kirkwood.h>
#include <mach/bridge-regs.h>
#include <linux/platform_data/asoc-kirkwood.h>
-#include <plat/cache-feroceon-l2.h>
#include <linux/platform_data/mmc-mvsdio.h>
#include <linux/platform_data/mtd-orion_nand.h>
#include <linux/platform_data/usb-ehci-orion.h>
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 75062eff2494..e6ac679bece9 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -15,11 +15,11 @@
#include <linux/ata_platform.h>
#include <linux/clk-provider.h>
#include <linux/ethtool.h>
+#include <asm/hardware/cache-feroceon-l2.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/mv78xx0.h>
#include <mach/bridge-regs.h>
-#include <plat/cache-feroceon-l2.h>
#include <linux/platform_data/usb-ehci-orion.h>
#include <linux/platform_data/mtd-orion_nand.h>
#include <plat/time.h>
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index 48bc3c0a87ce..898362e7972b 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -16,7 +16,7 @@
#include <linux/highmem.h>
#include <asm/cacheflush.h>
#include <asm/cp15.h>
-#include <plat/cache-feroceon-l2.h>
+#include <asm/hardware/cache-feroceon-l2.h>
/*
* Low-level cache maintenance operations.
diff --git a/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h b/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
deleted file mode 100644
index 06f982d55697..000000000000
--- a/arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * arch/arm/plat-orion/include/plat/cache-feroceon-l2.h
- *
- * Copyright (C) 2008 Marvell Semiconductor
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-extern void __init feroceon_l2_init(int l2_wt_override);
--
1.8.5.3
next prev parent reply other threads:[~2014-02-22 19:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-22 19:14 [PATCH v4 00/22] Move DT kirkwood into mach-mvebu Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 01/22] ARM: Kirkwood: Give pm.c its own header file Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 02/22] irqchip: Orion: Fix getting generic chip pointer Andrew Lunn
2014-02-22 19:46 ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 03/22] ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT Andrew Lunn
2014-02-22 19:50 ` Jason Cooper
2014-02-22 20:20 ` Andrew Lunn
2014-02-22 20:23 ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 04/22] ARM: Kirkwood: Drop printing the SoC type and revision Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 05/22] ARM: Kirkwood: Seperate board-dt from common and pcie code Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 06/22] ARM: Kirkwood: ioremap the cpu_config register before using it Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 07/22] ARM: Kirkwood: ioremap memory control register Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 08/22] ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs Andrew Lunn
2014-02-22 19:14 ` Andrew Lunn [this message]
2014-02-22 19:14 ` [PATCH v4 10/22] ARM: MM: Add DT binding for Feroceon L2 cache Andrew Lunn
2014-02-22 20:11 ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 11/22] ARM: Kirkwood: Instantiate L2 cache from DT Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 12/22] ARM: Fix default CPU selection for ARCH_MULTI_V5 Andrew Lunn
2014-02-22 19:58 ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 13/22] ARM: Fix MULTI_TLB for feroceon Andrew Lunn
2014-02-22 20:03 ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 14/22] ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 15/22] ARM: Move kirkwood DT boards into mach-mvebu Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 16/22] ARM: MVEBU: Let kirkwood use the system controller for restart Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 17/22] ARM: MVEBU: Instantiate system controller in kirkwood.dtsi Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 18/22] drivers: Enable building of Kirkwood drivers for mach-mvebu Andrew Lunn
2014-02-24 5:37 ` Viresh Kumar
2014-02-24 17:32 ` Jason Cooper
2014-03-27 17:35 ` Bryan Wu
2014-02-22 19:15 ` [PATCH v4 19/22] ARM: MVEBU: Enable mvebu-soc-id on Kirkwood Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 20/22] ARM: config: Add a multi_v5_defconfig Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 21/22] ARM: MVEBU: Simplifiy headers and make local Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 22/22] ARM: config: Add mvebu_v5_defconfig Andrew Lunn
2014-02-22 22:16 ` [PATCH v4 00/22] Move DT kirkwood into mach-mvebu Jason Cooper
2014-02-23 11:14 ` Andrew Lunn
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=1393096504-11844-10-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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).