Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ddf6f51 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: Add CNSS2 platform driver"

parents c9a27f75 62d147b4

Documentation/devicetree/bindings/cnss/cnss-wlan.txt

+3 −2
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ the WLAN enable GPIO, 3.3V fixed voltage regulator resources. It also 
provides the reserved RAM dump memory location and size.



Required properties:

  - compatible: "qcom,cnss"

  - wlan-en-gpio: WLAN_EN GPIO signal specified by QCA6174 specifications

  - compatible: "qcom,cnss" for QCA6174 device

                "qcom,cnss-qca6290" for QCA6290 device

  - wlan-en-gpio: WLAN_EN GPIO signal specified by the chip specifications

  - vdd-wlan-supply: phandle to the regulator device tree node

  - pinctrl-names: Names corresponding to the numbered pinctrl states

  - pinctrl-<n>: Pinctrl states as described in

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -344,5 +344,6 @@ source "drivers/net/wireless/mwifiex/Kconfig" 
source "drivers/net/wireless/cw1200/Kconfig"

source "drivers/net/wireless/rsi/Kconfig"

source "drivers/net/wireless/cnss/Kconfig"

source "drivers/net/wireless/cnss2/Kconfig"



endif # WLAN

drivers/net/wireless/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -64,5 +64,6 @@ obj-$(CONFIG_RSI_91X) += rsi/ 
obj-$(CONFIG_WCNSS_CORE)	+= wcnss/



obj-$(CONFIG_CNSS)	+= cnss/

obj-$(CONFIG_CNSS2)	+= cnss2/

obj-$(CONFIG_WCNSS_MEM_PRE_ALLOC) += cnss_prealloc/

obj-$(CONFIG_CNSS_CRYPTO)	+= cnss_crypto/

drivers/net/wireless/cnss/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ config CLD_LL_CORE 
	select WEXT_PRIV

	select WEXT_SPY

	select WIRELESS_EXT

	select CRYPTO

	select CRYPTO_HASH

	select CRYPTO_BLKCIPHER

	---help---

	  This section contains the necessary modules needed to enable the

	  core WLAN driver for Qualcomm QCA6174 chipset.
@@ -63,7 +66,7 @@ config CNSS_SECURE_FW 


config BUS_AUTO_SUSPEND

	bool "Enable/Disable Runtime PM support for PCIe based WLAN Drivers"

	depends on CNSS

	depends on CNSS || CNSS2

	depends on PCI

	---help---

	  Runtime Power Management is supported for PCIe based WLAN Drivers.

drivers/net/wireless/cnss2/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
config CNSS2

	tristate "CNSS2 Platform Driver for Wi-Fi Module"

	depends on !CNSS && PCI_MSM

	---help---

	  This module adds the support for Connectivity Subsystem (CNSS) used

	  for PCIe based Wi-Fi devices with QCA6174/QCA6290 chipsets.

	  This driver also adds support to integrate WLAN module to subsystem

	  restart framework.



config CNSS2_DEBUG

	bool "CNSS2 Platform Driver Debug Support"

	depends on CNSS2

	---help---

	  This option is to enable CNSS2 platform driver debug support which

	  primarily includes providing additional verbose logs for certain

	  features, enabling kernel panic for certain cases to aid the

	  debugging, and enabling any other debug mechanisms.