From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/5] arm/versatile: move pci code to plat-versatile
Date: Wed, 4 Aug 2010 19:24:48 +0200 [thread overview]
Message-ID: <1280942692-32079-2-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1280942692-32079-1-git-send-email-arnd@arndb.de>
The Xilinx PCI macro is used on both versatile-pb and
realview-eb, so we should move the implementation to place
where it can be shared.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/Kconfig | 5 +++++
arch/arm/mach-versatile/Makefile | 1 -
arch/arm/plat-versatile/Makefile | 1 +
.../pci.c => plat-versatile/xilinx-pci.c} | 0
4 files changed, 6 insertions(+), 1 deletions(-)
rename arch/arm/{mach-versatile/pci.c => plat-versatile/xilinx-pci.c} (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7b117b1..ddbcaf2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1086,6 +1086,11 @@ config PCI_HOST_ITE8152
default y
select DMABOUNCE
+config PCI_HOST_XILINX
+ bool
+ depends on PCI && (ARCH_VERSATILE_PB || MACH_REALVIEW_EB || MACH_REALVIEW_PB1176)
+ default y
+
source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig"
diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile
index 97cf4d8..191b65b 100644
--- a/arch/arm/mach-versatile/Makefile
+++ b/arch/arm/mach-versatile/Makefile
@@ -5,4 +5,3 @@
obj-y := core.o
obj-$(CONFIG_ARCH_VERSATILE_PB) += versatile_pb.o
obj-$(CONFIG_MACH_VERSATILE_AB) += versatile_ab.o
-obj-$(CONFIG_PCI) += pci.o
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 5cf88e8..de870b7 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -6,3 +6,4 @@ ifeq ($(CONFIG_LEDS_CLASS),y)
obj-$(CONFIG_ARCH_REALVIEW) += leds.o
obj-$(CONFIG_ARCH_VERSATILE) += leds.o
endif
+obj-$(CONFIG_PCI_HOST_XILINX) += xilinx-pci.o
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/plat-versatile/xilinx-pci.c
similarity index 100%
rename from arch/arm/mach-versatile/pci.c
rename to arch/arm/plat-versatile/xilinx-pci.c
--
1.7.1
next prev parent reply other threads:[~2010-08-04 17:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-04 17:24 [PATCH 0/5] arm/versatile: generalize PCI code Arnd Bergmann
2010-08-04 17:24 ` Arnd Bergmann [this message]
2010-08-04 17:24 ` [PATCH 2/5] arm/versatile: boot-time configure xilinx-pci Arnd Bergmann
2010-08-04 17:24 ` [PATCH 3/5] arm/versatile: enable PCI I/O space Arnd Bergmann
2010-08-04 17:24 ` [PATCH 4/5] arm/realview: enable PCI for realview-eb and realview-pb1176 Arnd Bergmann
2010-08-05 7:27 ` Linus Walleij
2010-08-04 17:24 ` [PATCH 5/5] arm: Enable support for virtio 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=1280942692-32079-2-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--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).