summary refs log tree commit diff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-01-29 21:04:16 -0800
committerOlof Johansson <olof@lixom.net>2017-01-29 21:04:16 -0800
commit14463a0453f0af579c61acf550bd52158015da32 (patch)
tree77c5b985aba495b99b1dc8a4af1d4dbc140f66b9 /arch/arm/configs
parent4e15a5057b76a5537d05f8d1a26a20fdabc61f02 (diff)
parent770e96f30cc2e4a363dd8fae2e9028173b1f2af1 (diff)
downloadlinux-14463a0453f0af579c61acf550bd52158015da32.tar.gz
Merge tag 'stm32-defconfig-for-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.11, round 1.

Highlights:
----------
 - Enable ADC
 - Enable RTC

* tag 'stm32-defconfig-for-v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: configs: stm32: Add RTC support in STM32 defconfig
  ARM: configs: stm32: enable ADC driver

Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/stm32_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig
index 5a72d694662f..a9d8e3c9b487 100644
--- a/arch/arm/configs/stm32_defconfig
+++ b/arch/arm/configs/stm32_defconfig
@@ -48,14 +48,21 @@ CONFIG_SERIAL_STM32=y
 CONFIG_SERIAL_STM32_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_STM32=y
 CONFIG_DMADEVICES=y
 CONFIG_STM32_DMA=y
+CONFIG_IIO=y
+CONFIG_STM32_ADC_CORE=y
+CONFIG_STM32_ADC=y
 # CONFIG_FILE_LOCKING is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set