diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-29 11:20:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-29 11:20:15 -0700 |
| commit | a18b94fe05a311bf084cb235c0904c48eb04149f (patch) | |
| tree | 6f74a5e352c33d7f84f11af81c24269bc3eb9523 | |
| parent | e84d273d9054295a8a9a9366f9aade9823b7b8a3 (diff) | |
| parent | 32efa3cf2b847f2140d411eb3b15d34f2d941369 (diff) | |
Merge "ARM: dts: msm: Update TSENS sensor ID for MSMCOBALT"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 7f5f81eff9e5..75629891aa76 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -2191,7 +2191,9 @@ reg-names = "tsens_physical"; interrupts = <0 458 0>, <0 445 0>; interrupt-names = "tsens-upper-lower", "tsens-critical"; - qcom,sensors = <14>; + qcom,client-id = <0 1 2 3 4 7 8 9 10 11 12 13>; + qcom,sensor-id = <0 1 2 3 4 7 8 9 10 11 12 13>; + qcom,sensors = <12>; }; tsens1: tsens@10ad000 { @@ -2232,16 +2234,6 @@ qcom,sensor-name = "tsens_tz_sensor4"; qcom,scaling-factor = <10>; }; - sensor_information5: qcom,sensor-information-5 { - qcom,sensor-type = "tsens"; - qcom,sensor-name = "tsens_tz_sensor5"; - qcom,scaling-factor = <10>; - }; - sensor_information6: qcom,sensor-information-6 { - qcom,sensor-type = "tsens"; - qcom,sensor-name = "tsens_tz_sensor6"; - qcom,scaling-factor = <10>; - }; sensor_information7: qcom,sensor-information-7 { qcom,sensor-type = "tsens"; qcom,sensor-name = "tsens_tz_sensor7"; |