summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-08-31 18:18:36 +0900
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:47:51 +0900
commit77b31536beca385315b9e39f6693a925fc32074c (patch)
tree01dd272f222985af14ed39114550c8c8e1bf977d /arch/arm
parentd6e35bfa01f40453921fd08f864f78925deb9760 (diff)
downloadlinux-exynos-77b31536beca385315b9e39f6693a925fc32074c.tar.gz
linux-exynos-77b31536beca385315b9e39f6693a925fc32074c.tar.bz2
linux-exynos-77b31536beca385315b9e39f6693a925fc32074c.zip
LOCAL / ARM: defconfig: Enable MAX77693 charger and haptic on Trats2
Enable the Maxim 77693 charger and input/haptic drivers in Trats2 defconfig. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/tizen_trats2_defconfig33
1 files changed, 30 insertions, 3 deletions
diff --git a/arch/arm/configs/tizen_trats2_defconfig b/arch/arm/configs/tizen_trats2_defconfig
index 779ab5e917b2..f98f2b1f6768 100644
--- a/arch/arm/configs/tizen_trats2_defconfig
+++ b/arch/arm/configs/tizen_trats2_defconfig
@@ -1513,7 +1513,7 @@ CONFIG_BRCMFMAC_SDIO=y
# Input device support
#
CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=y
# CONFIG_INPUT_POLLDEV is not set
# CONFIG_INPUT_SPARSEKMAP is not set
CONFIG_INPUT_MATRIXKMAP=y
@@ -1605,7 +1605,34 @@ CONFIG_TOUCHSCREEN_MMS114=y
# CONFIG_TOUCHSCREEN_TPS6507X is not set
# CONFIG_TOUCHSCREEN_ZFORCE is not set
# CONFIG_TOUCHSCREEN_FTS is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_AD714X is not set
+# CONFIG_INPUT_BMA150 is not set
+# CONFIG_INPUT_E3X0_BUTTON is not set
+CONFIG_INPUT_MAX77693_HAPTIC=y
+# CONFIG_INPUT_MAX8997_HAPTIC is not set
+# CONFIG_INPUT_MMA8450 is not set
+# CONFIG_INPUT_MPU3050 is not set
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_KXTJ9 is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+# CONFIG_INPUT_REGULATOR_HAPTIC is not set
+# CONFIG_INPUT_UINPUT is not set
+# CONFIG_INPUT_PCF8574 is not set
+# CONFIG_INPUT_PWM_BEEPER is not set
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_IMS_PCU is not set
+# CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
+# CONFIG_INPUT_DRV260X_HAPTICS is not set
+# CONFIG_INPUT_DRV2667_HAPTICS is not set
#
# Hardware I/O ports
@@ -1876,7 +1903,7 @@ CONFIG_BATTERY_MAX17042=y
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
CONFIG_CHARGER_MANAGER=y
-# CONFIG_CHARGER_MAX77693 is not set
+CONFIG_CHARGER_MAX77693=y
CONFIG_CHARGER_MAX8997=y
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set