From patchwork Wed Jan 7 19:37:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan HERPAI X-Patchwork-Id: 426387 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8580914009B for ; Thu, 8 Jan 2015 06:37:53 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0DDFA28013A; Wed, 7 Jan 2015 20:35:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B6A382800D4 for ; Wed, 7 Jan 2015 20:35:31 +0100 (CET) X-policyd-weight: using cached result; rate: -7.6 Received: from trabant.uid0.hu (trabant.uid0.hu [81.0.124.200]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 7 Jan 2015 20:35:29 +0100 (CET) Received: from [127.0.0.1] (port=53759 helo=localhost) by trabant.uid0.hu with esmtps (Exim 4.80 #2 (Debian)) id 1Y8wQK-0005fH-De from for ; Wed, 07 Jan 2015 20:37:44 +0100 Date: Wed, 7 Jan 2015 20:37:44 +0100 (CET) From: Zoltan HERPAI X-X-Sender: wigyori@trabant.deployis.eu To: openwrt-devel@openwrt.org Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Subject: [OpenWrt-Devel] [RFC PATCH] mac80211: brcmfmac: separate SDIO and USB support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This patch will add options to select SDIO and USB support in the brcmfmac driver, and not tie it to only support USB. As the driver doesn't build the host interface code into separate .ko, the required ones are selected via config options. PCIe support is not added now, can be added later. As of now, only sunxi would use the SDIO support for the Ampak modules. Signed-off-by: Zoltan HERPAI Index: package/kernel/mac80211/Makefile =================================================================== --- package/kernel/mac80211/Makefile (revision 43857) +++ package/kernel/mac80211/Makefile (working copy) @@ -1477,17 +1477,36 @@ define KernelPackage/brcmfmac $(call KernelPackage/mac80211/Default) - TITLE:=Broadcom IEEE802.11n USB FullMAC WLAN driver + TITLE:=Broadcom IEEE802.11n USB/SDIO FullMAC WLAN driver URL:=http://linuxwireless.org/en/users/Drivers/brcm80211 - DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil + DEPENDS+= @(USB_SUPPORT||TARGET_sunxi) +kmod-cfg80211 +@DRIVER_11N_SUPPORT +kmod-brcmutil FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko AUTOLOAD:=$(call AutoProbe,brcmfmac) endef define KernelPackage/brcmfmac/description - Kernel module for Broadcom IEEE802.11n USB Wireless cards + Kernel module for Broadcom IEEE802.11n USB/SDIO Wireless cards endef +define KernelPackage/brcmfmac/config + if PACKAGE_kmod-brcmfmac + + config PACKAGE_BRCMFMAC_SDIO + depends TARGET_sunxi + bool "Broadcom FullMAC SDIO support" + help + Say Y if you want to enable SDIO support for the brcmfmac driver. + + config PACKAGE_BRCMFMAC_USB + select PACKAGE_kmod-usb-core + default y + bool "Broadcom FullMAC USB support" + help + Say Y if you want to enable USB support for the brcmfmac driver. + + endif +endef + config_package=$(if $(CONFIG_PACKAGE_kmod-$(1)),m) config-y:= \ @@ -1558,8 +1577,9 @@ config-$(call config_package,brcmutil) += BRCMUTIL config-$(call config_package,brcmsmac) += BRCMSMAC config-$(call config_package,brcmfmac) += BRCMFMAC -config-y += BRCMFMAC_USB +config-$(CONFIG_PACKAGE_BRCMFMAC_USB) += BRCMFMAC_USB config-$(CONFIG_PACKAGE_BRCM80211_DEBUG) += BRCMDBG +config-$(CONFIG_PACKAGE_BRCMFMAC_SDIO) += BRCMFMAC_SDIO config-$(call config_package,mac80211-hwsim) += MAC80211_HWSIM @@ -1969,12 +1989,25 @@ define KernelPackage/brcmfmac/install $(INSTALL_DIR) $(1)/lib/firmware/brcm +ifeq ($(CONFIG_PACKAGE_BRCMFMAC_USB),y) $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43236b.bin \ $(1)/lib/firmware/brcm/ $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43143.bin \ $(1)/lib/firmware/brcm/ +endif +ifeq ($(CONFIG_PACKAGE_BRCMFMAC_SDIO),y) + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac4329-sdio.bin \ + $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac4330-sdio.bin \ + $(1)/lib/firmware/brcm/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/brcm/brcmfmac43362-sdio.bin \ + $(1)/lib/firmware/brcm/ +endif endef $(eval $(call KernelPackage,adm8211))