Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14823bf2 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: use unified firmware 



Use a unified firmware for all mode of operations which are station, ap and
p2p. Two firmware are introduced for 1002 and 1003 chipset.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8f6ca0b

drivers/staging/wilc1000/Makefile

+2 −3
Original line number Diff line number Diff line 
obj-$(CONFIG_WILC1000) += wilc1000.o



ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \

		-DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \

		-DP2P_CONCURRENCY_FIRMWARE=\"atmel/wilc1000_p2p_fw.bin\"

ccflags-y += -DFIRMWARE_1002=\"atmel/wilc1002_firmware.bin\" \

		-DFIRMWARE_1003=\"atmel/wilc1003_firmware.bin\"



ccflags-y += -I$(src)/ -DWILC_ASIC_A0 -DWILC_DEBUGFS

#ccflags-y += -DTCP_ACK_FILTER

drivers/staging/wilc1000/linux_wlan.c

+9 −9
Original line number Diff line number Diff line
@@ -416,21 +416,21 @@ int wilc_wlan_get_firmware(struct net_device *dev) 
{

	struct wilc_vif *vif;

	struct wilc *wilc;

	int ret = 0;

	int chip_id, ret = 0;

	const struct firmware *wilc_firmware;

	char *firmware;



	vif = netdev_priv(dev);

	wilc = vif->wilc;



	if (vif->iftype == AP_MODE) {

		firmware = AP_FIRMWARE;

	} else if (vif->iftype == STATION_MODE) {

		firmware = STA_FIRMWARE;

	} else {

		PRINT_D(INIT_DBG, "Get P2P_CONCURRENCY_FIRMWARE\n");

		firmware = P2P_CONCURRENCY_FIRMWARE;

	}

	chip_id = wilc_get_chipid(wilc, 0);



	if (chip_id < 0x1003a0)

		firmware = FIRMWARE_1002;

	else

		firmware = FIRMWARE_1003;



	netdev_info(dev, "loading firmware %s\n", firmware);



	if (!vif) {

		PRINT_ER("vif is NULL\n");