diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-01-30 12:05:26 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-01-30 12:05:27 +0100 |
| commit | 69e39bf1668e69ea5e1a15ac97d7dc11c367b791 (patch) | |
| tree | a2a7f2346de9beae9fbbc92c8d61b523256c3311 /arch | |
| parent | f1f9580527705906e2af90f06c0c2025479fc412 (diff) | |
| parent | 760f9c2b84106fd02de701c964e7989c9802791b (diff) | |
| download | linux-69e39bf1668e69ea5e1a15ac97d7dc11c367b791.tar.bz2 | |
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.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 89198d50a5ed..c12b28cd470d 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/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 diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 74739a52a8ad..46c73263ed41 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/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 |