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

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.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/configs/multi_v7_defconfig
index ec1d9f0,0a55240..3823da6
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -520,8 -515,8 +520,9 @@@ CONFIG_ARMADA_THERMAL=
  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
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y