bcm53xx: update iProc patches (V5 accepted in helgaas/pci.git next)
[openwrt/staging/chunkeey.git] / target / linux / bcm53xx / patches-4.4 / 085-PCI-iproc-Hide-CONFIG_PCIE_IPROC.patch
1 From c1b98e41b356a1807d7083d958790da2027c0d9d Mon Sep 17 00:00:00 2001
2 From: Arnd Bergmann <arnd@arndb.de>
3 Date: Tue, 24 Nov 2015 15:28:48 -0600
4 Subject: [PATCH] PCI: iproc: Hide CONFIG_PCIE_IPROC
5
6 PCIE_IPROC_BCMA does not require CONFIG_OF in Kconfig, but
7 CONFIG_PCIE_IPROC does, so we can get a warning when building for an ARM
8 platform without DT support:
9
10 warning: (PCIE_IPROC_PLATFORM && PCIE_IPROC_BCMA) selects PCIE_IPROC which has unmet direct dependencies (PCI && OF && (ARM || ARM64))
11
12 It turns out that CONFIG_PCIE_IPROC never needs to be enabled by a user
13 anyway, we can simply rely on it being selected implictly through either
14 PCIE_IPROC_PLATFORM or PCIE_IPROC_BCMA.
15
16 Fixes: 4785ffbdc9b5 ("PCI: iproc: Add BCMA PCIe driver")
17 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
18 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
19 Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
20 ---
21 drivers/pci/host/Kconfig | 8 +++-----
22 1 file changed, 3 insertions(+), 5 deletions(-)
23
24 --- a/drivers/pci/host/Kconfig
25 +++ b/drivers/pci/host/Kconfig
26 @@ -119,13 +119,11 @@ config PCI_VERSATILE
27 depends on ARCH_VERSATILE
28
29 config PCIE_IPROC
30 - tristate "Broadcom iProc PCIe controller"
31 - depends on OF && (ARM || ARM64)
32 - default n
33 + tristate
34 help
35 This enables the iProc PCIe core controller support for Broadcom's
36 - iProc family of SoCs. An appropriate bus interface driver also needs
37 - to be enabled
38 + iProc family of SoCs. An appropriate bus interface driver needs
39 + to be enabled to select this.
40
41 config PCIE_IPROC_PLATFORM
42 tristate "Broadcom iProc PCIe platform bus driver"