aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-10-12 21:27:07 -0400
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-11-16 22:46:30 -0500
commit5ea5f2550e0e638d481e856f4b612c1c6a204e83 (patch)
tree6b60765b384c6c57c0f749ee0646a10cae43f986
parent4894d4110639053139b54ce4b19263dba920de96 (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_defconfig6
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
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_MAX8997_HAPTIC=m
255CONFIG_INPUT_MPU3050=y 256CONFIG_INPUT_MPU3050=y
256CONFIG_INPUT_AXP20X_PEK=y 257CONFIG_INPUT_AXP20X_PEK=y
257CONFIG_INPUT_ADXL34X=m 258CONFIG_INPUT_ADXL34X=m
@@ -365,6 +366,7 @@ CONFIG_BATTERY_MAX17040=m
365CONFIG_BATTERY_MAX17042=m 366CONFIG_BATTERY_MAX17042=m
366CONFIG_CHARGER_MAX14577=m 367CONFIG_CHARGER_MAX14577=m
367CONFIG_CHARGER_MAX77693=m 368CONFIG_CHARGER_MAX77693=m
369CONFIG_CHARGER_MAX8997=m
368CONFIG_CHARGER_TPS65090=y 370CONFIG_CHARGER_TPS65090=y
369CONFIG_POWER_RESET_AS3722=y 371CONFIG_POWER_RESET_AS3722=y
370CONFIG_POWER_RESET_GPIO=y 372CONFIG_POWER_RESET_GPIO=y
@@ -404,6 +406,7 @@ CONFIG_MFD_MAX14577=y
404CONFIG_MFD_MAX77686=y 406CONFIG_MFD_MAX77686=y
405CONFIG_MFD_MAX77693=y 407CONFIG_MFD_MAX77693=y
406CONFIG_MFD_MAX8907=y 408CONFIG_MFD_MAX8907=y
409CONFIG_MFD_MAX8997=y
407CONFIG_MFD_RK808=y 410CONFIG_MFD_RK808=y
408CONFIG_MFD_PM8921_CORE=y 411CONFIG_MFD_PM8921_CORE=y
409CONFIG_MFD_QCOM_RPM=y 412CONFIG_MFD_QCOM_RPM=y
@@ -428,6 +431,7 @@ CONFIG_POWER_RESET_SYSCON=y
428CONFIG_REGULATOR_MAX14577=m 431CONFIG_REGULATOR_MAX14577=m
429CONFIG_REGULATOR_MAX8907=y 432CONFIG_REGULATOR_MAX8907=y
430CONFIG_REGULATOR_MAX8973=y 433CONFIG_REGULATOR_MAX8973=y
434CONFIG_REGULATOR_MAX8997=m
431CONFIG_REGULATOR_MAX77686=y 435CONFIG_REGULATOR_MAX77686=y
432CONFIG_REGULATOR_MAX77693=m 436CONFIG_REGULATOR_MAX77693=m
433CONFIG_REGULATOR_MAX77802=m 437CONFIG_REGULATOR_MAX77802=m
@@ -581,6 +585,7 @@ CONFIG_NEW_LEDS=y
581CONFIG_LEDS_CLASS=y 585CONFIG_LEDS_CLASS=y
582CONFIG_LEDS_GPIO=y 586CONFIG_LEDS_GPIO=y
583CONFIG_LEDS_PWM=y 587CONFIG_LEDS_PWM=y
588CONFIG_LEDS_MAX8997=m
584CONFIG_LEDS_TRIGGERS=y 589CONFIG_LEDS_TRIGGERS=y
585CONFIG_LEDS_TRIGGER_TIMER=y 590CONFIG_LEDS_TRIGGER_TIMER=y
586CONFIG_LEDS_TRIGGER_ONESHOT=y 591CONFIG_LEDS_TRIGGER_ONESHOT=y
@@ -600,6 +605,7 @@ CONFIG_RTC_DRV_AS3722=y
600CONFIG_RTC_DRV_DS1307=y 605CONFIG_RTC_DRV_DS1307=y
601CONFIG_RTC_DRV_HYM8563=m 606CONFIG_RTC_DRV_HYM8563=m
602CONFIG_RTC_DRV_MAX8907=y 607CONFIG_RTC_DRV_MAX8907=y
608CONFIG_RTC_DRV_MAX8997=m
603CONFIG_RTC_DRV_MAX77686=y 609CONFIG_RTC_DRV_MAX77686=y
604CONFIG_RTC_DRV_RK808=m 610CONFIG_RTC_DRV_RK808=m
605CONFIG_RTC_DRV_MAX77802=m 611CONFIG_RTC_DRV_MAX77802=m