Skip to content

Commit 9eb33dd

Browse files
committed
Merge tag 'qcom-drivers-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers
Qualcomm driver updates for v6.6 Compatible and clock handling in the Qualcomm SCM driver is cleaned up, together with a couple stylistic cleanups and transition to mark exported symbols GPL only. An abstraction for the RPM subsystem is introduced, to make align the structure of the SMD and GLINK nodes thereof with the structure when a remoteproc is involved. This is done to facilitate associating additional entities with the RPM subsystem. The qmp_send() API is modified to not expose hardware requirements onto the client drivers, and then further extended to allow command formatting directly in the API, to facilitate this typical use case. In the Qualcomm Command DB driver, NUL characters previously included in identifiers are dropped from the debugfs, to facilitate scripting. The thresholds of the BWMON driver are simplified to avoid hard coded starting values. The OCMEM driver is updated with some cleanups and fixes, and addition of MSM8226 support. PMIC_GLINK gains support for retimer switches, safe mode is selected when the cable is disconnected from altmode and the same is enabled for SM8550. An off-by-one string length check is corrected in the QMI encoder decoder library. The RPMh tracepoints are extended to include the state of the request, to provide needed context in the traced events. The series from Ulf creating a genpd framework is integrated, to facilitate the other changes to the cpr, rpmpd and rpmhpd driver. SDX75 support is added to the rpmhpd driver, and the rpmpd driver is extended with the same sync_state logic found in the rpmhpd driver. The socinfo driver gains knowledge about SM4450 and SM7125, the IPQ5019 platform is dropped. Clock handling in the GSBI driver is cleaned up with the use of devm_clk_get_enabled(). The list of VMIDs defined for the SCM assign memory interface is extended. * tag 'qcom-drivers-for-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (52 commits) soc: qcom: aoss: Tidy up qmp_send() callers soc: qcom: aoss: Format string in qmp_send() soc: qcom: aoss: Move length requirements from caller dt-bindings: firmware: qcom: scm: Updating VMID list dt-bindings: qcom: Update RPMHPD entries for some SoCs soc: qcom: qmi_encdec: Restrict string length in decode soc: qcom: smem: Fix incompatible types in comparison soc: qcom: ocmem: add missing clk_disable_unprepare() in ocmem_dev_probe() soc: qcom: socinfo: Add SoC ID for SM7125 dt-bindings: arm: qcom,ids: Add SoC ID for SM7125 dt-bindings: arm: qcom,ids: drop the IPQ5019 SoC ID soc: qcom: socinfo: drop the IPQ5019 SoC ID soc: qcom: socinfo: add SM4450 ID dt-bindings: arm: qcom,ids: add SoC ID for SM4450 soc: qcom: pmic_glink: enable altmode for SM8550 soc: qcom: pmic_glink_altmode: add retimer-switch support soc: qcom: pmic_glink_altmode: handle safe mode when disconnect soc: qcom: rpmhpd: Add SDX75 power domains dt-bindings: power: qcom,rpmpd: Add compatible for sdx75 genpd: Makefile: build imx ... Link: https://lore.kernel.org/r/20230818023338.2484467-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d4692f6 + b4f63bb commit 9eb33dd

Some content is hidden

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

60 files changed

+741
-374
lines changed

Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ additionalProperties: false
8282
examples:
8383
- |
8484
#include <dt-bindings/clock/qcom,rpmh.h>
85-
#include <dt-bindings/power/qcom-rpmpd.h>
85+
#include <dt-bindings/power/qcom,rpmhpd.h>
8686
clock-controller@af00000 {
8787
compatible = "qcom,sm8250-dispcc";
8888
reg = <0x0af00000 0x10000>;
@@ -103,7 +103,7 @@ examples:
103103
#clock-cells = <1>;
104104
#reset-cells = <1>;
105105
#power-domain-cells = <1>;
106-
power-domains = <&rpmhpd SM8250_MMCX>;
106+
power-domains = <&rpmhpd RPMHPD_MMCX>;
107107
required-opps = <&rpmhpd_opp_low_svs>;
108108
};
109109
...

Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ unevaluatedProperties: false
5151
examples:
5252
- |
5353
#include <dt-bindings/clock/qcom,rpmh.h>
54-
#include <dt-bindings/power/qcom-rpmpd.h>
54+
#include <dt-bindings/power/qcom,rpmhpd.h>
5555
5656
clock-controller@abf0000 {
5757
compatible = "qcom,sm8350-videocc";
5858
reg = <0x0abf0000 0x10000>;
5959
clocks = <&rpmhcc RPMH_CXO_CLK>,
6060
<&rpmhcc RPMH_CXO_CLK_A>,
6161
<&sleep_clk>;
62-
power-domains = <&rpmhpd SM8350_MMCX>;
62+
power-domains = <&rpmhpd RPMHPD_MMCX>;
6363
required-opps = <&rpmhpd_opp_low_svs>;
6464
#clock-cells = <1>;
6565
#reset-cells = <1>;

Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ examples:
6464
- |
6565
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
6666
#include <dt-bindings/clock/qcom,rpmh.h>
67-
#include <dt-bindings/power/qcom-rpmpd.h>
67+
#include <dt-bindings/power/qcom,rpmhpd.h>
6868
clock-controller@ade0000 {
6969
compatible = "qcom,sm8450-camcc";
7070
reg = <0xade0000 0x20000>;
7171
clocks = <&gcc GCC_CAMERA_AHB_CLK>,
7272
<&rpmhcc RPMH_CXO_CLK>,
7373
<&rpmhcc RPMH_CXO_CLK_A>,
7474
<&sleep_clk>;
75-
power-domains = <&rpmhpd SM8450_MMCX>;
75+
power-domains = <&rpmhpd RPMHPD_MMCX>;
7676
required-opps = <&rpmhpd_opp_low_svs>;
7777
#clock-cells = <1>;
7878
#reset-cells = <1>;

Documentation/devicetree/bindings/clock/qcom,sm8450-dispcc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ examples:
7676
- |
7777
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
7878
#include <dt-bindings/clock/qcom,rpmh.h>
79-
#include <dt-bindings/power/qcom-rpmpd.h>
79+
#include <dt-bindings/power/qcom,rpmhpd.h>
8080
clock-controller@af00000 {
8181
compatible = "qcom,sm8450-dispcc";
8282
reg = <0x0af00000 0x10000>;
@@ -91,7 +91,7 @@ examples:
9191
#clock-cells = <1>;
9292
#reset-cells = <1>;
9393
#power-domain-cells = <1>;
94-
power-domains = <&rpmhpd SM8450_MMCX>;
94+
power-domains = <&rpmhpd RPMHPD_MMCX>;
9595
required-opps = <&rpmhpd_opp_low_svs>;
9696
};
9797
...

Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ examples:
6464
- |
6565
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
6666
#include <dt-bindings/clock/qcom,rpmh.h>
67-
#include <dt-bindings/power/qcom-rpmpd.h>
67+
#include <dt-bindings/power/qcom,rpmhpd.h>
6868
videocc: clock-controller@aaf0000 {
6969
compatible = "qcom,sm8450-videocc";
7070
reg = <0x0aaf0000 0x10000>;
7171
clocks = <&rpmhcc RPMH_CXO_CLK>,
7272
<&gcc GCC_VIDEO_AHB_CLK>;
73-
power-domains = <&rpmhpd SM8450_MMCX>;
73+
power-domains = <&rpmhpd RPMHPD_MMCX>;
7474
required-opps = <&rpmhpd_opp_low_svs>;
7575
#clock-cells = <1>;
7676
#reset-cells = <1>;

Documentation/devicetree/bindings/clock/qcom,sm8550-dispcc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ examples:
7676
- |
7777
#include <dt-bindings/clock/qcom,sm8550-gcc.h>
7878
#include <dt-bindings/clock/qcom,rpmh.h>
79-
#include <dt-bindings/power/qcom-rpmpd.h>
79+
#include <dt-bindings/power/qcom,rpmhpd.h>
8080
clock-controller@af00000 {
8181
compatible = "qcom,sm8550-dispcc";
8282
reg = <0x0af00000 0x10000>;
@@ -99,7 +99,7 @@ examples:
9999
#clock-cells = <1>;
100100
#reset-cells = <1>;
101101
#power-domain-cells = <1>;
102-
power-domains = <&rpmhpd SM8550_MMCX>;
102+
power-domains = <&rpmhpd RPMHPD_MMCX>;
103103
required-opps = <&rpmhpd_opp_low_svs>;
104104
};
105105
...

Documentation/devicetree/bindings/clock/qcom,videocc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ additionalProperties: false
124124
examples:
125125
- |
126126
#include <dt-bindings/clock/qcom,rpmh.h>
127-
#include <dt-bindings/power/qcom-rpmpd.h>
127+
#include <dt-bindings/power/qcom,rpmhpd.h>
128128
clock-controller@ab00000 {
129129
compatible = "qcom,sdm845-videocc";
130130
reg = <0x0ab00000 0x10000>;
@@ -133,7 +133,7 @@ examples:
133133
#clock-cells = <1>;
134134
#reset-cells = <1>;
135135
#power-domain-cells = <1>;
136-
power-domains = <&rpmhpd SM8250_MMCX>;
136+
power-domains = <&rpmhpd RPMHPD_MMCX>;
137137
required-opps = <&rpmhpd_opp_low_svs>;
138138
};
139139
...

Documentation/devicetree/bindings/display/msm/qcom,sm8250-dpu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ examples:
5454
#include <dt-bindings/clock/qcom,gcc-sm8250.h>
5555
#include <dt-bindings/interrupt-controller/arm-gic.h>
5656
#include <dt-bindings/interconnect/qcom,sm8250.h>
57-
#include <dt-bindings/power/qcom-rpmpd.h>
57+
#include <dt-bindings/power/qcom,rpmhpd.h>
5858
5959
display-controller@ae01000 {
6060
compatible = "qcom,sm8250-dpu";
@@ -72,7 +72,7 @@ examples:
7272
assigned-clock-rates = <19200000>;
7373
7474
operating-points-v2 = <&mdp_opp_table>;
75-
power-domains = <&rpmhpd SM8250_MMCX>;
75+
power-domains = <&rpmhpd RPMHPD_MMCX>;
7676
7777
interrupt-parent = <&mdss>;
7878
interrupts = <0>;

Documentation/devicetree/bindings/display/msm/qcom,sm8250-mdss.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ examples:
7676
#include <dt-bindings/clock/qcom,rpmh.h>
7777
#include <dt-bindings/interrupt-controller/arm-gic.h>
7878
#include <dt-bindings/interconnect/qcom,sm8250.h>
79-
#include <dt-bindings/power/qcom-rpmpd.h>
79+
#include <dt-bindings/power/qcom,rpmhpd.h>
8080
8181
display-subsystem@ae00000 {
8282
compatible = "qcom,sm8250-mdss";
@@ -121,7 +121,7 @@ examples:
121121
assigned-clock-rates = <19200000>;
122122
123123
operating-points-v2 = <&mdp_opp_table>;
124-
power-domains = <&rpmhpd SM8250_MMCX>;
124+
power-domains = <&rpmhpd RPMHPD_MMCX>;
125125
126126
interrupt-parent = <&mdss>;
127127
interrupts = <0>;
@@ -196,7 +196,7 @@ examples:
196196
assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
197197
198198
operating-points-v2 = <&dsi_opp_table>;
199-
power-domains = <&rpmhpd SM8250_MMCX>;
199+
power-domains = <&rpmhpd RPMHPD_MMCX>;
200200
201201
phys = <&dsi0_phy>;
202202
phy-names = "dsi";
@@ -286,7 +286,7 @@ examples:
286286
assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
287287
288288
operating-points-v2 = <&dsi_opp_table>;
289-
power-domains = <&rpmhpd SM8250_MMCX>;
289+
power-domains = <&rpmhpd RPMHPD_MMCX>;
290290
291291
phys = <&dsi1_phy>;
292292
phy-names = "dsi";

Documentation/devicetree/bindings/display/msm/qcom,sm8350-dpu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ examples:
5151
#include <dt-bindings/clock/qcom,gcc-sm8350.h>
5252
#include <dt-bindings/interrupt-controller/arm-gic.h>
5353
#include <dt-bindings/interconnect/qcom,sm8350.h>
54-
#include <dt-bindings/power/qcom-rpmpd.h>
54+
#include <dt-bindings/power/qcom,rpmhpd.h>
5555
5656
display-controller@ae01000 {
5757
compatible = "qcom,sm8350-dpu";
@@ -76,7 +76,7 @@ examples:
7676
assigned-clock-rates = <19200000>;
7777
7878
operating-points-v2 = <&mdp_opp_table>;
79-
power-domains = <&rpmhpd SM8350_MMCX>;
79+
power-domains = <&rpmhpd RPMHPD_MMCX>;
8080
8181
interrupt-parent = <&mdss>;
8282
interrupts = <0>;

0 commit comments

Comments
 (0)