| 1 | From 27a5b2948831f4fd8e66e2e1a98b4c23902728cc Mon Sep 17 00:00:00 2001 |
| 2 | From: Gabor Juhos <juhosg@openwrt.org> |
| 3 | Date: Wed, 14 Mar 2012 10:45:29 +0100 |
| 4 | Subject: [PATCH 34/47] MIPS: ath79: add PCI_AR724X Kconfig symbol |
| 5 | |
| 6 | The AR724X specific PCI code can be used for the |
| 7 | AR934X SoCs, however it can be selected only if |
| 8 | SOC_AR724X is set. |
| 9 | |
| 10 | Introduce a new Kconfig symbol in order to be able |
| 11 | to use the code for AR934X as well. |
| 12 | |
| 13 | Signed-off-by: Gabor Juhos <juhosg@openwrt.org> |
| 14 | Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com> |
| 15 | Cc: linux-mips@linux-mips.org |
| 16 | Cc: mcgrof@infradead.org |
| 17 | Patchwork: https://patchwork.linux-mips.org/patch/3514/ |
| 18 | Signed-off-by: Ralf Baechle <ralf@linux-mips.org> |
| 19 | --- |
| 20 | arch/mips/ath79/Kconfig | 4 ++++ |
| 21 | arch/mips/include/asm/mach-ath79/pci.h | 2 +- |
| 22 | arch/mips/pci/Makefile | 2 +- |
| 23 | 3 files changed, 6 insertions(+), 2 deletions(-) |
| 24 | |
| 25 | --- a/arch/mips/ath79/Kconfig |
| 26 | +++ b/arch/mips/ath79/Kconfig |
| 27 | @@ -59,6 +59,7 @@ config SOC_AR724X |
| 28 | select USB_ARCH_HAS_EHCI |
| 29 | select USB_ARCH_HAS_OHCI |
| 30 | select HW_HAS_PCI |
| 31 | + select PCI_AR724X if PCI |
| 32 | def_bool n |
| 33 | |
| 34 | config SOC_AR913X |
| 35 | @@ -73,6 +74,9 @@ config SOC_AR934X |
| 36 | select USB_ARCH_HAS_EHCI |
| 37 | def_bool n |
| 38 | |
| 39 | +config PCI_AR724X |
| 40 | + def_bool n |
| 41 | + |
| 42 | config ATH79_DEV_GPIO_BUTTONS |
| 43 | def_bool n |
| 44 | |
| 45 | --- a/arch/mips/include/asm/mach-ath79/pci.h |
| 46 | +++ b/arch/mips/include/asm/mach-ath79/pci.h |
| 47 | @@ -19,7 +19,7 @@ int ar71xx_pcibios_init(void); |
| 48 | static inline int ar71xx_pcibios_init(void) { return 0; } |
| 49 | #endif |
| 50 | |
| 51 | -#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X) |
| 52 | +#if defined(CONFIG_PCI_AR724X) |
| 53 | int ar724x_pcibios_init(int irq); |
| 54 | #else |
| 55 | static inline int ar724x_pcibios_init(int irq) { return 0; } |
| 56 | --- a/arch/mips/pci/Makefile |
| 57 | +++ b/arch/mips/pci/Makefile |
| 58 | @@ -20,7 +20,7 @@ obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o |
| 59 | ops-bcm63xx.o |
| 60 | obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o |
| 61 | obj-$(CONFIG_SOC_AR71XX) += pci-ar71xx.o |
| 62 | -obj-$(CONFIG_SOC_AR724X) += pci-ar724x.o |
| 63 | +obj-$(CONFIG_PCI_AR724X) += pci-ar724x.o |
| 64 | |
| 65 | # |
| 66 | # These are still pretty much in the old state, watch, go blind. |
| 67 | |
