aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-4.0/022-bcma-from-4.2.patch')
-rw-r--r--target/linux/generic/patches-4.0/022-bcma-from-4.2.patch86
1 files changed, 0 insertions, 86 deletions
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
deleted file mode 100644
index ba3df18bdd..0000000000
--- a/target/linux/generic/patches-4.0/022-bcma-from-4.2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/drivers/bcma/driver_gpio.c
-+++ b/drivers/bcma/driver_gpio.c
-@@ -226,6 +226,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
- chip->of_node = cc->core->dev.of_node;
- #endif
- switch (bus->chipinfo.id) {
-+ case BCMA_CHIP_ID_BCM4707:
- case BCMA_CHIP_ID_BCM5357:
- case BCMA_CHIP_ID_BCM53572:
- chip->ngpio = 32;
-@@ -235,16 +236,17 @@ int bcma_gpio_init(struct bcma_drv_cc *c
- }
-
- /*
-- * On MIPS we register GPIO devices (LEDs, buttons) using absolute GPIO
-- * pin numbers. We don't have Device Tree there and we can't really use
-- * relative (per chip) numbers.
-- * So let's use predictable base for BCM47XX and "random" for all other.
-+ * Register SoC GPIO devices with absolute GPIO pin base.
-+ * On MIPS, we don't have Device Tree and we can't use relative (per chip)
-+ * GPIO numbers.
-+ * On some ARM devices, user space may want to access some system GPIO
-+ * pins directly, which is easier to do with a predictable GPIO base.
- */
--#if IS_BUILTIN(CONFIG_BCM47XX)
-- chip->base = bus->num * BCMA_GPIO_MAX_PINS;
--#else
-- chip->base = -1;
--#endif
-+ if (IS_BUILTIN(CONFIG_BCM47XX) ||
-+ cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
-+ chip->base = bus->num * BCMA_GPIO_MAX_PINS;
-+ else
-+ chip->base = -1;
-
- 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_ */