summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-16 08:17:52 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-16 08:17:52 +0000
commitd81767c11909492ee8adab787b48207b347bc6f0 (patch)
tree2276b58f8fa7d57cb6007026ca5c4ef53eca051c /target/linux
parent013dc5a5d6de309344092bc4dd85f53d5c704078 (diff)
ramips: rt288x: don't register the PCI controller on each board
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30574 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h6
-rw-r--r--target/linux/ramips/files/arch/mips/pci/pci-rt288x.c4
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/mach-v11st-fe.c1
3 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
index 3eb036fbb..29c7a7205 100644
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h
@@ -66,4 +66,10 @@ static inline u32 rt288x_memc_rr(unsigned reg)
void rt288x_gpio_init(u32 mode);
+#ifdef CONFIG_PCI
+int rt288x_register_pci(void);
+#else
+static inline int rt288x_register_pci(void) { return 0; }
+#endif /* CONFIG_PCI */
+
#endif /* _RT228X_H_ */
diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
index 16f3bf771..f67902272 100644
--- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
+++ b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
@@ -210,7 +210,7 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
return irq;
}
-static int __init rt2880_pci_init(void)
+int __init rt288x_register_pci(void)
{
void __iomem *io_map_base;
int i;
@@ -248,5 +248,3 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
{
return 0;
}
-
-arch_initcall(rt2880_pci_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-v11st-fe.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-v11st-fe.c
index 631468086..e2511d4df 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-v11st-fe.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-v11st-fe.c
@@ -101,6 +101,7 @@ static void __init rt_v11st_fe_init(void)
rt288x_register_ethernet();
rt288x_register_wdt();
+ rt288x_register_pci();
}
MIPS_MACHINE(RAMIPS_MACH_V11ST_FE, "V11ST-FE", "Ralink V11ST-FE", rt_v11st_fe_init);