aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc/Kconfig
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2015-07-30 10:36:43 +0900
committerMark Brown <broonie@kernel.org>2015-08-07 14:57:25 +0100
commit56bbc99e6914eb183fb083f737178a1757083d41 (patch)
tree165ad97939a324b04a74e9a08acf4b4999e6f959 /drivers/input/misc/Kconfig
parentInput: max77693: Prepare for adding support for Maxim 77843 (diff)
downloadlinux-dev-56bbc99e6914eb183fb083f737178a1757083d41.tar.xz
linux-dev-56bbc99e6914eb183fb083f737178a1757083d41.zip
Input: max77693: Add support for Maxim 77843
The Maxim 77843 haptic driver differs from 77693 by: 1. Setting the bias. 2. Different configuration register. 3. Not enabling the low-sys DAC. 4. Using same regmap for PMIC and haptic blocks. Incorporate all differences into max77693 haptic driver so both devices can be supported. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/input/misc/Kconfig')
-rw-r--r--drivers/input/misc/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index d4f0a817e858..f5d7a98a329d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -167,12 +167,12 @@ config INPUT_M68K_BEEP
depends on M68K
config INPUT_MAX77693_HAPTIC
- tristate "MAXIM MAX77693 haptic controller support"
- depends on MFD_MAX77693 && PWM
+ tristate "MAXIM MAX77693/MAX77843 haptic controller support"
+ depends on (MFD_MAX77693 || MFD_MAX77843) && PWM
select INPUT_FF_MEMLESS
help
This option enables support for the haptic controller on
- MAXIM MAX77693 chip.
+ MAXIM MAX77693 and MAX77843 chips.
To compile this driver as module, choose M here: the
module will be called max77693-haptic.