From bba8f059d746863999e3b73832ee9d66fb4975bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 19 Jan 2016 20:58:53 +0000 Subject: [PATCH] bcm53xx: backport iProc Kconfig fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki SVN-Revision: 48369 --- ...iproc-Fix-BCMA-dependency-in-Kconfig.patch | 28 +++++++++++++++++++ ...BCMA-bus-driver-to-be-built-as-modul.patch | 26 +++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 target/linux/bcm53xx/patches-4.1/034-PCI-iproc-Fix-BCMA-dependency-in-Kconfig.patch create mode 100644 target/linux/bcm53xx/patches-4.1/035-PCI-iproc-Allow-BCMA-bus-driver-to-be-built-as-modul.patch 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 +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 +Signed-off-by: Olof Johansson +--- + 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 +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 +Signed-off-by: Bjorn Helgaas +Acked-by: Ray Jui +--- + 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 -- 2.25.1