From: hwg <hwg@rock-chips.com>
Date: Wed, 1 Jul 2015 06:53:29 +0000 (+0800)
Subject: bcmdhd wifi: nvram auto recognize for AP6335
X-Git-Tag: firefly_0821_release~3957
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1641459cac143eb0d5fdfce002653ef9c93efea0;p=firefly-linux-kernel-4.4.55.git

bcmdhd wifi: nvram auto recognize for AP6335
---

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
index 1e8e577ed51e..bbfe2a892da4 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
@@ -485,7 +485,6 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
 		case BCM4335_CHIP_ID:
 			if (chiprev == BCM4335A0_CHIP_REV)
 				strcpy(&fw_path[i+1], bcm4339a0_ag_fw_name[fw_type]);
-			strcpy(&nv_path[i+1], "nvram_AP6335.txt");
 			break;
 		case BCM4345_CHIP_ID:
 			if (chiprev == BCM43455C0_CHIP_REV)
@@ -494,6 +493,7 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
 		case BCM4339_CHIP_ID:
 			if (chiprev == BCM4339A0_CHIP_REV)
 				strcpy(&fw_path[i+1], bcm4339a0_ag_fw_name[fw_type]);
+			strcpy(&nv_path[i+1], "nvram_AP6335.txt");
 			break;
 		case BCM4354_CHIP_ID:
 			if (chiprev == BCM4354A1_CHIP_REV)
@@ -511,7 +511,7 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *fw_path, char *nv_path)
 #endif
 	}
 
-	printf("%s: firmware_path=%s\n", __FUNCTION__, fw_path);
+	printk("%s: firmware_path=%s,nv_path=%s\n", __FUNCTION__, fw_path, nv_path);
 }
 
 void