aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-01-19 20:58:53 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-01-19 20:58:53 +0000
commitbba8f059d746863999e3b73832ee9d66fb4975bd (patch)
treecde9d2927da03057cbe5d7d8d13372413fbfd8e1
parent1dfa369c98075302400f46cd2b410d32a5ef68d6 (diff)
downloadupstream-bba8f059d746863999e3b73832ee9d66fb4975bd.tar.gz
upstream-bba8f059d746863999e3b73832ee9d66fb4975bd.tar.bz2
upstream-bba8f059d746863999e3b73832ee9d66fb4975bd.zip
bcm53xx: backport iProc Kconfig fixes
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48369
-rw-r--r--target/linux/bcm53xx/patches-4.1/034-PCI-iproc-Fix-BCMA-dependency-in-Kconfig.patch28
-rw-r--r--target/linux/bcm53xx/patches-4.1/035-PCI-iproc-Allow-BCMA-bus-driver-to-be-built-as-modul.patch26
2 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/034-PCI-iproc-Fix-BCMA-dependency-in-Kconfig.patch b/target/linux/bcm53xx/patches-4.1/034-PCI-iproc-Fix-BCMA-dependency-in-Kconfig.patch
new file mode 100644
index 0000000000..23896d50ff
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.1/034-PCI-iproc-Fix-BCMA-dependency-in-Kconfig.patch
@@ -0,0 +1,28 @@
+From 70d334ca71b0e35ef21493d86799cec83f452d94 Mon Sep 17 00:00:00 2001
+From: Ray Jui <rjui@broadcom.com>
+Date: Wed, 29 Jul 2015 10:12:53 -0700
+Subject: [PATCH] PCI: iproc: Fix BCMA dependency in Kconfig
+
+The current iProc BCMA front-end driver can only work on ARM32 based
+platforms; therefore its config option in Kconfig should be changed to
+reflect that. This fixes arm64 allmodconfig build failure when compiling
+the the iProc BCMA driver that contains struct pci_sys_data that is
+arm32 specific
+
+Signed-off-by: Ray Jui <rjui@broadcom.com>
+Signed-off-by: Olof Johansson <olof@lixom.net>
+---
+ drivers/pci/host/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/host/Kconfig
++++ b/drivers/pci/host/Kconfig
+@@ -127,7 +127,7 @@ config PCIE_IPROC_PLATFORM
+
+ config PCIE_IPROC_BCMA
+ bool "Broadcom iProc PCIe BCMA bus driver"
+- depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
++ depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
+ select PCIE_IPROC
+ select BCMA
+ select PCI_DOMAINS
diff --git a/target/linux/bcm53xx/patches-4.1/035-PCI-iproc-Allow-BCMA-bus-driver-to-be-built-as-modul.patch b/target/linux/bcm53xx/patches-4.1/035-PCI-iproc-Allow-BCMA-bus-driver-to-be-built-as-modul.patch
new file mode 100644
index 0000000000..110ba249fa
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.1/035-PCI-iproc-Allow-BCMA-bus-driver-to-be-built-as-modul.patch
@@ -0,0 +1,26 @@
+From 05aa7d6a72c1fca809e4d8bfdc5fa202cb8bed37 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 25 Jul 2015 21:15:24 +0200
+Subject: [PATCH] PCI: iproc: Allow BCMA bus driver to be built as module
+
+Change CONFIG_PCIE_IPROC_BCMA to tristate to make it possible to build this
+driver as a module.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Acked-by: Ray Jui <rjui@broadcom.com>
+---
+ drivers/pci/host/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/host/Kconfig
++++ b/drivers/pci/host/Kconfig
+@@ -126,7 +126,7 @@ config PCIE_IPROC_PLATFORM
+ through the generic platform bus interface
+
+ config PCIE_IPROC_BCMA
+- bool "Broadcom iProc PCIe BCMA bus driver"
++ tristate "Broadcom iProc PCIe BCMA bus driver"
+ depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
+ select PCIE_IPROC
+ select BCMA