diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-27 11:11:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-27 11:11:17 -0700 |
| commit | 9eb23c9218aac6ff4b5c2e660638a47c03f2c978 (patch) | |
| tree | f4368560d7b74d94fe64028ead84ba9963cd3182 /arch/arm/configs | |
| parent | 9f0f10117228b73ec657aab8f303c9ae88fda070 (diff) | |
| parent | 6234ca670d5703ee4d22042e974657c57fe8364b (diff) | |
| download | linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.tar.gz linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.tar.bz2 linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.zip | |
Merge tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc2
Merge "Keystone SOC updates part2 for 3.16" from Santosh Shilimkar:
- Removal of now un-necessary reset machine code
- dts updates for keystone reset driver
* tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: configs: keystone: enable reset driver support
ARM: dts: keystone: update reset node to work with reset driver
ARM: keystone: remove redundant reset stuff
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 07b43277ccd3..dc0da3f455e5 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -132,6 +132,9 @@ CONFIG_SPI=y CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y # CONFIG_HWMON is not set +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_KEYSTONE=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y CONFIG_DAVINCI_WATCHDOG=y |