Skip to content

Commit 6890717

Browse files
arndbarndb
committed
Merge tag 'qcom-drivers-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
More Qualcomm driver updates for 6.3 The qcom_scm.h file is moved into firmware/qcom, to avoid having any Qualcomm-specific files directly in include/linux. Support for PMIC GLINK is introduced, which on newer Qualcomm platforms provides an interface to the firmware implementing battery management and USB Type-C handling. Together with the base driver comes the custom altmode support driver. SMD RPM gains support for IPQ9574, and socinfo is extended with support for revision 17 of the information format and soc_id for IPQ5332 and IPQ8064 are added. The qcom_stats is changes not to fail when not all parts are initialized. * tag 'qcom-drivers-for-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: soc: qcom: socinfo: Add IDs for IPQ5332 and its variant dt-bindings: arm: qcom,ids: Add IDs for IPQ5332 and its variant dt-bindings: power: qcom,rpmpd: add RPMH_REGULATOR_LEVEL_LOW_SVS_L1 firmware: qcom_scm: Move qcom_scm.h to include/linux/firmware/qcom/ MAINTAINERS: Update qcom CPR maintainer entry dt-bindings: firmware: document Qualcomm SM8550 SCM dt-bindings: firmware: qcom,scm: add qcom,scm-sa8775p compatible soc: qcom: socinfo: Add Soc IDs for IPQ8064 and variants dt-bindings: arm: qcom,ids: Add Soc IDs for IPQ8064 and variants soc: qcom: socinfo: Add support for new field in revision 17 soc: qcom: smd-rpm: Add IPQ9574 compatible soc: qcom: pmic_glink: remove redundant calculation of svid soc: qcom: stats: Populate all subsystem debugfs files dt-bindings: soc: qcom,rpmh-rsc: Update to allow for generic nodes soc: qcom: pmic_glink: add CONFIG_NET/CONFIG_OF dependencies soc: qcom: pmic_glink: Introduce altmode support soc: qcom: pmic_glink: Introduce base PMIC GLINK driver dt-bindings: soc: qcom: Introduce PMIC GLINK binding soc: qcom: dcc: Drop driver for now Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 01e9d2c + b0bc8c8 commit 6890717

File tree

41 files changed

+1022
-1352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1022
-1352
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ properties:
3939
- qcom,scm-msm8996
4040
- qcom,scm-msm8998
4141
- qcom,scm-qdu1000
42+
- qcom,scm-sa8775p
4243
- qcom,scm-sc7180
4344
- qcom,scm-sc7280
4445
- qcom,scm-sc8280xp
@@ -54,6 +55,7 @@ properties:
5455
- qcom,scm-sm8250
5556
- qcom,scm-sm8350
5657
- qcom,scm-sm8450
58+
- qcom,scm-sm8550
5759
- qcom,scm-qcs404
5860
- const: qcom,scm
5961

@@ -165,6 +167,7 @@ allOf:
165167
contains:
166168
enum:
167169
- qcom,scm-sm8450
170+
- qcom,scm-sm8550
168171
then:
169172
properties:
170173
interconnects: false
@@ -177,6 +180,7 @@ allOf:
177180
contains:
178181
enum:
179182
- qcom,scm-sm8450
183+
- qcom,scm-sm8550
180184
then:
181185
properties:
182186
interrupts: false

‎Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/soc/qcom/qcom,pmic-glink.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm PMIC GLINK firmware interface for battery management, USB
8+
Type-C and other things.
9+
10+
maintainers:
11+
- Bjorn Andersson <[email protected]>
12+
13+
description:
14+
The PMIC GLINK service, running on a coprocessor on some modern Qualcomm
15+
platforms and implement USB Type-C handling and battery management. This
16+
binding describes the component in the OS used to communicate with the
17+
firmware and connect it's resources to those described in the Devicetree,
18+
particularly the USB Type-C controllers relationship with USB and DisplayPort
19+
components.
20+
21+
properties:
22+
compatible:
23+
items:
24+
- enum:
25+
- qcom,sc8180x-pmic-glink
26+
- qcom,sc8280xp-pmic-glink
27+
- qcom,sm8350-pmic-glink
28+
- const: qcom,pmic-glink
29+
30+
'#address-cells':
31+
const: 1
32+
33+
'#size-cells':
34+
const: 0
35+
36+
patternProperties:
37+
'^connector@\d$':
38+
$ref: /schemas/connector/usb-connector.yaml#
39+
40+
properties:
41+
reg: true
42+
43+
required:
44+
- reg
45+
46+
unevaluatedProperties: false
47+
48+
required:
49+
- compatible
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |+
55+
pmic-glink {
56+
compatible = "qcom,sc8280xp-pmic-glink", "qcom,pmic-glink";
57+
58+
#address-cells = <1>;
59+
#size-cells = <0>;
60+
61+
connector@0 {
62+
compatible = "usb-c-connector";
63+
reg = <0>;
64+
power-role = "dual";
65+
data-role = "dual";
66+
67+
ports {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
71+
port@0 {
72+
reg = <0>;
73+
endpoint {
74+
remote-endpoint = <&usb_role>;
75+
};
76+
};
77+
78+
port@1 {
79+
reg = <1>;
80+
endpoint {
81+
remote-endpoint = <&ss_phy_out>;
82+
};
83+
};
84+
85+
port@2 {
86+
reg = <2>;
87+
endpoint {
88+
remote-endpoint = <&sbu_mux>;
89+
};
90+
};
91+
};
92+
};
93+
};
94+
...
95+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ properties:
112112
$ref: /schemas/power/qcom,rpmpd.yaml#
113113

114114
patternProperties:
115-
'-regulators$':
115+
'^regulators(-[0-9])?$':
116116
$ref: /schemas/regulator/qcom,rpmh-regulator.yaml#
117+
unevaluatedProperties: false
117118

118119
required:
119120
- compatible

‎MAINTAINERS

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5821,14 +5821,6 @@ W: http://lists.twibble.org/mailman/listinfo/dc395x/
58215821
F: Documentation/scsi/dc395x.rst
58225822
F: drivers/scsi/dc395x.*
58235823

5824-
DCC QTI DRIVER
5825-
M: Souradeep Chowdhury <[email protected]>
5826-
L: [email protected]
5827-
S: Maintained
5828-
F: Documentation/ABI/testing/debugfs-driver-dcc
5829-
F: Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml
5830-
F: drivers/soc/qcom/dcc.c
5831-
58325824
DCCP PROTOCOL
58335825
L: [email protected]
58345826
S: Orphan
@@ -17263,7 +17255,8 @@ F: drivers/clk/qcom/
1726317255
F: include/dt-bindings/clock/qcom,*
1726417256

1726517257
QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
17266-
M: Niklas Cassel <[email protected]>
17258+
M: Bjorn Andersson <[email protected]>
17259+
M: Konrad Dybcio <[email protected]>
1726717260
L: [email protected]
1726817261
L: [email protected]
1726917262
S: Maintained

‎arch/arm/mach-qcom/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <linux/of_address.h>
1515
#include <linux/smp.h>
1616
#include <linux/io.h>
17-
#include <linux/qcom_scm.h>
17+
#include <linux/firmware/qcom/qcom_scm.h>
1818

1919
#include <asm/smp_plat.h>
2020

‎drivers/cpuidle/cpuidle-qcom-spm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <linux/platform_device.h>
1818
#include <linux/cpuidle.h>
1919
#include <linux/cpu_pm.h>
20-
#include <linux/qcom_scm.h>
20+
#include <linux/firmware/qcom/qcom_scm.h>
2121
#include <soc/qcom/spm.h>
2222

2323
#include <asm/proc-fns.h>

‎drivers/firmware/qcom_scm-legacy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/mutex.h>
1010
#include <linux/errno.h>
1111
#include <linux/err.h>
12-
#include <linux/qcom_scm.h>
12+
#include <linux/firmware/qcom/qcom_scm.h>
1313
#include <linux/arm-smccc.h>
1414
#include <linux/dma-mapping.h>
1515

‎drivers/firmware/qcom_scm-smc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <linux/mutex.h>
99
#include <linux/slab.h>
1010
#include <linux/types.h>
11-
#include <linux/qcom_scm.h>
11+
#include <linux/firmware/qcom/qcom_scm.h>
1212
#include <linux/arm-smccc.h>
1313
#include <linux/dma-mapping.h>
1414

‎drivers/firmware/qcom_scm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/interconnect.h>
1313
#include <linux/module.h>
1414
#include <linux/types.h>
15-
#include <linux/qcom_scm.h>
15+
#include <linux/firmware/qcom/qcom_scm.h>
1616
#include <linux/of.h>
1717
#include <linux/of_address.h>
1818
#include <linux/of_irq.h>

‎drivers/gpu/drm/msm/adreno/a5xx_gpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <linux/kernel.h>
66
#include <linux/types.h>
77
#include <linux/cpumask.h>
8-
#include <linux/qcom_scm.h>
8+
#include <linux/firmware/qcom/qcom_scm.h>
99
#include <linux/pm_opp.h>
1010
#include <linux/nvmem-consumer.h>
1111
#include <linux/slab.h>

0 commit comments

Comments
 (0)