From: bryan.wu@canonical.com (Bryan Wu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] arm: footbridge: consolidation code of EBSA285 machine
Date: Mon, 13 Jun 2011 14:39:41 +0800 [thread overview]
Message-ID: <1307947185-5159-3-git-send-email-bryan.wu@canonical.com> (raw)
In-Reply-To: <1307947185-5159-1-git-send-email-bryan.wu@canonical.com>
move PCI code to board file
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
---
| 1 -
| 48 --------------------------------
| 38 +++++++++++++++++++++++++
3 files changed, 38 insertions(+), 49 deletions(-)
delete mode 100644 arch/arm/mach-footbridge/ebsa285-pci.c
--git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile
index e0a8b21..e051668 100644
--- a/arch/arm/mach-footbridge/Makefile
+++ b/arch/arm/mach-footbridge/Makefile
@@ -9,7 +9,6 @@ obj-m :=
obj-n :=
obj- :=
-pci-$(CONFIG_ARCH_EBSA285_HOST) += ebsa285-pci.o
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o
pci-$(CONFIG_ARCH_PERSONAL_SERVER) += personal-pci.o
diff --git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c
deleted file mode 100644
index e5ab5bd..0000000
--- a/arch/arm/mach-footbridge/ebsa285-pci.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * linux/arch/arm/mach-footbridge/ebsa285-pci.c
- *
- * PCI bios-type initialisation for PCI machines
- *
- * Bits taken from various places.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
-
-static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
-{
- if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
- dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
- switch (PCI_FUNC(dev->devfn)) {
- case 1: return 14;
- case 2: return 15;
- case 3: return 12;
- }
-
- return irqmap_ebsa285[(slot + pin) & 3];
-}
-
-static struct hw_pci ebsa285_pci __initdata = {
- .swizzle = pci_std_swizzle,
- .map_irq = ebsa285_map_irq,
- .nr_controllers = 1,
- .setup = dc21285_setup,
- .scan = dc21285_scan_bus,
- .preinit = dc21285_preinit,
- .postinit = dc21285_postinit,
-};
-
-static int __init ebsa285_init_pci(void)
-{
- if (machine_is_ebsa285())
- pci_common_init(&ebsa285_pci);
- return 0;
-}
-
-subsys_initcall(ebsa285_init_pci);
--git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c
index 2ef69ff..fc91c85 100644
--- a/arch/arm/mach-footbridge/ebsa285.c
+++ b/arch/arm/mach-footbridge/ebsa285.c
@@ -5,7 +5,11 @@
*/
#include <linux/init.h>
#include <linux/spinlock.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <asm/irq.h>
+#include <asm/mach/pci.h>
#include <asm/hardware/dec21285.h>
#include <asm/mach-types.h>
@@ -13,6 +17,40 @@
#include "common.h"
+static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
+
+static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+ if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
+ dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
+ switch (PCI_FUNC(dev->devfn)) {
+ case 1: return 14;
+ case 2: return 15;
+ case 3: return 12;
+ }
+
+ return irqmap_ebsa285[(slot + pin) & 3];
+}
+
+static struct hw_pci ebsa285_pci __initdata = {
+ .swizzle = pci_std_swizzle,
+ .map_irq = ebsa285_map_irq,
+ .nr_controllers = 1,
+ .setup = dc21285_setup,
+ .scan = dc21285_scan_bus,
+ .preinit = dc21285_preinit,
+ .postinit = dc21285_postinit,
+};
+
+static int __init ebsa285_init_pci(void)
+{
+ if (machine_is_ebsa285())
+ pci_common_init(&ebsa285_pci);
+ return 0;
+}
+
+subsys_initcall(ebsa285_init_pci);
+
MACHINE_START(EBSA285, "EBSA285")
/* Maintainer: Russell King */
.boot_params = 0x00000100,
--
1.7.5
next prev parent reply other threads:[~2011-06-13 6:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 6:39 [PATCH 0/6] footbridge consolidation patches Bryan Wu
2011-06-13 6:39 ` [PATCH 1/6] arm: footbridge: consolidation code of CATS machine Bryan Wu
2011-06-13 6:39 ` Bryan Wu [this message]
2011-06-13 6:39 ` [PATCH 3/6] arm: footbridge: consolidation code of Netwinder machine Bryan Wu
2011-06-13 6:39 ` [PATCH 4/6] arm: footbridge: consolidation code of Compaq Personal Server Bryan Wu
2011-06-13 6:39 ` [PATCH 5/6] arm: footbridge: convert old leds event driver to led gpio trigger driver of Netwinder Bryan Wu
2011-06-13 8:23 ` Russell King - ARM Linux
2011-06-13 10:02 ` Bryan Wu
2011-06-13 6:39 ` [PATCH 6/6] arm: footbridge: convert old leds event driver to led trigger drivers of EBSA285 Bryan Wu
2011-06-13 8:20 ` [PATCH 0/6] footbridge consolidation patches Russell King - ARM Linux
2011-06-13 9:57 ` Bryan Wu
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=1307947185-5159-3-git-send-email-bryan.wu@canonical.com \
--to=bryan.wu@canonical.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).