From 1a00ab0dd9fc63d51cdbed522808b1cd0e01aaab Mon Sep 17 00:00:00 2001 From: stephen Date: Sat, 29 Sep 2018 22:09:04 +0800 Subject: [PATCH] net: rkwifi: add support for ap6256 Change-Id: I6e5781e3391576198b27e57e15d65cd8ee24818a Signed-off-by: Kever Yang --- .../net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c | 10 ++++++++-- include/linux/rfkill-wlan.h | 1 + net/rfkill/rfkill-wlan.c | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c index fa07a94c27c1..434043a77d7e 100644 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/rk_wifi_config.c @@ -75,9 +75,15 @@ if (chip == WIFI_AP6234) { } if (chip == WIFI_AP6255) { - sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_bcm43455c0_ag.bin"); - sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_ap6255.txt"); + sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_bcm43455c0_ag.bin"); + sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_ap6255.txt"); } + +if (chip == WIFI_AP6256) { + sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_bcm43456C5_ag.bin"); + sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_ap6256.txt"); +} + if (chip == WIFI_AP6441) { sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_bcm43341b0_ag.bin"); sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_AP6441.txt"); diff --git a/include/linux/rfkill-wlan.h b/include/linux/rfkill-wlan.h index 2cead6d09a15..883d0ae1a8bf 100644 --- a/include/linux/rfkill-wlan.h +++ b/include/linux/rfkill-wlan.h @@ -54,6 +54,7 @@ enum { WIFI_AP6212, WIFI_AP6234, WIFI_AP6255, + WIFI_AP6256, WIFI_AP6330, WIFI_AP6335, WIFI_AP6354, diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c index fcb220017dda..333368f2f071 100644 --- a/net/rfkill/rfkill-wlan.c +++ b/net/rfkill/rfkill-wlan.c @@ -118,6 +118,8 @@ int get_wifi_chip_type(void) type = WIFI_AP6234; } else if (strcmp(wifi_chip_type_string, "ap6255") == 0) { type = WIFI_AP6255; + } else if (strcmp(wifi_chip_type_string, "ap6256") == 0) { + type = WIFI_AP6256; } else if (strcmp(wifi_chip_type_string, "ap6330") == 0) { type = WIFI_AP6330; } else if (strcmp(wifi_chip_type_string, "ap6335") == 0) {