diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-19 09:49:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-19 09:49:35 +1100 |
| commit | bfb85bf35d009aefcedb97322b46ffa345809161 (patch) | |
| tree | 9bd2f5cf7ea05cf975c6bcda8b8656fe0e5ceb74 /arch/arm/boot | |
| parent | 1b8a54631263deeb0ba0afb9870f686265aad411 (diff) | |
| parent | e20395ba18ee8dafe1e1d737e86a221344fe3802 (diff) | |
| download | linux-next-bfb85bf35d009aefcedb97322b46ffa345809161.tar.gz | |
Merge remote-tracking branch 'qcom/for-next'
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8974.dtsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi index aba159d5a95a..c3470f9ec747 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -427,11 +427,13 @@ }; }; - tsens: thermal-sensor@fc4a8000 { + tsens: thermal-sensor@fc4a9000 { compatible = "qcom,msm8974-tsens"; - reg = <0xfc4a8000 0x2000>; + reg = <0xfc4a9000 0x1000>, /* TM */ + <0xfc4a8000 0x1000>; /* SROT */ nvmem-cells = <&tsens_calib>, <&tsens_backup>; nvmem-cell-names = "calib", "calib_backup"; + #qcom,sensors = <11>; #thermal-sensor-cells = <1>; }; |