Input: mpr121 - improve sensibility of touch key

The Quick Charge bit in Electrode conf register should be set in init
function. This bit was missed in chip's document, which may cause touch
controller charge too slow to generate an interrupt.

Also, adjust the default vlaue of touch and release threshold
to make touch key more sensitive, this fix touch may not sensitive
after setup with plastic case.

Signed-off-by: Jiejing Zhang <jiejing.zhang@freescale.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/input/keyboard/mpr121_touchkey.c b/drivers/input/keyboard/mpr121_touchkey.c
index 0a9e81194888..1c1615d9a7f9 100644
--- a/drivers/input/keyboard/mpr121_touchkey.c
+++ b/drivers/input/keyboard/mpr121_touchkey.c
@@ -43,14 +43,15 @@
  * enabled capacitance sensing inputs and its run/suspend mode.
  */
 #define ELECTRODE_CONF_ADDR             0x5e
+#define ELECTRODE_CONF_QUICK_CHARGE     0x80
 #define AUTO_CONFIG_CTRL_ADDR           0x7b
 #define AUTO_CONFIG_USL_ADDR            0x7d
 #define AUTO_CONFIG_LSL_ADDR            0x7e
 #define AUTO_CONFIG_TL_ADDR             0x7f
 
 /* Threshold of touch/release trigger */
-#define TOUCH_THRESHOLD                 0x0f
-#define RELEASE_THRESHOLD               0x0a
+#define TOUCH_THRESHOLD                 0x08
+#define RELEASE_THRESHOLD               0x05
 /* Masks for touch and release triggers */
 #define TOUCH_STATUS_MASK               0xfff
 /* MPR121 has 12 keys */
@@ -127,7 +128,7 @@ static int __devinit mpr121_phys_init(const struct mpr121_platform_data *pdata,
                                       struct i2c_client *client)
 {
         const struct mpr121_init_register *reg;
-        unsigned char usl, lsl, tl;
+        unsigned char usl, lsl, tl, eleconf;
         int i, t, vdd, ret;
 
         /* Set up touch/release threshold for ele0-ele11 */
@@ -163,8 +164,15 @@ static int __devinit mpr121_phys_init(const struct mpr121_platform_data *pdata,
         ret = i2c_smbus_write_byte_data(client, AUTO_CONFIG_USL_ADDR, usl);
         ret |= i2c_smbus_write_byte_data(client, AUTO_CONFIG_LSL_ADDR, lsl);
         ret |= i2c_smbus_write_byte_data(client, AUTO_CONFIG_TL_ADDR, tl);
+
+        /*
+         * Quick charge bit will let the capacitive charge to ready
+         * state quickly, or the buttons may not function after system
+         * boot.
+         */
+        eleconf = mpr121->keycount | ELECTRODE_CONF_QUICK_CHARGE;
         ret |= i2c_smbus_write_byte_data(client, ELECTRODE_CONF_ADDR,
-                                         mpr121->keycount);
+                                         eleconf);
         if (ret != 0)
                 goto err_i2c_write;