Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Feb 2021 16:48:04 +0000 (17:48 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Feb 2021 16:48:04 +0000 (17:48 +0100)
commit02bb4cb4c463bcf656d1d2c20ee8a41ff5a09da8
tree3e677a6e815a9d5ea58a59f0adaeae032db3e2b8
parent638f79778d4fe79adc7d3ee72ae367982db51759
parent9073f694efd8733b0e7c97d3396d81161bd05582
Merge tag 'amlogic-dt' of git://git./linux/kernel/git/khilman/linux-amlogic into arm/dt

ARM: dts: amlogic updates for v5.12
- add thermal zones with cooling configuration

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson8b: add the thermal-zones with cooling configuration
  ARM: dts: meson8: add the thermal-zones with cooling configuration
  ARM: dts: meson: add the ADC thermal sensor to meson.dtsi
  ARM: dts: meson: move iio-hwmon for the SoC temperature to meson.dtsi

Link: https://lore.kernel.org/r/7ho8h12bto.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>