From: Rafał Miłecki <zajec5@gmail.com>
Date: Mon, 8 Jun 2015 12:49:54 +0000 (+0000)
Subject: kernel: backport config-related bcma patches from 4.2
X-Git-Tag: reboot~2825
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a1340b5ccec9e2ac06b339129e0208fecafc0fca;p=openwrt%2Fstaging%2Fxback.git

kernel: backport config-related bcma patches from 4.2

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45927
---

diff --git a/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch b/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
index 1a9f472a4a..ba3df18bdd 100644
--- a/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
+++ b/target/linux/generic/patches-3.18/028-bcma-from-4.2.patch
@@ -35,3 +35,52 @@
  
  	err = bcma_gpio_irq_domain_init(cc);
  	if (err)
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -29,12 +29,6 @@ config BCMA_HOST_PCI
+ 	select BCMA_DRIVER_PCI
+ 	default y
+ 
+-config BCMA_DRIVER_PCI_HOSTMODE
+-	bool "Driver for PCI core working in hostmode"
+-	depends on BCMA && MIPS && BCMA_HOST_PCI
+-	help
+-	  PCI core hostmode operation (external PCI bus).
+-
+ config BCMA_HOST_SOC
+ 	bool "Support for BCMA in a SoC"
+ 	depends on BCMA
+@@ -61,6 +55,12 @@ config BCMA_DRIVER_PCI
+ 	  This driver is also prerequisite for a hostmode PCIe core
+ 	  support.
+ 
++config BCMA_DRIVER_PCI_HOSTMODE
++	bool "Driver for PCI core working in hostmode"
++	depends on BCMA && MIPS && BCMA_DRIVER_PCI
++	help
++	  PCI core hostmode operation (external PCI bus).
++
+ config BCMA_DRIVER_MIPS
+ 	bool "BCMA Broadcom MIPS core driver"
+ 	depends on BCMA && MIPS
+--- a/include/linux/bcma/bcma_driver_pci.h
++++ b/include/linux/bcma/bcma_driver_pci.h
+@@ -246,7 +246,18 @@ static inline void bcma_core_pci_power_s
+ }
+ #endif
+ 
++#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
+ extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
+ extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
++#else
++static inline int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
++{
++	return -ENOTSUPP;
++}
++static inline int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
++{
++	return -ENOTSUPP;
++}
++#endif
+ 
+ #endif /* LINUX_BCMA_DRIVER_PCI_H_ */
diff --git a/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch b/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch
index 1a9f472a4a..ba3df18bdd 100644
--- a/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch
+++ b/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch
@@ -35,3 +35,52 @@
  
  	err = bcma_gpio_irq_domain_init(cc);
  	if (err)
+--- a/drivers/bcma/Kconfig
++++ b/drivers/bcma/Kconfig
+@@ -29,12 +29,6 @@ config BCMA_HOST_PCI
+ 	select BCMA_DRIVER_PCI
+ 	default y
+ 
+-config BCMA_DRIVER_PCI_HOSTMODE
+-	bool "Driver for PCI core working in hostmode"
+-	depends on BCMA && MIPS && BCMA_HOST_PCI
+-	help
+-	  PCI core hostmode operation (external PCI bus).
+-
+ config BCMA_HOST_SOC
+ 	bool "Support for BCMA in a SoC"
+ 	depends on BCMA
+@@ -61,6 +55,12 @@ config BCMA_DRIVER_PCI
+ 	  This driver is also prerequisite for a hostmode PCIe core
+ 	  support.
+ 
++config BCMA_DRIVER_PCI_HOSTMODE
++	bool "Driver for PCI core working in hostmode"
++	depends on BCMA && MIPS && BCMA_DRIVER_PCI
++	help
++	  PCI core hostmode operation (external PCI bus).
++
+ config BCMA_DRIVER_MIPS
+ 	bool "BCMA Broadcom MIPS core driver"
+ 	depends on BCMA && MIPS
+--- a/include/linux/bcma/bcma_driver_pci.h
++++ b/include/linux/bcma/bcma_driver_pci.h
+@@ -246,7 +246,18 @@ static inline void bcma_core_pci_power_s
+ }
+ #endif
+ 
++#ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE
+ extern int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev);
+ extern int bcma_core_pci_plat_dev_init(struct pci_dev *dev);
++#else
++static inline int bcma_core_pci_pcibios_map_irq(const struct pci_dev *dev)
++{
++	return -ENOTSUPP;
++}
++static inline int bcma_core_pci_plat_dev_init(struct pci_dev *dev)
++{
++	return -ENOTSUPP;
++}
++#endif
+ 
+ #endif /* LINUX_BCMA_DRIVER_PCI_H_ */