summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKishon Vijay Abraham I2017-02-15 04:52:53 -0600
committerKishon Vijay Abraham I2017-02-15 05:38:36 -0600
commit0700d4262621e73ec5ef5e9c3ccf97ce2a7f9a66 (patch)
treea3e2d90c5e7dd294aa1ecacfa4c3ba1da4ba887e
parent7ea3d801c3e2a1452000e72d666dcff0b7bb93bf (diff)
downloadlinux-phy-dwc-rework.tar.gz
linux-phy-dwc-rework.tar.xz
linux-phy-dwc-rework.zip
PCI: dwc: Remove dependency of designware to CONFIG_PCIdwc-rework
CONFIG_PCI is used to enable the host mode PCI. In preparation for adding endpoint mode support to designware driver, remove the dependency of designware to CONFIG_PCI and make only the host specific part depend on CONFIG_PCI. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--drivers/Makefile3
-rw-r--r--drivers/pci/Makefile3
-rw-r--r--drivers/pci/dwc/Kconfig13
3 files changed, 15 insertions, 4 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index 060026a02f59..f521cb0e58d6 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -15,6 +15,9 @@ obj-$(CONFIG_PINCTRL) += pinctrl/
15obj-$(CONFIG_GPIOLIB) += gpio/ 15obj-$(CONFIG_GPIOLIB) += gpio/
16obj-y += pwm/ 16obj-y += pwm/
17obj-$(CONFIG_PCI) += pci/ 17obj-$(CONFIG_PCI) += pci/
18# PCI dwc controller drivers
19obj-y += pci/dwc/
20
18obj-$(CONFIG_PARISC) += parisc/ 21obj-$(CONFIG_PARISC) += parisc/
19obj-$(CONFIG_RAPIDIO) += rapidio/ 22obj-$(CONFIG_RAPIDIO) += rapidio/
20obj-y += video/ 23obj-y += video/
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index b7e97519b31d..8db5079f09a7 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -66,8 +66,5 @@ obj-$(CONFIG_OF) += of.o
66 66
67ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG 67ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
68 68
69# PCI dwc controller drivers
70obj-y += dwc/
71
72# PCI host controller drivers 69# PCI host controller drivers
73obj-y += host/ 70obj-y += host/
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig
index ab92a0c6643f..dfb8a69afc28 100644
--- a/drivers/pci/dwc/Kconfig
+++ b/drivers/pci/dwc/Kconfig
@@ -1,16 +1,17 @@
1menu "DesignWare PCI Core Support" 1menu "DesignWare PCI Core Support"
2 depends on PCI
3 2
4config PCIE_DW 3config PCIE_DW
5 bool 4 bool
6 5
7config PCIE_DW_HOST 6config PCIE_DW_HOST
8 bool 7 bool
8 depends on PCI
9 depends on PCI_MSI_IRQ_DOMAIN 9 depends on PCI_MSI_IRQ_DOMAIN
10 select PCIE_DW 10 select PCIE_DW
11 11
12config PCI_DRA7XX 12config PCI_DRA7XX
13 bool "TI DRA7xx PCIe controller" 13 bool "TI DRA7xx PCIe controller"
14 depends on PCI
14 depends on OF && HAS_IOMEM && TI_PIPE3 15 depends on OF && HAS_IOMEM && TI_PIPE3
15 depends on PCI_MSI_IRQ_DOMAIN 16 depends on PCI_MSI_IRQ_DOMAIN
16 select PCIE_DW_HOST 17 select PCIE_DW_HOST
@@ -21,6 +22,7 @@ config PCI_DRA7XX
21 22
22config PCIE_DW_PLAT 23config PCIE_DW_PLAT
23 bool "Platform bus based DesignWare PCIe Controller" 24 bool "Platform bus based DesignWare PCIe Controller"
25 depends on PCI
24 depends on PCI_MSI_IRQ_DOMAIN 26 depends on PCI_MSI_IRQ_DOMAIN
25 select PCIE_DW_HOST 27 select PCIE_DW_HOST
26 ---help--- 28 ---help---
@@ -33,6 +35,7 @@ config PCIE_DW_PLAT
33 35
34config PCI_EXYNOS 36config PCI_EXYNOS
35 bool "Samsung Exynos PCIe controller" 37 bool "Samsung Exynos PCIe controller"
38 depends on PCI
36 depends on SOC_EXYNOS5440 39 depends on SOC_EXYNOS5440
37 depends on PCI_MSI_IRQ_DOMAIN 40 depends on PCI_MSI_IRQ_DOMAIN
38 select PCIEPORTBUS 41 select PCIEPORTBUS
@@ -40,6 +43,7 @@ config PCI_EXYNOS
40 43
41config PCI_IMX6 44config PCI_IMX6
42 bool "Freescale i.MX6 PCIe controller" 45 bool "Freescale i.MX6 PCIe controller"
46 depends on PCI
43 depends on SOC_IMX6Q 47 depends on SOC_IMX6Q
44 depends on PCI_MSI_IRQ_DOMAIN 48 depends on PCI_MSI_IRQ_DOMAIN
45 select PCIEPORTBUS 49 select PCIEPORTBUS
@@ -47,6 +51,7 @@ config PCI_IMX6
47 51
48config PCIE_SPEAR13XX 52config PCIE_SPEAR13XX
49 bool "STMicroelectronics SPEAr PCIe controller" 53 bool "STMicroelectronics SPEAr PCIe controller"
54 depends on PCI
50 depends on ARCH_SPEAR13XX 55 depends on ARCH_SPEAR13XX
51 depends on PCI_MSI_IRQ_DOMAIN 56 depends on PCI_MSI_IRQ_DOMAIN
52 select PCIEPORTBUS 57 select PCIEPORTBUS
@@ -56,6 +61,7 @@ config PCIE_SPEAR13XX
56 61
57config PCI_KEYSTONE 62config PCI_KEYSTONE
58 bool "TI Keystone PCIe controller" 63 bool "TI Keystone PCIe controller"
64 depends on PCI
59 depends on ARCH_KEYSTONE 65 depends on ARCH_KEYSTONE
60 depends on PCI_MSI_IRQ_DOMAIN 66 depends on PCI_MSI_IRQ_DOMAIN
61 select PCIEPORTBUS 67 select PCIEPORTBUS
@@ -68,6 +74,7 @@ config PCI_KEYSTONE
68 74
69config PCI_LAYERSCAPE 75config PCI_LAYERSCAPE
70 bool "Freescale Layerscape PCIe controller" 76 bool "Freescale Layerscape PCIe controller"
77 depends on PCI
71 depends on OF && (ARM || ARCH_LAYERSCAPE) 78 depends on OF && (ARM || ARCH_LAYERSCAPE)
72 depends on PCI_MSI_IRQ_DOMAIN 79 depends on PCI_MSI_IRQ_DOMAIN
73 select MFD_SYSCON 80 select MFD_SYSCON
@@ -78,6 +85,7 @@ config PCI_LAYERSCAPE
78config PCI_HISI 85config PCI_HISI
79 depends on OF && ARM64 86 depends on OF && ARM64
80 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" 87 bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
88 depends on PCI
81 depends on PCI_MSI_IRQ_DOMAIN 89 depends on PCI_MSI_IRQ_DOMAIN
82 select PCIEPORTBUS 90 select PCIEPORTBUS
83 select PCIE_DW_HOST 91 select PCIE_DW_HOST
@@ -87,6 +95,7 @@ config PCI_HISI
87 95
88config PCIE_QCOM 96config PCIE_QCOM
89 bool "Qualcomm PCIe controller" 97 bool "Qualcomm PCIe controller"
98 depends on PCI
90 depends on ARCH_QCOM && OF 99 depends on ARCH_QCOM && OF
91 depends on PCI_MSI_IRQ_DOMAIN 100 depends on PCI_MSI_IRQ_DOMAIN
92 select PCIEPORTBUS 101 select PCIEPORTBUS
@@ -98,6 +107,7 @@ config PCIE_QCOM
98 107
99config PCIE_ARMADA_8K 108config PCIE_ARMADA_8K
100 bool "Marvell Armada-8K PCIe controller" 109 bool "Marvell Armada-8K PCIe controller"
110 depends on PCI
101 depends on ARCH_MVEBU 111 depends on ARCH_MVEBU
102 depends on PCI_MSI_IRQ_DOMAIN 112 depends on PCI_MSI_IRQ_DOMAIN
103 select PCIEPORTBUS 113 select PCIEPORTBUS
@@ -110,6 +120,7 @@ config PCIE_ARMADA_8K
110 120
111config PCIE_ARTPEC6 121config PCIE_ARTPEC6
112 bool "Axis ARTPEC-6 PCIe controller" 122 bool "Axis ARTPEC-6 PCIe controller"
123 depends on PCI
113 depends on MACH_ARTPEC6 124 depends on MACH_ARTPEC6
114 depends on PCI_MSI_IRQ_DOMAIN 125 depends on PCI_MSI_IRQ_DOMAIN
115 select PCIEPORTBUS 126 select PCIEPORTBUS