evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "thermal: tsens: Enable TSENS for msmfalcon"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-16 07:34:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit b10e74ee0a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/devicetree/bindings/thermal/tsens.txt
View file

@ -31,6 +31,7 @@ Required properties:
should be "qcom,msmgold-tsens" for gold TSENS driver. should be "qcom,msmgold-tsens" for gold TSENS driver.
should be "qcom,msmcobalt-tsens" for cobalt TSENS driver. should be "qcom,msmcobalt-tsens" for cobalt TSENS driver.
should be "qcom,msmhamster-tsens" for hamster TSENS driver. should be "qcom,msmhamster-tsens" for hamster TSENS driver.
should be "qcom,msmfalcon-tsens" for falcon TSENS driver.
The compatible property is used to identify the respective fusemap to use The compatible property is used to identify the respective fusemap to use
for the corresponding SoC. for the corresponding SoC.
- reg : offset and length of the TSENS registers. - reg : offset and length of the TSENS registers.

12
drivers/thermal/msm-tsens.c
View file

@ -929,6 +929,9 @@ static struct of_device_id tsens_match[] = {
{ .compatible = "qcom,msmhamster-tsens", { .compatible = "qcom,msmhamster-tsens",
.data = (void *)TSENS_CALIB_FUSE_MAP_NONE, .data = (void *)TSENS_CALIB_FUSE_MAP_NONE,
}, },
{ .compatible = "qcom,msmfalcon-tsens",
.data = (void *)TSENS_CALIB_FUSE_MAP_NONE,
},
{} {}
}; };
@ -5421,7 +5424,8 @@ static int get_device_tree_data(struct platform_device *pdev,
(!strcmp(id->compatible, "qcom,msmcobalt-tsens"))) (!strcmp(id->compatible, "qcom,msmcobalt-tsens")))
tmdev->tsens_type = TSENS_TYPE3; tmdev->tsens_type = TSENS_TYPE3;
else if (!strcmp(id->compatible, "qcom,msmtitanium-tsens") || else if (!strcmp(id->compatible, "qcom,msmtitanium-tsens") ||
(!strcmp(id->compatible, "qcom,msmhamster-tsens"))) { (!strcmp(id->compatible, "qcom,msmfalcon-tsens") ||
(!strcmp(id->compatible, "qcom,msmhamster-tsens")))) {
tmdev->tsens_type = TSENS_TYPE3; tmdev->tsens_type = TSENS_TYPE3;
tsens_poll_check = 0; tsens_poll_check = 0;
} else if (!strcmp(id->compatible, "qcom,msm8952-tsens") || } else if (!strcmp(id->compatible, "qcom,msm8952-tsens") ||
@ -5442,7 +5446,8 @@ static int get_device_tree_data(struct platform_device *pdev,
(!strcmp(id->compatible, "qcom,msm8937-tsens")) || (!strcmp(id->compatible, "qcom,msm8937-tsens")) ||
(!strcmp(id->compatible, "qcom,msmtitanium-tsens")) || (!strcmp(id->compatible, "qcom,msmtitanium-tsens")) ||
(!strcmp(id->compatible, "qcom,msmcobalt-tsens")) || (!strcmp(id->compatible, "qcom,msmcobalt-tsens")) ||
(!strcmp(id->compatible, "qcom,msmhamster-tsens"))) (!strcmp(id->compatible, "qcom,msmfalcon-tsens") ||
(!strcmp(id->compatible, "qcom,msmhamster-tsens"))))
tmdev->tsens_valid_status_check = true; tmdev->tsens_valid_status_check = true;
} }
@ -5457,7 +5462,8 @@ static int get_device_tree_data(struct platform_device *pdev,
if (!strcmp(id->compatible, "qcom,msm8996-tsens") || if (!strcmp(id->compatible, "qcom,msm8996-tsens") ||
(!strcmp(id->compatible, "qcom,msmcobalt-tsens")) || (!strcmp(id->compatible, "qcom,msmcobalt-tsens")) ||
(!strcmp(id->compatible, "qcom,msmhamster-tsens")) || (!strcmp(id->compatible, "qcom,msmhamster-tsens")) ||
(!strcmp(id->compatible, "qcom,msmtitanium-tsens"))) { (!strcmp(id->compatible, "qcom,msmfalcon-tsens") ||
(!strcmp(id->compatible, "qcom,msmtitanium-tsens")))) {
tmdev->tsens_critical_irq = tmdev->tsens_critical_irq =
platform_get_irq_byname(pdev, platform_get_irq_byname(pdev,
"tsens-critical"); "tsens-critical");