diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 18:23:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-20 18:23:15 -0800 |
| commit | 56bf6fc266ca14d2b9276c8a62e4ff6783bfe68b (patch) | |
| tree | cce1e40eca71a9b688969e6a5584eef63e8a6609 /arch/arm/configs/tegra_defconfig | |
| parent | 5011bb9fbb194834dd04ae6c986d439032ecc717 (diff) | |
| parent | 21e4675d9305f6ccd20b95d943882d607c8ae288 (diff) | |
Merge tag 'arm-defconfig-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Arnd Bergmann:
"As usual, a number of additional device drivers that were added to the
kernel are now enabled in the respective configuration files.
A few of the files get updated to match the current Kconfig files for
removed or renamed options"
* tag 'arm-defconfig-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (50 commits)
ARM: configs: sama5_defconfig: add QSPI driver
ARM: configs: at91_dt_defconfig: add ov7740 module
ARM: configs: at91_dt_defconfig: add useful helper options
ARM: configs: at91: DT/ATAG defconfig modifications
ARM: configs: sama5_defconfig: update and remove unneeded options
ARM: configs: at91: enable drivers for sam9x60
arm64: defconfig: Enable RT5659
arm64: configs: Support DEVAPC on MediaTek platforms
arm64: configs: Support pwrap on Mediatek MT6779 platform
arm64: defconfig: Enable PF8x00 as builtin
ARM: multi_v7_defconfig: add STM32 CEC support
arm64: defconfig: Enable vibra-pwm
ARM: omap2plus_defconfig: Update for dropped options
ARM: omap2plus_defconfig: Update for moved options
ARM: multi_v7_defconfig: Enable nvmem's rmem driver
arm64: defconfig: Enable nvmem's rmem driver
ARM: multi_v7_defconfig: Enable support for the ADC thermal sensor
ARM: qcom_defconfig: Enable Command DB driver
ARM: qcom_defconfig: Enable RPMh power domain driver
ARM: qcom_defconfig: Enable ARM PSCI support
...
Diffstat (limited to 'arch/arm/configs/tegra_defconfig')
| -rw-r--r-- | arch/arm/configs/tegra_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 |