diff options
author | Matt Ranostay <mranostay@gmail.com> | 2014-10-31 23:02:08 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-11-02 02:09:11 -0500 |
commit | 6bdd2fd1ed6f66597f3cff75c1bb1569beec2fc9 (patch) | |
tree | 2f7bb73033c425f4762292f1cc0dcc67d8e155ea /drivers/input/keyboard | |
parent | 7609a5e973c43a647c4e40184fc8404311fdb97c (diff) |
Input: cap11xx - support for irq-active-high option
Some applications need to use the irq-active-high push-pull option.
This allows it be enabled in the device tree child node.
Signed-off-by: Matt Ranostay <mranostay@gmail.com>
Reviewed-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/cap11xx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/keyboard/cap11xx.c b/drivers/input/keyboard/cap11xx.c index eeda1f9359cd..4f59f0bab28f 100644 --- a/drivers/input/keyboard/cap11xx.c +++ b/drivers/input/keyboard/cap11xx.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #define CAP11XX_REG_STANDBY_SENSITIVITY 0x42 | 45 | #define CAP11XX_REG_STANDBY_SENSITIVITY 0x42 |
46 | #define CAP11XX_REG_STANDBY_THRESH 0x43 | 46 | #define CAP11XX_REG_STANDBY_THRESH 0x43 |
47 | #define CAP11XX_REG_CONFIG2 0x44 | 47 | #define CAP11XX_REG_CONFIG2 0x44 |
48 | #define CAP11XX_REG_CONFIG2_ALT_POL BIT(6) | ||
48 | #define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X)) | 49 | #define CAP11XX_REG_SENSOR_BASE_CNT(X) (0x50 + (X)) |
49 | #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X)) | 50 | #define CAP11XX_REG_SENSOR_CALIB (0xb1 + (X)) |
50 | #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9 | 51 | #define CAP11XX_REG_SENSOR_CALIB_LSB1 0xb9 |
@@ -263,6 +264,13 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client, | |||
263 | dev_err(dev, "Invalid sensor-gain value %d\n", gain32); | 264 | dev_err(dev, "Invalid sensor-gain value %d\n", gain32); |
264 | } | 265 | } |
265 | 266 | ||
267 | if (of_property_read_bool(node, "microchip,irq-active-high")) { | ||
268 | error = regmap_update_bits(priv->regmap, CAP11XX_REG_CONFIG2, | ||
269 | CAP11XX_REG_CONFIG2_ALT_POL, 0); | ||
270 | if (error) | ||
271 | return error; | ||
272 | } | ||
273 | |||
266 | /* Provide some useful defaults */ | 274 | /* Provide some useful defaults */ |
267 | for (i = 0; i < cap->num_channels; i++) | 275 | for (i = 0; i < cap->num_channels; i++) |
268 | priv->keycodes[i] = KEY_A + i; | 276 | priv->keycodes[i] = KEY_A + i; |