diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-16 08:17:52 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-16 08:17:52 +0000 |
| commit | b4af07d5c069334e21bb9d39f355383c5ff692ed (patch) | |
| tree | da264c1df7696f6633b7c076915f419da3178f87 | |
| parent | f8a56dc8dfc95c04257bfe6a5308f72c99d73aa8 (diff) | |
| download | upstream-b4af07d5c069334e21bb9d39f355383c5ff692ed.tar.gz upstream-b4af07d5c069334e21bb9d39f355383c5ff692ed.tar.bz2 upstream-b4af07d5c069334e21bb9d39f355383c5ff692ed.zip | |
ramips: rt288x: don't register the PCI controller on each board
SVN-Revision: 30574
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 3eb036fbb8..29c7a72050 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 16f3bf7717..f67902272c 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 6314680864..e2511d4df7 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); |