Skip to content

Commit 3fc5aea

Browse files
committed
Merge tag 'qcom-drivers-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
Qualcomm driver updates for v6.16 Allow list QSEECOM for EFI variable services on on the Asus Zenbook A14, and block list TZMEM on the SM7150 platform to avoid issues with rmtfs. Extend the last-level cache (llcc) driver to support version 6 of the hardware and enable SM8750 support. Also add socinfo for the SM8750 platform. Re-enable UCSI support on SC8280XP, now that the reported crash has been dealt with, and filter the altmode notifications to avoid spurious hotplug events being propagated to user space. Add SM7150 support to pd-mapper. * tag 'qcom-drivers-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: soc: qcom: llcc-qcom: Add support for SM8750 soc: qcom: llcc-qcom: Add support for LLCC V6 dt-bindings: cache: qcom,llcc: Document SM8750 LLCC block soc: qcom: socinfo: add SM8750 SoC ID dt-bindings: arm: qcom,ids: add SoC ID for SM8750 dt-bindings: soc: qcom: qcom,rpm: add missing clock/-names properties dt-bindings: soc: qcom,rpm: add missing clock-controller node soc: qcom: smem: Update max processor count firmware: qcom: tzmem: disable sm7150 platform soc: qcom: pd-mapper: Add support for SM7150 soc: qcom: pmic_glink_altmode: fix spurious DP hotplug events soc: qcom: smp2p: Fix fallback to qcom,ipc parse soc: qcom: pmic_glink: enable UCSI on sc8280xp firmware: qcom: scm: Allow QSEECOM on Asus Zenbook A14 dt-bindings: soc: qcom,rpmh-rsc: Limit power-domains requirement Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 5bba2c4 + 2c04e58 commit 3fc5aea

File tree

14 files changed

+577
-23
lines changed

14 files changed

+577
-23
lines changed

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040
- qcom,sm8450-llcc
4141
- qcom,sm8550-llcc
4242
- qcom,sm8650-llcc
43+
- qcom,sm8750-llcc
4344
- qcom,x1e80100-llcc
4445

4546
reg:
@@ -274,6 +275,7 @@ allOf:
274275
- qcom,sm8450-llcc
275276
- qcom,sm8550-llcc
276277
- qcom,sm8650-llcc
278+
- qcom,sm8750-llcc
277279
then:
278280
properties:
279281
reg:

Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ properties:
3636
- const: err
3737
- const: wakeup
3838

39+
clocks:
40+
maxItems: 1
41+
42+
clock-names:
43+
items:
44+
- const: ram
45+
3946
qcom,ipc:
4047
$ref: /schemas/types.yaml#/definitions/phandle-array
4148
items:
@@ -46,6 +53,14 @@ properties:
4653
description:
4754
Three entries specifying the outgoing ipc bit used for signaling the RPM.
4855

56+
clock-controller:
57+
type: object
58+
additionalProperties: true
59+
properties:
60+
compatible:
61+
contains:
62+
const: qcom,rpmcc
63+
4964
patternProperties:
5065
"^regulators(-[01])?$":
5166
type: object

Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,13 @@ description: |
4444
4545
properties:
4646
compatible:
47-
const: qcom,rpmh-rsc
47+
oneOf:
48+
- items:
49+
- enum:
50+
- qcom,sc7180-rpmh-apps-rsc
51+
- qcom,sdm845-rpmh-apps-rsc
52+
- const: qcom,rpmh-rsc
53+
- const: qcom,rpmh-rsc
4854

4955
interrupts:
5056
minItems: 1
@@ -124,7 +130,21 @@ required:
124130
- qcom,tcs-offset
125131
- reg
126132
- reg-names
127-
- power-domains
133+
134+
allOf:
135+
# Some platforms may lack a OSI-mode PSCI implementation, which implies the
136+
# system power domain can't provide feedback about entering power collapse
137+
- if:
138+
not:
139+
properties:
140+
compatible:
141+
contains:
142+
enum:
143+
- qcom,sc7180-rpmh-apps-rsc
144+
- qcom,sdm845-rpmh-apps-rsc
145+
then:
146+
required:
147+
- power-domains
128148

129149
additionalProperties: false
130150

drivers/firmware/qcom/qcom_scm.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,6 +1986,8 @@ EXPORT_SYMBOL_GPL(qcom_scm_qseecom_app_send);
19861986
*/
19871987
static const struct of_device_id qcom_scm_qseecom_allowlist[] __maybe_unused = {
19881988
{ .compatible = "asus,vivobook-s15" },
1989+
{ .compatible = "asus,zenbook-a14-ux3407qa" },
1990+
{ .compatible = "asus,zenbook-a14-ux3407ra" },
19891991
{ .compatible = "dell,xps13-9345" },
19901992
{ .compatible = "hp,omnibook-x14" },
19911993
{ .compatible = "huawei,gaokun3" },

drivers/firmware/qcom/qcom_tzmem.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ static const char *const qcom_tzmem_blacklist[] = {
7979
"qcom,sc8180x",
8080
"qcom,sdm670", /* failure in GPU firmware loading */
8181
"qcom,sdm845", /* reset in rmtfs memory assignment */
82+
"qcom,sm7150", /* reset in rmtfs memory assignment */
8283
"qcom,sm8150", /* reset in rmtfs memory assignment */
8384
NULL
8485
};

0 commit comments

Comments
 (0)