From: Davide Ciminaghi <ciminaghi@gnudd.com>
To: jaswinder.singh@linaro.org, will.deacon@arm.com,
linux@arm.linux.org.uk, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, djbw@fb.com, vinod.koul@intel.com,
grant.likely@secretlab.ca, linus.walleij@linaro.org,
rubini@gnudd.com, wim@iguana.be, cjb@laptop.org,
davidb@codeaurora.org, nico@fluxnic.net, ben-linux@fluff.org,
viresh.linux@gmail.com, rajeev-dlh.kumar@st.com
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, giancarlo.asnaghi@st.com
Subject: [PATCH v4 2/7] pl080.h: moved from arm/include/asm/hardware to include/linux/amba/
Date: Mon, 10 Dec 2012 14:42:31 +0100 [thread overview]
Message-ID: <1355146956-6009-3-git-send-email-ciminaghi@gnudd.com> (raw)
In-Reply-To: <1355146956-6009-1-git-send-email-ciminaghi@gnudd.com>
From: Alessandro Rubini <rubini@gnudd.com>
The header is used by drivers/dma/amba-pl08x.c, which can be compiled
under x86, where PL080 exists under a PCI-to-AMBA bridge. This patche
moves it where it can be accessed by other architectures, and fixes
all users.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
---
arch/arm/mach-s3c64xx/dma.c | 2 +-
arch/arm/mach-spear3xx/spear3xx.c | 2 +-
arch/arm/mach-spear6xx/spear6xx.c | 2 +-
drivers/dma/amba-pl08x.c | 2 +-
{arch/arm/include/asm/hardware => include/linux/amba}/pl080.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename {arch/arm/include/asm/hardware => include/linux/amba}/pl080.h (99%)
diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index f2a7a17..a77f521 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -23,6 +23,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
+#include <linux/amba/pl080.h>
#include <mach/dma.h>
#include <mach/map.h>
@@ -30,7 +31,6 @@
#include <mach/regs-sys.h>
-#include <asm/hardware/pl080.h>
/* dma channel state information */
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index 38fe95d..88be9a3 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -16,9 +16,9 @@
#include <linux/amba/pl022.h>
#include <linux/amba/pl08x.h>
#include <linux/irqchip/spear-shirq.h>
+#include <linux/amba/pl080.h>
#include <linux/of_irq.h>
#include <linux/io.h>
-#include <asm/hardware/pl080.h>
#include <asm/hardware/vic.h>
#include <plat/pl080.h>
#include <mach/generic.h>
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
index 5a5a52d..8ce65a2 100644
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@ -20,7 +20,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <asm/hardware/pl080.h>
+#include <linux/amba/pl080.h>
#include <asm/hardware/vic.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 6eb6a5c..8bad254 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -83,7 +83,7 @@
#include <linux/pm_runtime.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
-#include <asm/hardware/pl080.h>
+#include <linux/amba/pl080.h>
#include "dmaengine.h"
#include "virt-dma.h"
diff --git a/arch/arm/include/asm/hardware/pl080.h b/include/linux/amba/pl080.h
similarity index 99%
rename from arch/arm/include/asm/hardware/pl080.h
rename to include/linux/amba/pl080.h
index 4eea210..3e7b62f 100644
--- a/arch/arm/include/asm/hardware/pl080.h
+++ b/include/linux/amba/pl080.h
@@ -1,4 +1,4 @@
-/* arch/arm/include/asm/hardware/pl080.h
+/* include/linux/amba/pl080.h
*
* Copyright 2008 Openmoko, Inc.
* Copyright 2008 Simtec Electronics
--
1.7.10.4
next prev parent reply other threads:[~2012-12-10 13:44 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-10 13:42 [PATCH v4 0/7] enable support for AMBA drivers under x86 Davide Ciminaghi
2012-12-10 13:42 ` [PATCH v4 1/7] DMA: PL330: use prefix in reg names to build " Davide Ciminaghi
2012-12-11 4:25 ` Jassi Brar
2012-12-10 13:42 ` Davide Ciminaghi [this message]
2012-12-10 21:44 ` [PATCH v4 2/7] pl080.h: moved from arm/include/asm/hardware to include/linux/amba/ Linus Walleij
2012-12-10 22:25 ` Davide Ciminaghi
2013-01-13 13:25 ` Vinod Koul
2012-12-10 13:42 ` [PATCH v4 3/7] watchdog: sp805_wdt depends on ARM Davide Ciminaghi
2012-12-12 21:21 ` Wim Van Sebroeck
2012-12-12 22:20 ` Grant Likely
2012-12-10 13:42 ` [PATCH v4 4/7] mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep Davide Ciminaghi
2012-12-10 13:42 ` [PATCH v4 5/7] mmc: use the new <linux/sizes.h> Davide Ciminaghi
2012-12-10 13:42 ` [PATCH v4 6/7] drivers/amba: add support for a PCI bridge Davide Ciminaghi
2012-12-10 13:42 ` [PATCH v4 7/7] x86: add CONFIG_ARM_AMBA, selected by STA2X11 Davide Ciminaghi
2012-12-13 0:48 ` H. Peter Anvin
2012-12-10 22:15 ` [PATCH v4 0/7] enable support for AMBA drivers under x86 David Brown
2012-12-13 0:37 ` H. Peter Anvin
2012-12-13 1:10 ` Grant Likely
2012-12-13 1:16 ` H. Peter Anvin
2012-12-13 2:02 ` H. Peter Anvin
2012-12-13 2:16 ` H. Peter Anvin
2012-12-13 18:14 ` Alessandro Rubini
2013-05-05 12:36 ` Borislav Petkov
2013-05-05 20:24 ` Alessandro Rubini
2013-05-05 20:39 ` Borislav Petkov
2013-05-06 9:41 ` Ingo Molnar
2013-05-06 10:11 ` Borislav Petkov
2013-05-06 9:54 ` Alessandro Rubini
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=1355146956-6009-3-git-send-email-ciminaghi@gnudd.com \
--to=ciminaghi@gnudd.com \
--cc=ben-linux@fluff.org \
--cc=cjb@laptop.org \
--cc=davidb@codeaurora.org \
--cc=djbw@fb.com \
--cc=giancarlo.asnaghi@st.com \
--cc=grant.likely@secretlab.ca \
--cc=hpa@zytor.com \
--cc=jaswinder.singh@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mingo@redhat.com \
--cc=nico@fluxnic.net \
--cc=rajeev-dlh.kumar@st.com \
--cc=rubini@gnudd.com \
--cc=tglx@linutronix.de \
--cc=vinod.koul@intel.com \
--cc=viresh.linux@gmail.com \
--cc=will.deacon@arm.com \
--cc=wim@iguana.be \
/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
all inboxes | Powered by JetHome®