minor cleanup, add explicit declare of a couple of options

23 files changed, 28 insertions, 1 deletions

diff --git a/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN b/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN
new file mode 100644
index 000000000..90bf4c7ca
--- /dev/null
+++ b/baseconfig/CONFIG_PCI_MSI_IRQ_DOMAIN
@@ -0,0 +1 @@
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
diff --git a/baseconfig/arm/CONFIG_PCIE_DW_HOST b/baseconfig/arm/CONFIG_PCIE_DW_HOST
new file mode 100644
index 000000000..6aecdd9c1
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PCIE_DW_HOST
@@ -0,0 +1 @@
+CONFIG_PCIE_DW_HOST=y
diff --git a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI b/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI
deleted file mode 100644
index a78b62cb5..000000000
--- a/baseconfig/powerpc/CONFIG_USB_OHCI_HCD_PCI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_OHCI_HCD_PCI=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 2dcba8ef7..67478589e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3894,6 +3894,7 @@ CONFIG_PCIE_ARMADA_8K=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -3912,6 +3913,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 803a2b2cb..78f015b69 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3873,6 +3873,7 @@ CONFIG_PCIE_ARMADA_8K=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -3891,6 +3892,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 43af1bf20..5f0e98e1d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4192,6 +4192,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -4211,6 +4212,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_IOV=y
 # CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index eaa3f9407..d0f24bc17 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3987,6 +3987,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -4004,6 +4005,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_KEYSTONE=y
 # CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0ec38af52..7904839bd 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3966,6 +3966,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -3983,6 +3984,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_KEYSTONE=y
 # CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index fc5691c15..24049d7fc 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4171,6 +4171,7 @@ CONFIG_PCIEAER=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT is not set
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
@@ -4190,6 +4191,7 @@ CONFIG_PCI_HOST_GENERIC=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_IOV=y
 # CONFIG_PCI_LAYERSCAPE is not set
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MVEBU=y
 CONFIG_PCI_PASID=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 9a7e6be61..23f62e972 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3796,6 +3796,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index ec5cc3ea5..33cdbb85e 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3816,6 +3816,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index b43dd1282..6dd0c5543 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3816,6 +3816,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 0793af75e..8c2e1dd18 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3796,6 +3796,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index d38c12230..18cc5a67e 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3624,6 +3624,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 39db650ab..6f7361222 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3602,6 +3602,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a903e2327..51ae8f5e2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3567,6 +3567,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index baa4dc2ff..01cf2a0b1 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3545,6 +3545,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index b315c8985..b9207d32b 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -3566,6 +3566,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 35272d516..cf64f5870 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -3544,6 +3544,7 @@ CONFIG_PCI_ENDPOINT=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index b49f3a9b7..a748bd57a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3492,6 +3492,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_PCI_PASID=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e58a1f798..05c2aa095 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3470,6 +3470,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCI_HERMES=m
 CONFIG_PCI_IOV=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_NR_FUNCTIONS=64
 CONFIG_PCI_PASID=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5a4ae32df..e712f89f3 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3841,6 +3841,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2d35eaedb..9e8f4e647 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3821,6 +3821,7 @@ CONFIG_PCI_HERMES=m
 CONFIG_PCI_HYPERV=m
 CONFIG_PCI_IOV=y
 CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCIPCWATCHDOG=m