@@ -10,9 +10,6 @@ source "$BACKPORT_DIR/drivers/soc/qcom/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"
@@ -42,8 +42,6 @@ obj-$(CPTCFG_QRTR) += net/qrtr/
obj-$(CPTCFG_QCOM_QMI_HELPERS) += drivers/soc/qcom/
obj-$(CPTCFG_MHI_BUS) += drivers/bus/mhi/
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/
deleted file mode 100644
@@ -1,9 +0,0 @@
-#ifndef __BACKPORT_BRCMNAND_PLAT_DATA_H
-#define __BACKPORT_BRCMNAND_PLAT_DATA_H
-#include <linux/version.h>
-
-#if LINUX_VERSION_IS_GEQ(5,18,0)
-#include_next <linux/platform_data/brcmnand.h>
-#endif /* >= 5.18.0 */
-
-#endif /* __BACKPORT_BRCMNAND_PLAT_DATA_H */
@@ -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
@@ -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
@@ -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
@@ -19,9 +19,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
@@ -129,9 +126,6 @@ CPTCFG_RTW88=m
CPTCFG_RTW89=m
CPTCFG_RTW89_8852AE=m
CPTCFG_RTW89_8852CE=m
-CPTCFG_SSB=m
-CPTCFG_SSB_PCMCIAHOST=y
-CPTCFG_SSB_SDIOHOST=y
CPTCFG_STAGING=y
CPTCFG_TMD_HERMES=m
CPTCFG_USB_NET_RNDIS_WLAN=m
@@ -71,10 +71,6 @@ drivers/bus/mhi/
include/linux/mhi.h
drivers/net/wireless/ath/
-drivers/ssb/
-include/linux/ssb/
-drivers/bcma/
-include/linux/bcma/
drivers/soc/qcom/Makefile
drivers/soc/qcom/Kconfig
drivers/soc/qcom/qmi_encdec.c
deleted file mode 100644
@@ -1,63 +0,0 @@
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -28,6 +28,7 @@ static DEFINE_MUTEX(bcma_buses_mutex);
- static int bcma_bus_match(struct device *dev, struct device_driver *drv);
- static int bcma_device_probe(struct device *dev);
- static void bcma_device_remove(struct device *dev);
-+static int bcma_device_remove_bp(struct device *dev);
- static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env);
-
- static ssize_t manuf_show(struct device *dev, struct device_attribute *attr, char *buf)
-@@ -71,7 +72,11 @@ static struct bus_type bcma_bus_type = {
- .name = "bcma",
- .match = bcma_bus_match,
- .probe = bcma_device_probe,
-+#if LINUX_VERSION_IS_GEQ(5,15,0)
- .remove = bcma_device_remove,
-+#else
-+ .remove = bcma_device_remove_bp,
-+#endif
- .uevent = bcma_device_uevent,
- .dev_groups = bcma_device_groups,
- };
-@@ -625,6 +630,12 @@ static void bcma_device_remove(struct de
- put_device(dev);
- }
-
-+static int bcma_device_remove_bp(struct device *dev)
-+{
-+ bcma_device_remove(dev);
-+ return 0;
-+}
-+
- static int bcma_device_uevent(struct device *dev, struct kobj_uevent_env *env)
- {
- struct bcma_device *core = container_of(dev, struct bcma_device, dev);
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -293,6 +293,13 @@ static void ssb_device_remove(struct dev
- ssb_device_put(ssb_dev);
- }
-
-+static int ssb_device_remove_bp(struct device *dev)
-+{
-+ ssb_device_remove(dev);
-+
-+ return 0;
-+}
-+
- static int ssb_device_probe(struct device *dev)
- {
- struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-@@ -388,7 +395,11 @@ static struct bus_type ssb_bustype = {
- .name = "ssb",
- .match = ssb_bus_match,
- .probe = ssb_device_probe,
-+#if LINUX_VERSION_IS_GEQ(5,15,0)
- .remove = ssb_device_remove,
-+#else
-+ .remove = ssb_device_remove_bp,
-+#endif
- .shutdown = ssb_device_shutdown,
- .suspend = ssb_device_suspend,
- .resume = ssb_device_resume,
deleted file mode 100644
@@ -1,14 +0,0 @@
---- a/drivers/bcma/driver_gpio.c
-+++ b/drivers/bcma/driver_gpio.c
-@@ -184,7 +184,11 @@ int bcma_gpio_init(struct bcma_drv_cc *c
- chip->direction_input = bcma_gpio_direction_input;
- chip->direction_output = bcma_gpio_direction_output;
- chip->parent = bus->dev;
-+#if LINUX_VERSION_IS_GEQ(5,17,0)
- chip->fwnode = dev_fwnode(&cc->core->dev);
-+#elif IS_BUILTIN(CONFIG_OF)
-+ chip->of_node = cc->core->dev.of_node;
-+#endif
-
- switch (bus->chipinfo.id) {
- case BCMA_CHIP_ID_BCM4707:
There are only very few changes in ssb and bcma subsystem between kernel 4.14 and 6.1. To reduce the maintenance effort just remove them from backports and use the in kernel versions instead. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- backport/Kconfig.sources | 3 - backport/Makefile.kernel | 2 - .../linux/platform_data/brcmnand.h | 9 --- backport/defconfigs/b43 | 7 --- backport/defconfigs/b43legacy | 5 -- backport/defconfigs/brcmsmac | 2 - backport/defconfigs/wifi | 6 -- copy-list | 4 -- patches/0102-remove-callback.patch | 63 ------------------- patches/0112-gpio-fwnode.patch | 14 ----- 10 files changed, 115 deletions(-) delete mode 100644 backport/backport-include/linux/platform_data/brcmnand.h delete mode 100644 patches/0102-remove-callback.patch delete mode 100644 patches/0112-gpio-fwnode.patch