diff options
author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2021-09-28 05:13:45 +0200 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2021-09-28 05:13:45 +0200 |
commit | f27591125a56c8c50491919b159569ab5730878d (patch) | |
tree | bc91bfe0d062d26f9fcf8de3cbb413f07076ffd8 /drivers/soc/qcom/Kconfig | |
parent | dt-bindings: soc: qcom: aoss: Delete unused power-domain definitions (diff) | |
parent | soc: qcom: apr: Add GPR support (diff) | |
download | linux-f27591125a56c8c50491919b159569ab5730878d.tar.xz linux-f27591125a56c8c50491919b159569ab5730878d.zip |
Merge tag '20210927135559.738-6-srinivas.kandagatla@linaro.org' into drivers-for-5.16
v5.15-rc1 + 20210927135559.738-[23456]-srinivas.kandagatla@linaro.org
This immutable branch is based on v5.15-rc1 and contains the following
patches extending the existig APR driver to also implement GPR:
20210927135559.738-2-srinivas.kandagatla@linaro.org
20210927135559.738-3-srinivas.kandagatla@linaro.org
20210927135559.738-4-srinivas.kandagatla@linaro.org
20210927135559.738-5-srinivas.kandagatla@linaro.org
20210927135559.738-6-srinivas.kandagatla@linaro.org
Diffstat (limited to 'drivers/soc/qcom/Kconfig')
-rw-r--r-- | drivers/soc/qcom/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index fe3c486ae32d..abfef201b94f 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -208,7 +208,7 @@ config QCOM_WCNSS_CTRL firmware to a newly booted WCNSS chip. config QCOM_APR - tristate "Qualcomm APR Bus (Asynchronous Packet Router)" + tristate "Qualcomm APR/GPR Bus (Asynchronous/Generic Packet Router)" depends on ARCH_QCOM || COMPILE_TEST depends on RPMSG depends on NET |