Skip to content

lemans: Fix duplicate cdsp_sw cooling device #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmantre wants to merge 3 commits into
base: qcom-6.18.y
Choose a base branch
from
+10 −2
Open

lemans: Fix duplicate cdsp_sw cooling device #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
865b526
FROMLIST: dt-bindings: thermal: qcom,qmi-cooling: Add qcom,qmi-coolin…
dmantre Aug 12, 2026
1dce6da
FROMLIST: soc: qcom: qmi-cooling: Add CDSP1 support
dmantre Aug 12, 2026
efe2237
FROMLIST: arm64: dts: qcom: lemans: Fix duplicate cdsp_sw cooling
dmantre Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Documentation/devicetree/bindings/thermal/qcom,qmi-cooling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ properties:
enum:
- qcom,qmi-cooling-modem
- qcom,qmi-cooling-cdsp
- qcom,qmi-cooling-cdsp1

vdd:
$ref: "#/definitions/tmd"
Expand All @@ -60,7 +61,9 @@ allOf:
properties:
compatible:
contains:
const: qcom,qmi-cooling-cdsp
enum:
- qcom,qmi-cooling-cdsp
- qcom,qmi-cooling-cdsp1
then:
properties:
cdsp_sw:
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/qcom/lemans.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7797,7 +7797,7 @@


cooling {
compatible = "qcom,qmi-cooling-cdsp";
compatible = "qcom,qmi-cooling-cdsp1";
cdsp_sw1: cdsp_sw {
label = "cdsp_sw";
#cooling-cells = <2>;
Expand Down
5 changes: 5 additions & 0 deletions drivers/soc/qcom/qmi-cooling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#define MODEM0_INSTANCE_ID 0x0
#define ADSP_INSTANCE_ID 0x1
#define CDSP_INSTANCE_ID 0x43
#define CDSP1_INSTANCE_ID 0x44
#define SLPI_INSTANCE_ID 0x53

#define QMI_TMD_RESP_TIMEOUT msecs_to_jiffies(100)
Expand Down Expand Up @@ -480,6 +481,10 @@ static const struct of_device_id qmi_tmd_device_table[] = {
.compatible = "qcom,qmi-cooling-cdsp",
.data = &((struct qmi_instance_data) { CDSP_INSTANCE_ID, "cdsp" }),
},
{
.compatible = "qcom,qmi-cooling-cdsp1",
.data = &((struct qmi_instance_data) { CDSP1_INSTANCE_ID, "cdsp1" }),
},
{}
};
MODULE_DEVICE_TABLE(of, qmi_tmd_device_table);
Expand Down