Skip to content

Commit 4d1c69e

Browse files
committed
Merge tag 'qcom-drivers-for-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
More Qualcomm driver updates for v6.16 Allow HP EliteBook Ultra G1q to use QSSECOM for UEFI variable acecss. Add missing compatible for IPQ5018 TCSR block. Fix a kernel-doc warning in SCM driver. * tag 'qcom-drivers-for-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: docs: firmware: qcom_scm: Fix kernel-doc warning firmware: qcom: scm: Allow QSEECOM for HP EliteBook Ultra G1q dt-bindings: mfd: qcom,tcsr: Add compatible for ipq5018 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 07a3c03 + 936badf commit 4d1c69e

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- qcom,sm8450-tcsr
4242
- qcom,tcsr-apq8064
4343
- qcom,tcsr-apq8084
44+
- qcom,tcsr-ipq5018
4445
- qcom,tcsr-ipq5332
4546
- qcom,tcsr-ipq5424
4647
- qcom,tcsr-ipq6018

drivers/firmware/qcom/qcom_scm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,6 +1989,7 @@ static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = {
19891989
{ .compatible = "asus,zenbook-a14-ux3407qa" },
19901990
{ .compatible = "asus,zenbook-a14-ux3407ra" },
19911991
{ .compatible = "dell,xps13-9345" },
1992+
{ .compatible = "hp,elitebook-ultra-g1q" },
19921993
{ .compatible = "hp,omnibook-x14" },
19931994
{ .compatible = "huawei,gaokun3" },
19941995
{ .compatible = "lenovo,flex-5g" },

drivers/firmware/qcom/qcom_scm.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ enum qcom_scm_arg_types {
4444

4545
/**
4646
* struct qcom_scm_desc
47+
* @svc: Service identifier
48+
* @cmd: Command identifier
4749
* @arginfo: Metadata describing the arguments in args[]
4850
* @args: The array of arguments for the secure syscall
51+
* @owner: Owner identifier
4952
*/
5053
struct qcom_scm_desc {
5154
u32 svc;

0 commit comments

Comments
 (0)