evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "icnss: pass fw version to wlan driver"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-04 21:39:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0cd21ace7b
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/soc/qcom/icnss.c
View file

@ -1580,6 +1580,14 @@ int icnss_get_soc_info(struct icnss_soc_info *info)
info->v_addr = penv->mem_base_va; info->v_addr = penv->mem_base_va;
info->p_addr = penv->mem_base_pa; info->p_addr = penv->mem_base_pa;
info->chip_id = penv->chip_info.chip_id;
info->chip_family = penv->chip_info.chip_family;
info->board_id = penv->board_info.board_id;
info->soc_id = penv->soc_info.soc_id;
info->fw_version = penv->fw_version_info.fw_version;
strlcpy(info->fw_build_timestamp,
penv->fw_version_info.fw_build_timestamp,
QMI_WLFW_MAX_TIMESTAMP_LEN_V01 + 1);
return 0; return 0;
} }

8
include/soc/qcom/icnss.h
View file

@ -15,6 +15,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#define ICNSS_MAX_IRQ_REGISTRATIONS 12 #define ICNSS_MAX_IRQ_REGISTRATIONS 12
#define ICNSS_MAX_TIMESTAMP_LEN 32
struct icnss_driver_ops { struct icnss_driver_ops {
char *name; char *name;
@ -79,7 +80,12 @@ enum icnss_driver_mode {
struct icnss_soc_info { struct icnss_soc_info {
void __iomem *v_addr; void __iomem *v_addr;
phys_addr_t p_addr; phys_addr_t p_addr;
u32 version; uint32_t chip_id;
uint32_t chip_family;
uint32_t board_id;
uint32_t soc_id;
uint32_t fw_version;
char fw_build_timestamp[ICNSS_MAX_TIMESTAMP_LEN + 1];
}; };
extern int icnss_register_driver(struct icnss_driver_ops *driver); extern int icnss_register_driver(struct icnss_driver_ops *driver);