target/linux/ar71xx/patches-3.2/132-MIPS-ath79-add-PCI_AR724X-Kconfig-symbol.patch

   1 From f299f36542f81f05cff7cdebb50abde202faf6df Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Sat, 17 Dec 2011 10:04:18 +0100
   4 Subject: [PATCH 32/35] 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 ---
  16  arch/mips/ath79/Kconfig                |    4 ++++
  17  arch/mips/include/asm/mach-ath79/pci.h |    2 +-
  18  arch/mips/pci/Makefile                 |    2 +-
  19  3 files changed, 6 insertions(+), 2 deletions(-)
  20
  21 --- a/arch/mips/ath79/Kconfig
  22 +++ b/arch/mips/ath79/Kconfig
  23 @@ -59,6 +59,7 @@ config SOC_AR724X
  24         select USB_ARCH_HAS_EHCI
  25         select USB_ARCH_HAS_OHCI
  26         select HW_HAS_PCI
  27 +       select PCI_AR724X if PCI
  28         def_bool n
  29
  30  config SOC_AR913X
  31 @@ -73,6 +74,9 @@ config SOC_AR934X
  32         select USB_ARCH_HAS_EHCI
  33         def_bool n
  34
  35 +config PCI_AR724X
  36 +       def_bool n
  37 +
  38  config ATH79_DEV_GPIO_BUTTONS
  39         def_bool n
  40
  41 --- a/arch/mips/include/asm/mach-ath79/pci.h
  42 +++ b/arch/mips/include/asm/mach-ath79/pci.h
  43 @@ -19,7 +19,7 @@ int ar71xx_pcibios_init(void);
  44  static inline int ar71xx_pcibios_init(void) { return 0 };
  45  #endif
  46
  47 -#if defined(CONFIG_PCI) && defined(CONFIG_SOC_AR724X)
  48 +#if defined(CONFIG_PCI_AR724X)
  49  int ar724x_pcibios_init(int irq);
  50  #else
  51  static inline int ar724x_pcibios_init(int irq) { return 0 };
  52 --- a/arch/mips/pci/Makefile
  53 +++ b/arch/mips/pci/Makefile
  54 @@ -20,7 +20,7 @@ obj-$(CONFIG_BCM63XX)         += pci-bcm63xx.o
  55                                         ops-bcm63xx.o
  56  obj-$(CONFIG_MIPS_ALCHEMY)     += pci-alchemy.o
  57  obj-$(CONFIG_SOC_AR71XX)       += pci-ar71xx.o
  58 -obj-$(CONFIG_SOC_AR724X)       += pci-ar724x.o
  59 +obj-$(CONFIG_PCI_AR724X)       += pci-ar724x.o
  60
  61  #
  62  # These are still pretty much in the old state, watch, go blind.