samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Enable to use CNSS2 platform driver

Browse Source 
Enable the flags to use CNSS2 platform driver for host driver.

Change-Id: I18996443ab8e7c24fb65b6003cfc368b664b5837
This commit is contained in:
Yue Ma
2016-08-31 11:09:23 -07:00
committed by qcabuildsw
parent 8c5f48dda7
commit e6a7a32b00
4 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Kbuild
View File

@@ -18,7 +18,7 @@ ifdef CONFIG_ICNSS
CONFIG_ROME_IF = snoc CONFIG_ROME_IF = snoc
endif endif
ifeq ($(CONFIG_CNSS), y) ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_CNSS2)))
ifndef CONFIG_ROME_IF ifndef CONFIG_ROME_IF
#use pci as default interface #use pci as default interface
CONFIG_ROME_IF = pci CONFIG_ROME_IF = pci
@@ -107,7 +107,7 @@ ifeq ($(KERNEL_BUILD), 0)
CONFIG_QCOM_VOWIFI_11R := y CONFIG_QCOM_VOWIFI_11R := y
ifneq ($(CONFIG_QCA_CLD_WLAN),) ifneq ($(CONFIG_QCA_CLD_WLAN),)
ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_ICNSS))) ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_CNSS2) $(CONFIG_ICNSS)))
#Flag to enable Protected Managment Frames (11w) feature #Flag to enable Protected Managment Frames (11w) feature
CONFIG_WLAN_FEATURE_11W := y CONFIG_WLAN_FEATURE_11W := y
#Flag to enable LTE CoEx feature #Flag to enable LTE CoEx feature
@@ -1107,6 +1107,10 @@ CDEFINES += -DCONFIG_PLD_PCIE_CNSS
endif endif
endif endif
ifeq ($(CONFIG_CNSS2), y)
CDEFINES += -DCONFIG_PLD_PCIE_CNSS
endif
ifeq ($(CONFIG_ICNSS), y) ifeq ($(CONFIG_ICNSS), y)
CDEFINES += -DCONFIG_PLD_SNOC_ICNSS CDEFINES += -DCONFIG_PLD_SNOC_ICNSS
endif endif

17
core/pld/src/pld_common.c
View File

@@ -34,9 +34,24 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pm.h> #include <linux/pm.h>
#if defined(CONFIG_PLD_PCIE_CNSS) || defined(CONFIG_PLD_SDIO_CNSS) #ifdef CONFIG_PLD_SDIO_CNSS
#include <net/cnss.h> #include <net/cnss.h>
#endif #endif
#ifdef CONFIG_PLD_PCIE_CNSS
/*
* This is a hack to make sure this change can be merged before the
* kernel defconfig change (switching to CNSS2 platform driver) merged,
* otherwise the kernel change has to depend on this change to be merged.
* Once the kernel change is merged, these CNSS flags can be removed
* so that only cnss2.h is needed.
*/
#ifdef CONFIG_CNSS
#include <net/cnss.h>
#endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h>
#endif
#endif
#ifdef CONFIG_PLD_SNOC_ICNSS #ifdef CONFIG_PLD_SNOC_ICNSS
#include <soc/qcom/icnss.h> #include <soc/qcom/icnss.h>
#endif #endif

12
core/pld/src/pld_pcie.c
View File

@@ -32,8 +32,20 @@
#include <linux/slab.h> #include <linux/slab.h>
#ifdef CONFIG_PLD_PCIE_CNSS #ifdef CONFIG_PLD_PCIE_CNSS
/*
* This is a hack to make sure this change can be merged before the
* kernel defconfig change (switching to CNSS2 platform driver) merged,
* otherwise the kernel change has to depend on this change to be merged.
* Once the kernel change is merged, these CNSS flags can be removed
* so that only cnss2.h is needed.
*/
#ifdef CONFIG_CNSS
#include <net/cnss.h> #include <net/cnss.h>
#endif #endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h>
#endif
#endif
#include "pld_internal.h" #include "pld_internal.h"
#include "pld_pcie.h" #include "pld_pcie.h"

12
core/pld/src/pld_pcie.h
View File

@@ -29,8 +29,20 @@
#define __PLD_PCIE_H__ #define __PLD_PCIE_H__
#ifdef CONFIG_PLD_PCIE_CNSS #ifdef CONFIG_PLD_PCIE_CNSS
/*
* This is a hack to make sure this change can be merged before the
* kernel defconfig change (switching to CNSS2 platform driver) merged,
* otherwise the kernel change has to depend on this change to be merged.
* Once the kernel change is merged, these CNSS flags can be removed
* so that only cnss2.h is needed.
*/
#ifdef CONFIG_CNSS
#include <net/cnss.h> #include <net/cnss.h>
#endif #endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h>
#endif
#endif
#include "pld_internal.h" #include "pld_internal.h"
#ifndef CONFIG_PCI #ifndef CONFIG_PCI