diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-02-04 22:00:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-04 22:00:17 +0100 |
| commit | f7d62396798cac36dc1ea530afc3e560f52ce327 (patch) | |
| tree | c795679af8adee6b74ccc1067ac4652ed45ea901 /arch/arm/configs/multi_v7_defconfig | |
| parent | Merge tag 'v5.11-next-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/defconfig (diff) | |
| parent | ARM: multi_v7_defconfig: Enable support for the ADC thermal sensor (diff) | |
| download | linux-dev-f7d62396798cac36dc1ea530afc3e560f52ce327.tar.xz linux-dev-f7d62396798cac36dc1ea530afc3e560f52ce327.zip | |
Merge tag 'amlogic-soc' of git://git.kernel.org/pub/scm/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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index ec1d9f00a734..3823da605430 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -520,6 +520,7 @@ CONFIG_ARMADA_THERMAL=y 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 |