Merge tag 'amlogic-soc' of...

Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/defconfig

ARM: multi_v7_defconfig: amlogic updtes for v5.12
- enable support for the ADC thermal sensor as module

* tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: multi_v7_defconfig: Enable support for the ADC thermal sensor

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

arch/arm/configs/multi_v7_defconfig

@@ -520,6 +520,7 @@ CONFIG_ARMADA_THERMAL=y
 CONFIG_BCM2711_THERMAL=m
 CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
+CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_ST_THERMAL_MEMMAP=y
 CONFIG_TEGRA_SOCTHERM=m
 CONFIG_UNIPHIER_THERMAL=y