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

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

Merge "defconfig: msm: Enable CNSS_ASYNC for auto platform"

parents 00ddc986 6b444311

arch/arm64/configs/msm-auto-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ CONFIG_CNSS_CRYPTO=y 
CONFIG_ATH_CARDS=y

CONFIG_WIL6210=m

CONFIG_CNSS=y

CONFIG_CNSS_ASYNC=y

CONFIG_CLD_LL_CORE=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_INPUT_EVDEV=y

arch/arm64/configs/msm-auto_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ CONFIG_CNSS_CRYPTO=y 
CONFIG_ATH_CARDS=y

CONFIG_WIL6210=m

CONFIG_CNSS=y

CONFIG_CNSS_ASYNC=y

CONFIG_CLD_LL_CORE=y

CONFIG_BUS_AUTO_SUSPEND=y

CONFIG_INPUT_EVDEV=y

drivers/net/wireless/cnss/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,15 @@ config CNSS 
	  This driver also adds support to integrate WLAN module to subsystem

	  restart framework.



config CNSS_ASYNC

	bool "Enable/disable cnss pci platform driver asynchronous probe"

	depends on CNSS

	---help---

	 If enabled, CNSS PCI platform driver would do asynchronous probe.

	 Using asynchronous probe will allow CNSS PCI platform driver to

	 probe in parallel with other device drivers and will help to

	 reduce kernel boot time.



config CNSS_MAC_BUG

	bool "Enable/disable 0-4K memory initialization for QCA6174"

	depends on CNSS

drivers/net/wireless/cnss/cnss_pci.c

+4 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3067,6 +3067,9 @@ static struct platform_driver cnss_driver = { 
		.name = "cnss",

		.owner = THIS_MODULE,

		.of_match_table = cnss_dt_match,

#ifdef CONFIG_CNSS_ASYNC

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,

#endif

	},

};