From: Arnd Bergmann Date: Thu, 4 Feb 2021 21:00:16 +0000 (+0100) Subject: Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f7d62396798cac36dc1ea530afc3e560f52ce327;p=linux.git Merge tag 'amlogic-soc' of git://git./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.com Signed-off-by: Arnd Bergmann --- f7d62396798cac36dc1ea530afc3e560f52ce327 diff --cc arch/arm/configs/multi_v7_defconfig index ec1d9f00a7342,0a55240ce2fc3..3823da605430d --- a/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