diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-10-12 21:27:07 -0400 |
---|---|---|
committer | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-11-16 22:46:30 -0500 |
commit | 5ea5f2550e0e638d481e856f4b612c1c6a204e83 (patch) | |
tree | 6b60765b384c6c57c0f749ee0646a10cae43f986 | |
parent | 4894d4110639053139b54ce4b19263dba920de96 (diff) |
ARM: multi_v7_defconfig: Enable Maxim 8997 family drivers
Enable support for Maxim 8997 Multi Function Device present on Trats and
Origen boards by toggling on drivers: main MFD, charger, haptic motor,
regulator, LED and RTC.
This allows to test and usage of these boards with multi_v7 config.
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_defconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 69a22fdb52a5..009c2cc8fb96 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -252,6 +252,7 @@ CONFIG_TOUCHSCREEN_STMPE=y | |||
252 | CONFIG_TOUCHSCREEN_SUN4I=y | 252 | CONFIG_TOUCHSCREEN_SUN4I=y |
253 | CONFIG_TOUCHSCREEN_WM97XX=m | 253 | CONFIG_TOUCHSCREEN_WM97XX=m |
254 | CONFIG_INPUT_MISC=y | 254 | CONFIG_INPUT_MISC=y |
255 | CONFIG_INPUT_MAX8997_HAPTIC=m | ||
255 | CONFIG_INPUT_MPU3050=y | 256 | CONFIG_INPUT_MPU3050=y |
256 | CONFIG_INPUT_AXP20X_PEK=y | 257 | CONFIG_INPUT_AXP20X_PEK=y |
257 | CONFIG_INPUT_ADXL34X=m | 258 | CONFIG_INPUT_ADXL34X=m |
@@ -365,6 +366,7 @@ CONFIG_BATTERY_MAX17040=m | |||
365 | CONFIG_BATTERY_MAX17042=m | 366 | CONFIG_BATTERY_MAX17042=m |
366 | CONFIG_CHARGER_MAX14577=m | 367 | CONFIG_CHARGER_MAX14577=m |
367 | CONFIG_CHARGER_MAX77693=m | 368 | CONFIG_CHARGER_MAX77693=m |
369 | CONFIG_CHARGER_MAX8997=m | ||
368 | CONFIG_CHARGER_TPS65090=y | 370 | CONFIG_CHARGER_TPS65090=y |
369 | CONFIG_POWER_RESET_AS3722=y | 371 | CONFIG_POWER_RESET_AS3722=y |
370 | CONFIG_POWER_RESET_GPIO=y | 372 | CONFIG_POWER_RESET_GPIO=y |
@@ -404,6 +406,7 @@ CONFIG_MFD_MAX14577=y | |||
404 | CONFIG_MFD_MAX77686=y | 406 | CONFIG_MFD_MAX77686=y |
405 | CONFIG_MFD_MAX77693=y | 407 | CONFIG_MFD_MAX77693=y |
406 | CONFIG_MFD_MAX8907=y | 408 | CONFIG_MFD_MAX8907=y |
409 | CONFIG_MFD_MAX8997=y | ||
407 | CONFIG_MFD_RK808=y | 410 | CONFIG_MFD_RK808=y |
408 | CONFIG_MFD_PM8921_CORE=y | 411 | CONFIG_MFD_PM8921_CORE=y |
409 | CONFIG_MFD_QCOM_RPM=y | 412 | CONFIG_MFD_QCOM_RPM=y |
@@ -428,6 +431,7 @@ CONFIG_POWER_RESET_SYSCON=y | |||
428 | CONFIG_REGULATOR_MAX14577=m | 431 | CONFIG_REGULATOR_MAX14577=m |
429 | CONFIG_REGULATOR_MAX8907=y | 432 | CONFIG_REGULATOR_MAX8907=y |
430 | CONFIG_REGULATOR_MAX8973=y | 433 | CONFIG_REGULATOR_MAX8973=y |
434 | CONFIG_REGULATOR_MAX8997=m | ||
431 | CONFIG_REGULATOR_MAX77686=y | 435 | CONFIG_REGULATOR_MAX77686=y |
432 | CONFIG_REGULATOR_MAX77693=m | 436 | CONFIG_REGULATOR_MAX77693=m |
433 | CONFIG_REGULATOR_MAX77802=m | 437 | CONFIG_REGULATOR_MAX77802=m |
@@ -581,6 +585,7 @@ CONFIG_NEW_LEDS=y | |||
581 | CONFIG_LEDS_CLASS=y | 585 | CONFIG_LEDS_CLASS=y |
582 | CONFIG_LEDS_GPIO=y | 586 | CONFIG_LEDS_GPIO=y |
583 | CONFIG_LEDS_PWM=y | 587 | CONFIG_LEDS_PWM=y |
588 | CONFIG_LEDS_MAX8997=m | ||
584 | CONFIG_LEDS_TRIGGERS=y | 589 | CONFIG_LEDS_TRIGGERS=y |
585 | CONFIG_LEDS_TRIGGER_TIMER=y | 590 | CONFIG_LEDS_TRIGGER_TIMER=y |
586 | CONFIG_LEDS_TRIGGER_ONESHOT=y | 591 | CONFIG_LEDS_TRIGGER_ONESHOT=y |
@@ -600,6 +605,7 @@ CONFIG_RTC_DRV_AS3722=y | |||
600 | CONFIG_RTC_DRV_DS1307=y | 605 | CONFIG_RTC_DRV_DS1307=y |
601 | CONFIG_RTC_DRV_HYM8563=m | 606 | CONFIG_RTC_DRV_HYM8563=m |
602 | CONFIG_RTC_DRV_MAX8907=y | 607 | CONFIG_RTC_DRV_MAX8907=y |
608 | CONFIG_RTC_DRV_MAX8997=m | ||
603 | CONFIG_RTC_DRV_MAX77686=y | 609 | CONFIG_RTC_DRV_MAX77686=y |
604 | CONFIG_RTC_DRV_RK808=m | 610 | CONFIG_RTC_DRV_RK808=m |
605 | CONFIG_RTC_DRV_MAX77802=m | 611 | CONFIG_RTC_DRV_MAX77802=m |