diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-19 06:09:57 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-19 06:09:57 +0300 |
| commit | 35a0a5545dabb203195a4fd8ad8f379b02fa0925 (patch) | |
| tree | ff871d6e8d9a4924da5a0063e7aa9070d3802da7 /arch/arm/configs | |
| parent | c186dbe463d860fee1ce5f6b77ffd2f95e1e4168 (diff) | |
| parent | d81cd7d72f6441df759c3db7adc69f4ad8d54fc4 (diff) | |
| download | linux-35a0a5545dabb203195a4fd8ad8f379b02fa0925.tar.xz | |
Merge tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.13, round 1
Highlights:
----------
- Enable STMPE1600 IO expander
- Enable Watchdog support
* tag 'stm32-defconfig-for-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: configs: stm32: STMPE1600 GPIO expander
ARM: configs: stm32: Add watchdog support in STM32 defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/stm32_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig index a0975386a96c..90e5c46913a5 100644 --- a/arch/arm/configs/stm32_defconfig +++ b/arch/arm/configs/stm32_defconfig @@ -52,7 +52,10 @@ CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_STM32F4=y # CONFIG_HWMON is not set +CONFIG_WATCHDOG=y CONFIG_REGULATOR=y +CONFIG_GPIO_STMPE=y +CONFIG_MFD_STMPE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_USB_SUPPORT is not set CONFIG_NEW_LEDS=y |