Merge tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiro...

Pull Kconfig file consolidation from Masahiro Yamada:
 "Consolidation of bus (PCI, PCMCIA, EISA, RapidIO) config entries by
  Christoph Hellwig.

  Currently, every architecture that wants to provide common peripheral
  busses needs to add some boilerplate code and include the right
  Kconfig files. This series instead just selects the presence (when
  needed) and then handles everything in the bus-specific Kconfig file
  under drivers/"

* tag 'kconfig-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  pcmcia: remove per-arch PCMCIA config entry
  eisa: consolidate EISA Kconfig entry in drivers/eisa
  rapidio: consolidate RAPIDIO config entry in drivers/rapidio
  pcmcia: allow PCMCIA support independent of the architecture
  PCI: consolidate the PCI_SYSCALL symbol
  PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options
  PCI: consolidate PCI config entry in drivers/pci
  MIPS: remove the HT_PCI config option

diff --cc arch/alpha/Kconfig
index 5da6ff54b3e754445e13042f7ae0480e78d5b303,5e7a44e6110f87b18f199182b5f1f532bdf861f3..584a6e1148539682a34a4c480c3f5252ee169267
--- 1/arch/alpha/Kconfig
--- 2/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@@ -5,8 -5,10 +5,11 @@@ config ALPH
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_NO_PREEMPT
 +      select ARCH_NO_SG_CHAIN
        select ARCH_USE_CMPXCHG_LOCKREF
+       select FORCE_PCI if !ALPHA_JENSEN
+       select PCI_DOMAINS if PCI
+       select PCI_SYSCALL if PCI
        select HAVE_AOUT
        select HAVE_IDE
        select HAVE_OPROFILE
@@@ -203,6 -208,8 +209,7 @@@ config ALPHA_EIGE
  config ALPHA_JENSEN
        bool "Jensen"
        depends on BROKEN
 -      select DMA_DIRECT_OPS
+       select HAVE_EISA
        help
          DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
          of the first-generation Alpha systems. A number of these systems

diff --cc arch/arc/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
index 5c02802f049395792b0ef9081af881ce54df6d79,8db186f8442b307801ed2f955099e3eed6606709..a4168d36612772a7668ee0a7d9e83afef40a729d
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -163,7 -164,9 +164,9 @@@ config ARM6
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM
 -      select PCI_ECAM if ACPI
+       select PCI_DOMAINS_GENERIC if PCI
 +      select PCI_ECAM if (ACPI && PCI)
+       select PCI_SYSCALL if PCI
        select POWER_RESET
        select POWER_SUPPLY
        select REFCOUNT_FULL

diff --cc arch/hexagon/Kconfig
Simple merge

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
index 63183a8454d6f52f8fab4c0ea3783ec9b1875259,f4df8007fddbefea9f8c6588e8090a21b6b2830f..787290781b8c6d52b7b937b222a1d61eec92f97c
--- 1/arch/mips/Kconfig
--- 2/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -503,17 -501,16 +504,17 @@@ config MIPS_MALT
        select DMA_MAYBE_COHERENT
        select GENERIC_ISA_DMA
        select HAVE_PCSPKR_PLATFORM
-       select HW_HAS_PCI
 -      select IRQ_MIPS_CPU
 -      select MIPS_GIC
+       select HAVE_PCI
        select I8253
        select I8259
 +      select IRQ_MIPS_CPU
 +      select LIBFDT
        select MIPS_BONITO64
        select MIPS_CPU_SCACHE
 +      select MIPS_GIC
        select MIPS_L1_CACHE_SHIFT_6
 -      select PCI_GT64XXX_PCI0
        select MIPS_MSC
 +      select PCI_GT64XXX_PCI0
        select SMP_UP if SMP
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/512x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/52xx/Kconfig
index 67f8c2d8fc0e9bf73c0f839712507b506d89355e,b46850e039eea562159ba7014b643bae58e733df..99d60acc20c8ceb34186ab5e26ce98dbcdaafbd8
--- 1/arch/powerpc/platforms/52xx/Kconfig
--- 2/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@@ -1,9 -1,9 +1,9 @@@
  # SPDX-License-Identifier: GPL-2.0
  config PPC_MPC52xx
        bool "52xx-based boards"
 -      depends on 6xx
 +      depends on PPC_BOOK3S_32
        select COMMON_CLK
-       select PPC_PCI_CHOICE
+       select HAVE_PCI
  
  config PPC_MPC5200_SIMPLE
        bool "Generic support for simple MPC5200 based boards"

diff --cc arch/powerpc/platforms/83xx/Kconfig
index ff0c69dfdf1a99454a825cf2d1567ff90367d3ad,9b225d2341c7ad56dbf74f14c91613d916116881..bee119725f6174e0569dae6a8da017290fea47e4
--- 1/arch/powerpc/platforms/83xx/Kconfig
--- 2/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@@ -1,9 -1,9 +1,9 @@@
  # SPDX-License-Identifier: GPL-2.0
  menuconfig PPC_83xx
        bool "83xx-based boards"
 -      depends on 6xx
 +      depends on PPC_BOOK3S_32
        select PPC_UDBG_16550
-       select PPC_PCI_CHOICE
+       select HAVE_PCI
        select FSL_PCI if PCI
        select FSL_SOC
        select IPIC

diff --cc arch/powerpc/platforms/86xx/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig.cputype
Simple merge

diff --cc arch/powerpc/platforms/amigaone/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/chrp/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/embedded6xx/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/pseries/Kconfig
Simple merge

diff --cc arch/riscv/Kconfig
index a1aade822927ac59fabe5eaba9e0bd5b8e1b6d00,5c659165b618eb1c12d0f21c413c4f247f5e183b..e0d7d61779a6cd7f13b1a12ac742ab1d4d9147ed
--- 1/arch/riscv/Kconfig
--- 2/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -272,30 -266,8 +275,8 @@@ endchoic
  
  endmenu
  
- menu "Bus support"
- 
- config PCI
-       bool "PCI support"
-       select PCI_MSI
-       help
-         This feature enables support for PCI bus system. If you say Y
-         here, the kernel will include drivers and infrastructure code
-         to support PCI bus devices.
- 
-         If you don't know what to do here, say Y.
- 
- config PCI_DOMAINS
-       def_bool PCI
- 
- config PCI_DOMAINS_GENERIC
-       def_bool PCI
- 
- source "drivers/pci/Kconfig"
- 
- endmenu
- 
  menu "Power management options"
  
 -source kernel/power/Kconfig
 +source "kernel/power/Kconfig"
  
  endmenu

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
index ff96e248e585baf24f7961d4085760de5456734b,daee2c73b6c55a2e71818b137c04dd627dbbee54..d5dd652fb8ccf64dde8040e58ec28b3aa42367df
--- 1/arch/sparc/Kconfig
--- 2/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -38,8 -39,10 +39,9 @@@ config SPAR
        select GENERIC_STRNCPY_FROM_USER
        select GENERIC_STRNLEN_USER
        select MODULES_USE_ELF_RELA
+       select PCI_SYSCALL if PCI
        select ODD_RT_SIGACTION
        select OLD_SIGSUSPEND
 -      select ARCH_HAS_SG_CHAIN
        select CPU_NO_EFFICIENT_FFS
        select LOCKDEP_SMALL if LOCKDEP
        select NEED_DMA_MAP_STATE

diff --cc arch/unicore32/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
index 65f66c31b7105ca93c6fb58ddeeaf3bf149801b5,322b7391de891322dc004a11b20eaa80832c29fa..20a0756f27efffbecc3892cc1dee4c1d983483c7
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -27,9 -26,9 +27,10 @@@ config XTENS
        select HAVE_HW_BREAKPOINT if PERF_EVENTS
        select HAVE_IRQ_TIME_ACCOUNTING
        select HAVE_OPROFILE
+       select HAVE_PCI
        select HAVE_PERF_EVENTS
        select HAVE_STACKPROTECTOR
 +      select HAVE_SYSCALL_TRACEPOINTS
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select PERF_USE_VMALLOC

diff --cc drivers/Kconfig
Simple merge