Merge "icnss: Provide ICNSS support of reading SOC serial number"

This commit is contained in:
Linux Build Service Account 2016-09-24 02:00:58 -07:00 committed by Gerrit - the friendly Code Review server
commit 30931e7448
2 changed files with 8 additions and 0 deletions
drivers/soc/qcom
include/soc/qcom

View file

@ -43,6 +43,7 @@
#include <soc/qcom/subsystem_notif.h>
#include <soc/qcom/service-locator.h>
#include <soc/qcom/service-notifier.h>
#include <soc/qcom/socinfo.h>
#include "wlan_firmware_service_v01.h"
@ -3291,6 +3292,12 @@ int icnss_smmu_map(struct device *dev,
}
EXPORT_SYMBOL(icnss_smmu_map);
unsigned int icnss_socinfo_get_serial_number(struct device *dev)
{
return socinfo_get_serial_number();
}
EXPORT_SYMBOL(icnss_socinfo_get_serial_number);
static int icnss_bw_vote(struct icnss_priv *priv, int index)
{
int ret = 0;

View file

@ -119,6 +119,7 @@ extern int icnss_power_off(struct device *dev);
extern struct dma_iommu_mapping *icnss_smmu_get_mapping(struct device *dev);
extern int icnss_smmu_map(struct device *dev, phys_addr_t paddr,
uint32_t *iova_addr, size_t size);
extern unsigned int icnss_socinfo_get_serial_number(struct device *dev);
extern int icnss_set_wlan_unsafe_channel(u16 *unsafe_ch_list, u16 ch_count);
extern int icnss_get_wlan_unsafe_channel(u16 *unsafe_ch_list, u16 *ch_count,
u16 buf_len);