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 | 98f7b387351b0b540ca76edd84452290a146de5b (patch) | |
| tree | 2276b58f8fa7d57cb6007026ca5c4ef53eca051c /target | |
| parent | 33bf9bc63bfa888a008a19a6a92f69ef3042f707 (diff) | |
| download | upstream-98f7b387351b0b540ca76edd84452290a146de5b.tar.gz upstream-98f7b387351b0b540ca76edd84452290a146de5b.tar.bz2 upstream-98f7b387351b0b540ca76edd84452290a146de5b.zip | |
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')
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); |