diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-05-08 09:45:25 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-08 09:45:26 +0300 |
| commit | 1c97fe39fbac69b2e1070ace7f625a8224116ffd (patch) | |
| tree | d6e1a7d03a566a982e7d61aa411709ec16bedf08 /drivers/firmware | |
| parent | a3116c88817e0f75db08056913e8e49bc86b2677 (diff) | |
| parent | 4b34d4c25da289712d9a5bd5bac5888f099cbc5c (diff) | |
| download | linux-1c97fe39fbac69b2e1070ace7f625a8224116ffd.tar.xz | |
Merge tag 'qcom-drivers-for-6.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
A few more Qualcomm driver updates for v6.10
This fixes a sleep-while-atomic issue in pmic_glink, stemming from the
fact that the GLINK callback comes from interrupt context.
It fixes the Bluetooth address in the example of qcom,wcnss, and it
enables UEFI variables on SC8180X devices (Primus and Flex 5G).
* tag 'qcom-drivers-for-6.10-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
firmware: qcom: uefisecapp: Allow on sc8180x Primus and Flex 5G
soc: qcom: pmic_glink: Make client-lock non-sleeping
dt-bindings: soc: qcom,wcnss: fix bluetooth address example
Link: https://lore.kernel.org/r/20240508020900.204413-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qcom/qcom_scm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c index 5ff62f57aa55..9cb02cd94c04 100644 --- a/drivers/firmware/qcom/qcom_scm.c +++ b/drivers/firmware/qcom/qcom_scm.c @@ -1671,7 +1671,9 @@ EXPORT_SYMBOL_GPL(qcom_scm_qseecom_app_send); + any potential issues with this, only allow validated machines for now. */ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = { + { .compatible = "lenovo,flex-5g" }, { .compatible = "lenovo,thinkpad-x13s", }, + { .compatible = "qcom,sc8180x-primus" }, { } }; |