diff options
-rw-r--r-- | backport/Kconfig.sources | 3 | ||||
-rw-r--r-- | backport/Makefile.kernel | 2 | ||||
-rw-r--r-- | backport/backport-include/linux/bcma/bcma_driver_chipcommon.h | 23 | ||||
-rw-r--r-- | backport/defconfigs/b43 | 7 | ||||
-rw-r--r-- | backport/defconfigs/b43legacy | 5 | ||||
-rw-r--r-- | backport/defconfigs/brcmsmac | 2 | ||||
-rw-r--r-- | backport/defconfigs/wifi | 6 | ||||
-rw-r--r-- | copy-list | 5 | ||||
-rw-r--r-- | dependencies | 14 | ||||
-rw-r--r-- | patches/0051-no-wakeup_path/ssb.patch | 12 | ||||
-rw-r--r-- | patches/0069-remove-of_irq/bcma.patch | 24 |
11 files changed, 23 insertions, 80 deletions
diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index 93ca3cd8..3fc674e5 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconfig" source "$BACKPORT_DIR/drivers/net/wireless/Kconfig" source "$BACKPORT_DIR/drivers/net/usb/Kconfig" -source "$BACKPORT_DIR/drivers/ssb/Kconfig" -source "$BACKPORT_DIR/drivers/bcma/Kconfig" - source "$BACKPORT_DIR/net/nfc/Kconfig" source "$BACKPORT_DIR/drivers/usb/class/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index cfeb3a37..a09d5230 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -40,8 +40,6 @@ obj-y += compat/ obj-$(CPTCFG_CFG80211) += net/wireless/ obj-$(CPTCFG_MAC80211) += net/mac80211/ obj-$(CPTCFG_WLAN) += drivers/net/wireless/ -obj-$(CPTCFG_SSB) += drivers/ssb/ -obj-$(CPTCFG_BCMA) += drivers/bcma/ obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/ obj-$(CPTCFG_NFC) += net/nfc/ obj-$(CPTCFG_NFC) += drivers/nfc/ diff --git a/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h b/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h new file mode 100644 index 00000000..47809853 --- /dev/null +++ b/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h @@ -0,0 +1,23 @@ +#ifndef __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ +#define __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ +#include_next <linux/bcma/bcma_driver_chipcommon.h> + +#ifndef BCMA_CC_PMU_CHIPCTL_ADDR +#define BCMA_CC_PMU_CHIPCTL_ADDR 0x0650 +#define BCMA_CC_PMU_CHIPCTL_DATA 0x0654 +#define BCMA_CC_PMU_REGCTL_ADDR 0x0658 +#define BCMA_CC_PMU_REGCTL_DATA 0x065C +#define BCMA_CC_PMU_PLLCTL_ADDR 0x0660 +#define BCMA_CC_PMU_PLLCTL_DATA 0x0664 +#endif + +#ifndef BCMA_CC_CAP_EXT_AOB_PRESENT +#define BCMA_CC_CAP_EXT_SECI_PRESENT 0x00000001 +#define BCMA_CC_CAP_EXT_GSIO_PRESENT 0x00000002 +#define BCMA_CC_CAP_EXT_GCI_PRESENT 0x00000004 +#define BCMA_CC_CAP_EXT_SECI_PUART_PRESENT 0x00000008 /* UART present */ +#define BCMA_CC_CAP_EXT_AOB_PRESENT 0x00000040 +#endif + + +#endif /* __BACKPORT_LINUX_BCMA_DRIVER_CC_H_ */ diff --git a/backport/defconfigs/b43 b/backport/defconfigs/b43 index 27bfb9e2..c486ca1e 100644 --- a/backport/defconfigs/b43 +++ b/backport/defconfigs/b43 @@ -11,10 +11,3 @@ CPTCFG_B43_SDIO=y CPTCFG_B43_PHY_N=y CPTCFG_B43_PHY_LP=y CPTCFG_B43_PHY_HT=y -CPTCFG_BCMA=m -CPTCFG_BCMA_HOST_PCI=y -CPTCFG_SSB=m -CPTCFG_SSB_PCIHOST=y -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y -CPTCFG_SSB_DRIVER_PCICORE=y diff --git a/backport/defconfigs/b43legacy b/backport/defconfigs/b43legacy index 71787081..552e13b2 100644 --- a/backport/defconfigs/b43legacy +++ b/backport/defconfigs/b43legacy @@ -6,8 +6,3 @@ CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_B43LEGACY=m -CPTCFG_SSB=m -CPTCFG_SSB_PCIHOST=y -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y -CPTCFG_SSB_DRIVER_PCICORE=y diff --git a/backport/defconfigs/brcmsmac b/backport/defconfigs/brcmsmac index 2c2edd23..20f429b6 100644 --- a/backport/defconfigs/brcmsmac +++ b/backport/defconfigs/brcmsmac @@ -5,5 +5,3 @@ CPTCFG_MAC80211_LEDS=y CPTCFG_WLAN=y CPTCFG_WLAN_VENDOR_BROADCOM=y CPTCFG_BRCMSMAC=m -CPTCFG_BCMA=m -CPTCFG_BCMA_HOST_PCI=y diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi index 4034bb13..fb18e182 100644 --- a/backport/defconfigs/wifi +++ b/backport/defconfigs/wifi @@ -17,9 +17,6 @@ CPTCFG_B43=m CPTCFG_B43_PHY_HT=y CPTCFG_B43_PHY_N=y CPTCFG_B43_SDIO=y -CPTCFG_BCMA_DRIVER_GPIO=y -CPTCFG_BCMA_HOST_PCI=y -CPTCFG_BCMA=m CPTCFG_BRCMFMAC=m CPTCFG_BRCMFMAC_PCIE=y CPTCFG_BRCMFMAC_USB=y @@ -101,9 +98,6 @@ CPTCFG_RTL8723BE=m CPTCFG_RTL8821AE=m CPTCFG_RTL8XXXU=m CPTCFG_RTLWIFI=m -CPTCFG_SSB=m -CPTCFG_SSB_PCMCIAHOST=y -CPTCFG_SSB_SDIOHOST=y CPTCFG_TMD_HERMES=m CPTCFG_USB_NET_RNDIS_WLAN=m CPTCFG_USB_ZD1201=m @@ -37,7 +37,6 @@ include/linux/mmc/sdio_ids.h include/linux/ath9k_platform.h include/linux/wl12xx.h include/linux/rndis.h -include/linux/bcm47xx_wdt.h include/linux/usb/usbnet.h include/linux/usb/cdc.h include/uapi/linux/usb/cdc.h @@ -87,10 +86,6 @@ include/linux/mpls.h include/uapi/linux/mpls.h drivers/net/wireless/ath/ -drivers/ssb/ -include/linux/ssb/ -drivers/bcma/ -include/linux/bcma/ drivers/net/wireless/cisco/ drivers/net/wireless/atmel/ drivers/net/wireless/broadcom/ diff --git a/dependencies b/dependencies index 628f82bd..a87802ad 100644 --- a/dependencies +++ b/dependencies @@ -48,20 +48,6 @@ NFC_ST_NCI_I2C 3.19 NFC_ST_NCI_SPI 3.19 NFC_PN544_I2C 3.19 -BCMA_DRIVER_MIPS 3.3 -SSB_DRIVER_MIPS 3.3 -# needs GPIO stuff we didn't backport -SSB_DRIVER_GPIO 4.5 - -# the irq handler in the gpio driver uses -# irq_set_chip_and_handler_name() which gets exported starting with -# kernel 3.7. This code is only compiled if BCMA_DRIVER_GPIO and -# BCMA_HOST_SOC are set. -BCMA_HOST_SOC 3.7 - -# Uses gpiochip_get_data() -BCMA_DRIVER_GPIO 4.5 - # NFC core needs PF_NFC defined in socket.h which was # only introduced in kernel 3.1 NFC 3.1 diff --git a/patches/0051-no-wakeup_path/ssb.patch b/patches/0051-no-wakeup_path/ssb.patch deleted file mode 100644 index dcebbcdf..00000000 --- a/patches/0051-no-wakeup_path/ssb.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/drivers/ssb/pcihost_wrapper.c -+++ b/drivers/ssb/pcihost_wrapper.c -@@ -33,7 +33,9 @@ static int ssb_pcihost_suspend(struct de - - /* if there is a wakeup enabled child device on ssb bus, - enable pci wakeup posibility. */ -+#if LINUX_VERSION_IS_GEQ(3,2,0) - device_set_wakeup_enable(d, d->power.wakeup_path); -+#endif /* LINUX_VERSION_IS_GEQ(3,2,0) */ - - pci_prepare_to_sleep(dev); - diff --git a/patches/0069-remove-of_irq/bcma.patch b/patches/0069-remove-of_irq/bcma.patch deleted file mode 100644 index b8a05ae8..00000000 --- a/patches/0069-remove-of_irq/bcma.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/drivers/bcma/main.c -+++ b/drivers/bcma/main.c -@@ -156,6 +156,7 @@ static struct device_node *bcma_of_find_ - return NULL; - } - -+#if LINUX_VERSION_IS_GEQ(3,13,0) - static int bcma_of_irq_parse(struct device *parent, - struct bcma_device *core, - struct of_phandle_args *out_irq, int num) -@@ -195,6 +196,13 @@ static unsigned int bcma_of_get_irq(stru - - return irq_create_of_mapping(&out_irq); - } -+#else -+static unsigned int bcma_of_get_irq(struct device *parent, -+ struct bcma_device *core, int num) -+{ -+ return 0; -+} -+#endif - - static void bcma_of_fill_device(struct device *parent, - struct bcma_device *core) |