diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-14 10:29:24 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-05-15 17:49:01 +0200 |
| commit | 6335aef59c55f50e6d8017a28c0ee985b533ea29 (patch) | |
| tree | a1014ca9517a7df6e51f1f709b6b0f033a105b58 | |
| parent | 659243ccaf296ae122c159d4c573f93561e1b8d6 (diff) | |
| download | linux-6335aef59c55f50e6d8017a28c0ee985b533ea29.tar.gz | |
MIPS: ath79: add a common PCI registration function
The current code unconditionally registers the AR724X specific PCI controller, even if the kernel is running on a different SoC. Add a common function for PCI controller registration, and only register the AR724X PCI controller if the kernel is running on an AR724X SoC. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3488/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/ath79/mach-ubnt-xm.c | 1 | ||||
| -rw-r--r-- | arch/mips/ath79/pci.c | 10 | ||||
| -rw-r--r-- | arch/mips/ath79/pci.h | 6 | ||||
| -rw-r--r-- | arch/mips/pci/pci-ath724x.c | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/arch/mips/ath79/mach-ubnt-xm.c b/arch/mips/ath79/mach-ubnt-xm.c index a0435003b2e7..edbc093bf665 100644 --- a/arch/mips/ath79/mach-ubnt-xm.c +++ b/arch/mips/ath79/mach-ubnt-xm.c @@ -111,6 +111,7 @@ static void __init ubnt_xm_init(void) ath724x_pci_add_data(ubnt_xm_pci_data, ARRAY_SIZE(ubnt_xm_pci_data)); #endif /* CONFIG_PCI */ + ath79_register_pci(); } MIPS_MACHINE(ATH79_MACH_UBNT_XM, diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c index 49574284b755..855a69dcc86e 100644 --- a/arch/mips/ath79/pci.c +++ b/arch/mips/ath79/pci.c @@ -9,6 +9,8 @@ */ #include <linux/pci.h> +#include <asm/mach-ath79/ath79.h> +#include <asm/mach-ath79/pci.h> #include "pci.h" static struct ath724x_pci_data *pci_data; @@ -44,3 +46,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev) return PCIBIOS_SUCCESSFUL; } + +int __init ath79_register_pci(void) +{ + if (soc_is_ar724x()) + return ath724x_pcibios_init(); + + return -ENODEV; +} diff --git a/arch/mips/ath79/pci.h b/arch/mips/ath79/pci.h index 454885fa30c3..787fac2c08f0 100644 --- a/arch/mips/ath79/pci.h +++ b/arch/mips/ath79/pci.h @@ -18,4 +18,10 @@ struct ath724x_pci_data { void ath724x_pci_add_data(struct ath724x_pci_data *data, int size); +#ifdef CONFIG_PCI +int ath79_register_pci(void); +#else +static inline int ath79_register_pci(void) { return 0; } +#endif + #endif /* __ASM_MACH_ATH79_PCI_ATH724X_H */ diff --git a/arch/mips/pci/pci-ath724x.c b/arch/mips/pci/pci-ath724x.c index be01b7f8d840..ebefc165fae6 100644 --- a/arch/mips/pci/pci-ath724x.c +++ b/arch/mips/pci/pci-ath724x.c @@ -137,5 +137,3 @@ int __init ath724x_pcibios_init(void) return PCIBIOS_SUCCESSFUL; } - -arch_initcall(ath724x_pcibios_init); |