From: Davide Ciminaghi <ciminaghi@gnudd.com>
To: viresh.linux@gmail.com
Cc: 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,
rajeev-dlh.kumar@st.com, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, giancarlo.asnaghi@st.com
Subject: [PATCH 3/8 v3] pl080.h: moved from arm/include/asm/hardware to include/linux/amba/
Date: Sat, 24 Nov 2012 01:22:56 +0100 [thread overview]
Message-ID: <1353716576-19783-1-git-send-email-ciminaghi@gnudd.com> (raw)
In-Reply-To: <CAOh2x=keCbnPQzxB+AT5hEt_ukQ6GhPLuxkaQJCML27H9LbWwg@mail.gmail.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>
---
As requested by Viresh Kumar, this is 3/8 again, generated with
git format-patch -C -M
Since the patch is not identical to the previous 3/8, I added "v3"
to the subject.
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 98144ba..ba61129 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -15,9 +15,9 @@
#include <linux/amba/pl022.h>
#include <linux/amba/pl08x.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-11-24 0:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-23 15:08 [PATCH v2 0/8] enable support for AMBA drivers under x86 Davide Ciminaghi
2012-11-23 15:08 ` [PATCH 1/8] DMA: PL330: use prefix in reg names to build " Davide Ciminaghi
2012-11-23 15:51 ` viresh kumar
2012-11-23 17:23 ` Davide Ciminaghi
2012-11-23 17:28 ` Viresh Kumar
2012-11-24 0:53 ` [PATCH 1/8 v3] " Davide Ciminaghi
2012-11-24 5:14 ` Jassi Brar
2012-11-24 7:03 ` Alessandro Rubini
2012-11-24 11:05 ` Jassi Brar
2012-11-28 16:15 ` Davide Ciminaghi
2012-11-23 15:08 ` [PATCH 2/8] gpio: pl061 depends on ARM Davide Ciminaghi
2012-11-23 15:57 ` viresh kumar
2012-12-01 15:11 ` Linus Walleij
2012-12-03 13:31 ` Davide Ciminaghi
2012-11-23 15:08 ` [PATCH 3/8] pl080.h: moved from arm/include/asm/hardware to include/linux/amba/ Davide Ciminaghi
2012-11-23 15:53 ` viresh kumar
2012-11-24 0:22 ` Davide Ciminaghi [this message]
2012-11-28 16:04 ` [PATCH 3/8 v3] " Linus Walleij
2012-11-23 15:08 ` [PATCH 4/8] watchdog: sp805_wdt depends on ARM Davide Ciminaghi
2012-11-23 15:56 ` viresh kumar
2012-11-28 16:00 ` Linus Walleij
2012-11-23 15:08 ` [PATCH 5/8] mmci: replace readsl/writesl with ioread32_rep/iowrite32_rep Davide Ciminaghi
2012-11-28 16:08 ` Linus Walleij
2012-11-28 16:33 ` Davide Ciminaghi
2012-12-03 14:47 ` Will Deacon
2012-12-03 16:55 ` Davide Ciminaghi
2012-11-23 15:08 ` [PATCH 6/8] mmc: use the new <linux/sizes.h> Davide Ciminaghi
2012-11-23 15:59 ` viresh kumar
2012-11-26 19:08 ` David Brown
2012-12-01 17:05 ` Linus Walleij
2012-11-23 15:08 ` [PATCH 7/8] drivers/amba: add support for a PCI bridge Davide Ciminaghi
2012-11-23 15:08 ` [PATCH 8/8] x86: add CONFIG_ARM_AMBA, selected by STA2X11 Davide Ciminaghi
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=1353716576-19783-1-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=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=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®