Merge tag 'tegra-for-5.12-arm-defconfig' of...

Merge tag 'tegra-for-5.12-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig

ARM: tegra: Default configuration changes for v5.12-rc1

Enables the Tegra SoC thermal driver on 32-bit platforms such as
Tegra124.

* tag 'tegra-for-5.12-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: config: Enable Tegra SoC Thermal driver

Link: https://lore.kernel.org/r/20210129193254.3610492-4-thierry.reding@gmail.comSigned-off-by: Arnd Bergmann <arnd@arndb.de>

arch/arm/configs/multi_v7_defconfig

@@ -521,6 +521,7 @@ CONFIG_BCM2711_THERMAL=m
 CONFIG_BCM2835_THERMAL=m
 CONFIG_BRCMSTB_THERMAL=m
 CONFIG_ST_THERMAL_MEMMAP=y
+CONFIG_TEGRA_SOCTHERM=m
 CONFIG_UNIPHIER_THERMAL=y
 CONFIG_DA9063_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=y

arch/arm/configs/tegra_defconfig

@@ -167,6 +167,7 @@ CONFIG_SENSORS_LM95245=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_CPU_THERMAL=y
+CONFIG_TEGRA_SOCTHERM=m
 CONFIG_WATCHDOG=y
 CONFIG_MAX77620_WATCHDOG=y
 CONFIG_TEGRA_WATCHDOG=y