target/linux/ath79/patches-4.14/0026-MIPS-ath79-sanitize-Kconfig-symbols.patch

   1 From deda44895d289a72a235359fc21f8a62ea44dc1c Mon Sep 17 00:00:00 2001
   2 From: John Crispin <john@phrozen.org>
   3 Date: Tue, 6 Mar 2018 09:33:26 +0100
   4 Subject: [PATCH 26/27] MIPS: ath79: sanitize Kconfig symbols
   5
   6 Signed-off-by: John Crispin <john@phrozen.org>
   7 ---
   8  arch/mips/Kconfig        |  2 ++
   9  arch/mips/ath79/Kconfig  | 48 +++++-------------------------------------------
  10  arch/mips/ath79/Makefile | 10 ----------
  11  arch/mips/pci/Makefile   |  2 +-
  12  4 files changed, 8 insertions(+), 54 deletions(-)
  13
  14 --- a/arch/mips/Kconfig
  15 +++ b/arch/mips/Kconfig
  16 @@ -203,6 +203,8 @@ config ATH79
  17         select SYS_SUPPORTS_BIG_ENDIAN
  18         select SYS_SUPPORTS_MIPS16
  19         select SYS_SUPPORTS_ZBOOT_UART_PROM
  20 +       select HW_HAS_PCI
  21 +       select USB_ARCH_HAS_EHCI
  22         select USE_OF
  23         help
  24           Support for the Atheros AR71XX/AR724X/AR913X SoCs.
  25 --- a/arch/mips/ath79/Kconfig
  26 +++ b/arch/mips/ath79/Kconfig
  27 @@ -1,52 +1,14 @@
  28  # SPDX-License-Identifier: GPL-2.0
  29  if ATH79
  30
  31 -config SOC_AR71XX
  32 -       select HW_HAS_PCI
  33 -       def_bool n
  34 -
  35 -config SOC_AR724X
  36 -       select HW_HAS_PCI
  37 -       select PCI_AR724X if PCI
  38 -       def_bool n
  39 -
  40 -config SOC_AR913X
  41 -       def_bool n
  42 -
  43 -config SOC_AR933X
  44 -       def_bool n
  45 -
  46 -config SOC_AR934X
  47 -       select HW_HAS_PCI
  48 -       select PCI_AR724X if PCI
  49 -       def_bool n
  50 -
  51 -config SOC_QCA953X
  52 -       select USB_ARCH_HAS_EHCI
  53 -       def_bool n
  54 -
  55 -config SOC_QCA955X
  56 -       select HW_HAS_PCI
  57 -       select PCI_AR724X if PCI
  58 +config PCI_AR71XX
  59 +       bool "PCI support for AR7100 type SoCs"
  60 +       depends on PCI
  61         def_bool n
  62
  63  config PCI_AR724X
  64 -       def_bool n
  65 -
  66 -config ATH79_DEV_GPIO_BUTTONS
  67 -       def_bool n
  68 -
  69 -config ATH79_DEV_LEDS_GPIO
  70 -       def_bool n
  71 -
  72 -config ATH79_DEV_SPI
  73 -       def_bool n
  74 -
  75 -config ATH79_DEV_USB
  76 -       def_bool n
  77 -
  78 -config ATH79_DEV_WMAC
  79 -       depends on (SOC_AR913X || SOC_AR933X || SOC_AR934X || SOC_QCA953X || SOC_QCA955X || SOC_QCA956X)
  80 +       bool "PCI support for AR724x type SoCs"
  81 +       depends on PCI
  82         def_bool n
  83
  84  endif
  85 --- a/arch/mips/ath79/Makefile
  86 +++ b/arch/mips/ath79/Makefile
  87 @@ -11,13 +11,3 @@
  88  obj-y  := prom.o setup.o common.o clock.o
  89
  90  obj-$(CONFIG_EARLY_PRINTK)             += early_printk.o
  91 -
  92 -#
  93 -# Devices
  94 -#
  95 -obj-y                                  += dev-common.o
  96 -obj-$(CONFIG_ATH79_DEV_GPIO_BUTTONS)   += dev-gpio-buttons.o
  97 -obj-$(CONFIG_ATH79_DEV_LEDS_GPIO)      += dev-leds-gpio.o
  98 -obj-$(CONFIG_ATH79_DEV_SPI)            += dev-spi.o
  99 -obj-$(CONFIG_ATH79_DEV_USB)            += dev-usb.o
 100 -obj-$(CONFIG_ATH79_DEV_WMAC)           += dev-wmac.o
 101 --- a/arch/mips/pci/Makefile
 102 +++ b/arch/mips/pci/Makefile
 103 @@ -23,7 +23,7 @@ obj-$(CONFIG_BCM63XX)         += pci-bcm63xx.o
 104                                         ops-bcm63xx.o
 105  obj-$(CONFIG_MIPS_ALCHEMY)     += pci-alchemy.o
 106  obj-$(CONFIG_PCI_AR2315)       += pci-ar2315.o
 107 -obj-$(CONFIG_SOC_AR71XX)       += pci-ar71xx.o
 108 +obj-$(CONFIG_PCI_AR71XX)       += pci-ar71xx.o
 109  obj-$(CONFIG_PCI_AR724X)       += pci-ar724x.o
 110  obj-$(CONFIG_MIPS_PCI_VIRTIO)  += pci-virtio-guest.o
 111  #