diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:52:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-08 09:52:41 -0800 |
| commit | 9f24a81e2e5daf8820c8654afcd8512e797c41f2 (patch) | |
| tree | f23d098e3dcf544db3a7846ae2d95870f112da39 /drivers/thermal/Kconfig | |
| parent | 564e741171e92aaf095db403c5e9ed3b160e27e9 (diff) | |
| parent | 6269e9f790e8d442b3e1529bf3b3de452dd4ac92 (diff) | |
| download | linux-9f24a81e2e5daf8820c8654afcd8512e797c41f2.tar.bz2 | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal soc updates from Eduardo Valentin:
"Specifics:
- mediatek thermal now supports MT8183
- broadcom thermal now supports Stingray
- qoirq now supports multiple sensors
- fixes on different drivers: rcar, tsens, tegra
Some new drivers are still pending further review and I chose to leave
them for the next merge window while still sending this material"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
thermal: rcar_gen3_thermal: Register hwmon sysfs interface
thermal/qcom/tsens-common : fix possible object reference leak
thermal: tegra: add get_trend ops
thermal: tegra: fix memory allocation
thermal: tegra: remove unnecessary warnings
thermal: mediatek: add support for MT8183
dt-bindings: thermal: add binding document for mt8183 thermal controller
thermal: mediatek: add flag for bank selection
thermal: mediatek: add thermal controller offset
thermal: mediatek: add calibration item
thermal: mediatek: add common index of vts settings.
thermal: mediatek: fix register index error
thermal: qoriq: add multiple sensors support
thermal: broadcom: Add Stingray thermal driver
dt-bindings: thermal: Add binding document for SR thermal
Diffstat (limited to 'drivers/thermal/Kconfig')
| -rw-r--r-- | drivers/thermal/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 58bb7d72dc2b..653aa27a25a4 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -344,7 +344,8 @@ source "drivers/thermal/intel/Kconfig" endmenu menu "Broadcom thermal drivers" -depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || COMPILE_TEST +depends on ARCH_BCM || ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM_IPROC || \ + COMPILE_TEST source "drivers/thermal/broadcom/Kconfig" endmenu |