aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-10-12 21:27:08 -0400
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-11-16 22:46:35 -0500
commitd122ab40bec8debce6f0c315eb88e0ae705c7e78 (patch)
tree089fac615613911d24d3c4288c7d28b243bc6bd4
parent5ea5f2550e0e638d481e856f4b612c1c6a204e83 (diff)
ARM: multi_v7_defconfig: Enable Maxim 77693 LED and haptic drivers
Enable support for: 1. Haptic motor driver on Trats2 board (Maxim 77693) and Note 4 (Maxim 77843); 2. LED driver on Trats2 board (Maxim 77693). Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
-rw-r--r--arch/arm/configs/multi_v7_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 009c2cc8fb96..65c46359e614 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -252,6 +252,7 @@ CONFIG_TOUCHSCREEN_STMPE=y
252CONFIG_TOUCHSCREEN_SUN4I=y 252CONFIG_TOUCHSCREEN_SUN4I=y
253CONFIG_TOUCHSCREEN_WM97XX=m 253CONFIG_TOUCHSCREEN_WM97XX=m
254CONFIG_INPUT_MISC=y 254CONFIG_INPUT_MISC=y
255CONFIG_INPUT_MAX77693_HAPTIC=m
255CONFIG_INPUT_MAX8997_HAPTIC=m 256CONFIG_INPUT_MAX8997_HAPTIC=m
256CONFIG_INPUT_MPU3050=y 257CONFIG_INPUT_MPU3050=y
257CONFIG_INPUT_AXP20X_PEK=y 258CONFIG_INPUT_AXP20X_PEK=y
@@ -583,8 +584,10 @@ CONFIG_MMC_SH_MMCIF=y
583CONFIG_MMC_SUNXI=y 584CONFIG_MMC_SUNXI=y
584CONFIG_NEW_LEDS=y 585CONFIG_NEW_LEDS=y
585CONFIG_LEDS_CLASS=y 586CONFIG_LEDS_CLASS=y
587CONFIG_LEDS_CLASS_FLASH=m
586CONFIG_LEDS_GPIO=y 588CONFIG_LEDS_GPIO=y
587CONFIG_LEDS_PWM=y 589CONFIG_LEDS_PWM=y
590CONFIG_LEDS_MAX77693=m
588CONFIG_LEDS_MAX8997=m 591CONFIG_LEDS_MAX8997=m
589CONFIG_LEDS_TRIGGERS=y 592CONFIG_LEDS_TRIGGERS=y
590CONFIG_LEDS_TRIGGER_TIMER=y 593CONFIG_LEDS_TRIGGER_TIMER=y