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

This commit is contained in:
Linux Build Service Account 2017-05-10 23:03:55 -07:00 committed by Gerrit - the friendly Code Review server
commit 4952fa0037
4 changed files with 15 additions and 1 deletions

View file

@ -273,6 +273,7 @@ CONFIG_CNSS_CRYPTO=y
CONFIG_ATH_CARDS=y CONFIG_ATH_CARDS=y
CONFIG_WIL6210=m CONFIG_WIL6210=m
CONFIG_CNSS=y CONFIG_CNSS=y
CONFIG_CNSS_ASYNC=y
CONFIG_CLD_LL_CORE=y CONFIG_CLD_LL_CORE=y
CONFIG_BUS_AUTO_SUSPEND=y CONFIG_BUS_AUTO_SUSPEND=y
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y

View file

@ -274,6 +274,7 @@ CONFIG_CNSS_CRYPTO=y
CONFIG_ATH_CARDS=y CONFIG_ATH_CARDS=y
CONFIG_WIL6210=m CONFIG_WIL6210=m
CONFIG_CNSS=y CONFIG_CNSS=y
CONFIG_CNSS_ASYNC=y
CONFIG_CLD_LL_CORE=y CONFIG_CLD_LL_CORE=y
CONFIG_BUS_AUTO_SUSPEND=y CONFIG_BUS_AUTO_SUSPEND=y
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y

View file

@ -9,6 +9,15 @@ config CNSS
This driver also adds support to integrate WLAN module to subsystem This driver also adds support to integrate WLAN module to subsystem
restart framework. 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 config CNSS_MAC_BUG
bool "Enable/disable 0-4K memory initialization for QCA6174" bool "Enable/disable 0-4K memory initialization for QCA6174"
depends on CNSS depends on CNSS

View file

@ -1,4 +1,4 @@
/* 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 * 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 * 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", .name = "cnss",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = cnss_dt_match, .of_match_table = cnss_dt_match,
#ifdef CONFIG_CNSS_ASYNC
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
#endif
}, },
}; };