diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 18:03:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 18:03:13 +0300 |
| commit | 5a010a5648e5551b5b89e1a349ce1f164f656f0a (patch) | |
| tree | d13291a43e52c5833aec999f9e8c8f13799c0794 /arch/arm/configs | |
| parent | 62a295bd823aa726e1bf1626385bd274a2b7b65c (diff) | |
| parent | 35ba26772c827dbfc03be8adc3af8ff0d294b38f (diff) | |
| download | linux-5a010a5648e5551b5b89e1a349ce1f164f656f0a.tar.xz | |
Merge tag 'davinci-for-v4.17/defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
Pull "DaVinci defconfig updates for v4.17" from Sekhar Nori:
Enable SYSCON_REBOOT_MODE needed for Lego EV3 and build the DaVinci
watchdog driver in so reboot works even when modules are not loaded.
* tag 'davinci-for-v4.17/defconfig' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y
ARM: davinci_all_defconfig: enable SYSCON_REBOOT_MODE
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 026154c1d55a..c302a04e8cbc 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -126,9 +126,10 @@ CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y +CONFIG_SYSCON_REBOOT_MODE=m CONFIG_BATTERY_LEGO_EV3=m CONFIG_WATCHDOG=y -CONFIG_DAVINCI_WATCHDOG=m +CONFIG_DAVINCI_WATCHDOG=y CONFIG_MFD_DM355EVM_MSP=y CONFIG_TPS6507X=y CONFIG_REGULATOR=y |