summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-10-30 11:00:01 +0100
committerArnd Bergmann <arnd@arndb.de>2017-10-30 11:00:01 +0100
commit4ba845dad9b90ca9137cdfec3d61cb8c7002f033 (patch)
tree320ceb40b080eab8bc5afc39a31a54600565b7cf /arch/arm/configs
parent0a02a25856cd05492c748aa15b7fa60941d524e3 (diff)
parentfc88a0631ed0f5b1862d42fb8f2455bf3d18744b (diff)
Merge tag 'keystone_config_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
Pull "ARM: Keystone config update for 4.15" from Santosh Shilimkar: ARM: Enable PWM driver config * tag 'keystone_config_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: configs: keystone: Enable TIECAP PWM driver
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/keystone_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index f907869e0ddc..f710c192b33a 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -189,6 +189,8 @@ CONFIG_KEYSTONE_NAVIGATOR_DMA=y
CONFIG_TI_SCI_PM_DOMAINS=y
CONFIG_MEMORY=y
CONFIG_TI_AEMIF=y
+CONFIG_PWM=y
+CONFIG_PWM_TIECAP=m
CONFIG_KEYSTONE_IRQ=y
CONFIG_RESET_TI_SCI=m
CONFIG_RESET_TI_SYSCON=m