diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 10:16:09 -0700 |
| commit | 378e853f68e9a9548c64687880715ac3cca31c22 (patch) | |
| tree | 7ede3af6a1da3223e13321d9453a57c48ac5372f /drivers/thermal/qcom/tsens-v0_1.c | |
| parent | f58c356ea74feef8c2bb774dd19ded91567a5cf2 (diff) | |
| parent | ca657468a0d4bcc25445f6636485a19a525267bd (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal SoC fix from Eduardo Valentin:
"A single revert, detected to cause issues on the tsens driver"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
Revert "drivers: thermal: tsens: Add new operation to check if a sensor is enabled"
Diffstat (limited to 'drivers/thermal/qcom/tsens-v0_1.c')
| -rw-r--r-- | drivers/thermal/qcom/tsens-v0_1.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c index a319283c223f..6f26fadf4c27 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -334,7 +334,6 @@ static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = { /* CTRL_OFFSET */ [TSENS_EN] = REG_FIELD(SROT_CTRL_OFF, 0, 0), [TSENS_SW_RST] = REG_FIELD(SROT_CTRL_OFF, 1, 1), - [SENSOR_EN] = REG_FIELD(SROT_CTRL_OFF, 3, 13), /* ----- TM ------ */ /* INTERRUPT ENABLE */ |