diff options
| author | Olof Johansson | 2020-02-11 14:49:14 -0800 |
|---|---|---|
| committer | Olof Johansson | 2020-02-11 14:49:15 -0800 |
| commit | a9541fb7ed8eb112a32772d3c2dad57b355d66b0 (patch) | |
| tree | 17534de29669b159d4a65db52ae3c108ce7e3ecd /arch | |
| parent | 0eaa9fc1d7f4d36fdf5e32808a412a55d08e7ace (diff) | |
| parent | 415ae604d4ac0c0f4e1ecd79f42891b9ca69cf70 (diff) | |
Merge tag 'sunxi-config-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
One patch to enable the new thermal sensor driver found on newer
Allwinner SoCs.
* tag 'sunxi-config-for-5.6-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: sunxi: Enable CONFIG_SUN8I_THERMAL
Link: https://lore.kernel.org/r/9d9805ea-cfe3-4eed-b977-1933a670ba7b.lettre@localhost
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/sunxi_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 3f5d727efc41..e9fb57374b9f 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -85,6 +85,7 @@ CONFIG_BATTERY_AXP20X=y CONFIG_AXP20X_POWER=y CONFIG_THERMAL=y CONFIG_CPU_THERMAL=y +CONFIG_SUN8I_THERMAL=y CONFIG_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y CONFIG_MFD_AC100=y |