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

qcacld-3.0: Remove temporary hacks during bring-up

Browse Source 
CNSS2 platform driver is the only driver which will support PCIe
bus based discrete WLAN chipsets.

Change-Id: If2d3aded36d383e2e4b0dc4ec9e6ab9e1023f2a9
CRs-fixed: 1082183
This commit is contained in:
Yue Ma
2017-01-06 12:28:40 -08:00
committed by qcabuildsw
parent 10f4726aec
commit ea7721163e
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,20 +38,8 @@
#include <net/cnss.h> #include <net/cnss.h>
#endif #endif
#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>
#endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h> #include <net/cnss2.h>
#endif #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,20 +32,8 @@
#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>
#endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h> #include <net/cnss2.h>
#endif #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,20 +29,8 @@
#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>
#endif
#ifdef CONFIG_CNSS2
#include <net/cnss2.h> #include <net/cnss2.h>
#endif #endif
#endif
#include "pld_internal.h" #include "pld_internal.h"
#ifndef CONFIG_PCI #ifndef CONFIG_PCI