aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-03-30 17:44:46 +0200
committerArnd Bergmann <arnd@arndb.de>2017-03-30 17:44:46 +0200
commit6b0eb184939e015c4d9a38965c13f2a4bddb44ec (patch)
tree60c1c8fb2484dccb97445a82bfd6de0f18f27d56
parentMAINTAINERS: Broadcom Vulcan is now Cavium ThunderX2 (diff)
parentARM64: defconfig: enable the leds-pwm driver and default-on trigger (diff)
downloadlinux-dev-6b0eb184939e015c4d9a38965c13f2a4bddb44ec.tar.xz
linux-dev-6b0eb184939e015c4d9a38965c13f2a4bddb44ec.zip
Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/arm64
Pull "Amlogic: defconfig changes for v4.12" from Kevin Hilman: - enable PWM LEDs and LEDs default-on trigger * tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: defconfig: enable the leds-pwm driver and default-on trigger
-rw-r--r--arch/arm64/configs/defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 95aa53112da5..b653c4305922 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -402,8 +402,10 @@ CONFIG_MMC_SUNXI=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
CONFIG_LEDS_SYSCON=y
CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_RTC_CLASS=y