Skip to content

Commit 73536ab

Browse files
committed
Merge tag 'qcom-drivers-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/drivers
Qualcomm driver updates for v6.13 Enable QSEECOM, and thereby access to EFI variables, for Lenovo Yoga Slim 7x, Dell XPS 13, Microsoft Surface Pro 9. Last Level Cache Controller (LLCC) driver code is shuffled, to improve readability of the tables. The Qualcomm socinfo driver gains support for QCS615, QCS9100, SAR1130P, SAR2130P, and SA8255P. A few drivers are simplified using dev_err_probe() and guard(), and a few kernel-doc issues are corrected. Mentioning of the #linux-msm IRC channel is added to the MAINTAINERS file. * tag 'qcom-drivers-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (30 commits) soc: qcom: socinfo: add QCS9100 ID dt-bindings: arm: qcom,ids: add SoC ID for QCS9100 dt-bindings: soc: qcom,aoss-qmp: Document the QCS8300 AOSS channel dt-bindings: soc: qcom: add qcom,qcs8300-imem compatible dt-bindings: firmware: qcom,scm: document SCM on QCS8300 SoCs soc: qcom: socinfo: add support for SA8255P dt-bindings: arm: qcom: add the SoC ID for SA8255P soc: qcom: smp2p: Simplify code with dev_err_probe() soc: qcom: smem: Simplify code with dev_err_probe() soc: qcom: rpmh-rsc: Simplify code with dev_err_probe() dt-bindings: soc: qcom: aoss-qmp: document support for SA8255p dt-bindings: firmware: qcom,scm: document support for SA8255p dt-bindings: soc: qcom,aoss-qmp: Add SAR2130P compatible dt-bindings: firmware: qcom,scm: Add SAR2130P compatible soc: qcom: socinfo: add SoC IDs for SAR1130P and SAR2130P dt-bindings: arm: qcom,ids: add SoC ID for SAR2130P and SAR1130P dt-bindings: soc: qcom: aoss-qmp: Add SM8750 soc: qcom: socinfo: Add QCS615 SoC ID table entry dt-bindings: arm: qcom,ids: add SoC ID for QCS615 soc: qcom: smem: Fix up kerneldoc ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 04d4d0a + d088afa commit 73536ab

File tree

16 files changed

+2432
-311
lines changed

16 files changed

+2432
-311
lines changed

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ properties:
4242
- qcom,scm-msm8996
4343
- qcom,scm-msm8998
4444
- qcom,scm-qcm2290
45+
- qcom,scm-qcs8300
4546
- qcom,scm-qdu1000
47+
- qcom,scm-sa8255p
4648
- qcom,scm-sa8775p
49+
- qcom,scm-sar2130p
4750
- qcom,scm-sc7180
4851
- qcom,scm-sc7280
4952
- qcom,scm-sc8180x
@@ -204,6 +207,7 @@ allOf:
204207
compatible:
205208
contains:
206209
enum:
210+
- qcom,scm-sa8255p
207211
- qcom,scm-sa8775p
208212
then:
209213
properties:

Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@ properties:
2525
compatible:
2626
items:
2727
- enum:
28+
- qcom,qcs8300-aoss-qmp
2829
- qcom,qdu1000-aoss-qmp
30+
- qcom,sa8255p-aoss-qmp
2931
- qcom,sa8775p-aoss-qmp
32+
- qcom,sar2130p-aoss-qmp
3033
- qcom,sc7180-aoss-qmp
3134
- qcom,sc7280-aoss-qmp
3235
- qcom,sc8180x-aoss-qmp
@@ -40,6 +43,7 @@ properties:
4043
- qcom,sm8450-aoss-qmp
4144
- qcom,sm8550-aoss-qmp
4245
- qcom,sm8650-aoss-qmp
46+
- qcom,sm8750-aoss-qmp
4347
- qcom,x1e80100-aoss-qmp
4448
- const: qcom,aoss-qmp
4549

Documentation/devicetree/bindings/sram/qcom,imem.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- qcom,msm8226-imem
2222
- qcom,msm8974-imem
2323
- qcom,qcs404-imem
24+
- qcom,qcs8300-imem
2425
- qcom,qdu1000-imem
2526
- qcom,sa8775p-imem
2627
- qcom,sc7180-imem

MAINTAINERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,6 +2805,7 @@ F: arch/arm64/boot/dts/qcom/sdm845-cheza*
28052805

28062806
ARM/QUALCOMM MAILING LIST
28072807
2808+
C: irc://irc.oftc.net/linux-msm
28082809
F: Documentation/devicetree/bindings/*/qcom*
28092810
F: Documentation/devicetree/bindings/soc/qcom/
28102811
F: arch/arm/boot/dts/qcom/
@@ -2846,6 +2847,7 @@ M: Bjorn Andersson <[email protected]>
28462847
M: Konrad Dybcio <[email protected]>
28472848
28482849
S: Maintained
2850+
C: irc://irc.oftc.net/linux-msm
28492851
T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git
28502852
F: Documentation/devicetree/bindings/arm/qcom-soc.yaml
28512853
F: Documentation/devicetree/bindings/arm/qcom.yaml
@@ -18202,6 +18204,7 @@ PIN CONTROLLER - QUALCOMM
1820218204
M: Bjorn Andersson <[email protected]>
1820318205
1820418206
S: Maintained
18207+
C: irc://irc.oftc.net/linux-msm
1820518208
F: Documentation/devicetree/bindings/pinctrl/qcom,*
1820618209
F: drivers/pinctrl/qcom/
1820718210

drivers/firmware/qcom/qcom_scm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,9 +1731,12 @@ EXPORT_SYMBOL_GPL(qcom_scm_qseecom_app_send);
17311731
+ any potential issues with this, only allow validated machines for now.
17321732
*/
17331733
static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = {
1734+
{ .compatible = "dell,xps13-9345" },
17341735
{ .compatible = "lenovo,flex-5g" },
17351736
{ .compatible = "lenovo,thinkpad-t14s" },
17361737
{ .compatible = "lenovo,thinkpad-x13s", },
1738+
{ .compatible = "lenovo,yoga-slim7x" },
1739+
{ .compatible = "microsoft,arcata", },
17371740
{ .compatible = "microsoft,romulus13", },
17381741
{ .compatible = "microsoft,romulus15", },
17391742
{ .compatible = "qcom,sc8180x-primus" },

0 commit comments

Comments
 (0)