diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-09-24 12:51:38 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-24 12:52:02 +0200 |
| commit | 7b6e1a148f38bab62a35fc6ff22b6f2feaba445b (patch) | |
| tree | 0ddfc61d1db66767e924ea3fac903f065d4d3c01 /backport | |
| parent | 9e0c8ce615ca019dafd1c0e087809e97d913a229 (diff) | |
Revert "backports: Remove ssb and bcma"
This reverts commit 1b4e6ad4d927c7998fa578f2d29e0c4ec01a9217.
Said commit broke b43 on older kernels (<3.16).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport')
| -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 |
7 files changed, 25 insertions, 23 deletions
diff --git a/backport/Kconfig.sources b/backport/Kconfig.sources index 347f1c56..5fb44780 100644 --- a/backport/Kconfig.sources +++ b/backport/Kconfig.sources @@ -7,6 +7,9 @@ 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/drivers/usb/class/Kconfig" source "$BACKPORT_DIR/drivers/staging/Kconfig" diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel index 23b26882..5c966974 100644 --- a/backport/Makefile.kernel +++ b/backport/Makefile.kernel @@ -40,6 +40,8 @@ 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_USB_WDM) += drivers/usb/class/ diff --git a/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h b/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h deleted file mode 100644 index 47809853..00000000 --- a/backport/backport-include/linux/bcma/bcma_driver_chipcommon.h +++ /dev/null @@ -1,23 +0,0 @@ -#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 c486ca1e..27bfb9e2 100644 --- a/backport/defconfigs/b43 +++ b/backport/defconfigs/b43 @@ -11,3 +11,10 @@ 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 552e13b2..71787081 100644 --- a/backport/defconfigs/b43legacy +++ b/backport/defconfigs/b43legacy @@ -6,3 +6,8 @@ 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 20f429b6..2c2edd23 100644 --- a/backport/defconfigs/brcmsmac +++ b/backport/defconfigs/brcmsmac @@ -5,3 +5,5 @@ 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 fb18e182..4034bb13 100644 --- a/backport/defconfigs/wifi +++ b/backport/defconfigs/wifi @@ -17,6 +17,9 @@ 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 @@ -98,6 +101,9 @@ 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 |