diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 19:16:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-02 19:16:09 +0200 |
| commit | 378e853f68e9a9548c64687880715ac3cca31c22 (patch) | |
| tree | 7ede3af6a1da3223e13321d9453a57c48ac5372f /drivers/thermal/qcom/tsens-v2.c | |
| parent | Merge tag 'led-fixes-for-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Revert "drivers: thermal: tsens: Add new operation to check if a sensor is en... (diff) | |
| download | linux-378e853f68e9a9548c64687880715ac3cca31c22.tar.xz linux-378e853f68e9a9548c64687880715ac3cca31c22.zip | |
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-v2.c')
| -rw-r--r-- | drivers/thermal/qcom/tsens-v2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 1099069f2aa3..0a4f2b8fcab6 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -44,7 +44,6 @@ static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { /* CTRL_OFF */ [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, 18), /* ----- TM ------ */ /* INTERRUPT ENABLE */ |