From: Arnd Bergmann Date: Tue, 9 Feb 2021 16:48:04 +0000 (+0100) Subject: Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux... X-Git-Tag: v5.12-rc1~195^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02bb4cb4c463bcf656d1d2c20ee8a41ff5a09da8;p=thirdparty%2Fkernel%2Fstable.git Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/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 --- 02bb4cb4c463bcf656d1d2c20ee8a41ff5a09da8