2 files changed, 12 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/input/cap11xx.txt b/Documentation/devicetree/bindings/input/cap11xx.txt
index 61d20d8d97e2..7d0a3009771b 100644
--- a/Documentation/devicetree/bindings/input/cap11xx.txt
+++ b/Documentation/devicetree/bindings/input/cap11xx.txt
@@ -28,6 +28,10 @@ Optional properties:
                                 Valid values are 1, 2, 4, and 8.
                                 By default, a gain of 1 is set.
 
+        microchip,irq-active-high:      By default the interrupt pin is active low
+                                open drain. This property allows using the active
+                                high push-pull output.
+
         linux,keycodes:         Specifies an array of numeric keycode values to
                                 be used for the channels. If this property is
                                 omitted, KEY_A, KEY_B, etc are used as
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 @@
 #define CAP11XX_REG_STANDBY_SENSITIVITY 0x42
 #define CAP11XX_REG_STANDBY_THRESH      0x43
 #define CAP11XX_REG_CONFIG2             0x44
+#define CAP11XX_REG_CONFIG2_ALT_POL     BIT(6)
 #define CAP11XX_REG_SENSOR_BASE_CNT(X)  (0x50 + (X))
 #define CAP11XX_REG_SENSOR_CALIB        (0xb1 + (X))
 #define CAP11XX_REG_SENSOR_CALIB_LSB1   0xb9
@@ -263,6 +264,13 @@ static int cap11xx_i2c_probe(struct i2c_client *i2c_client,
                         dev_err(dev, "Invalid sensor-gain value %d\n", gain32);
         }
 
+        if (of_property_read_bool(node, "microchip,irq-active-high")) {
+                error = regmap_update_bits(priv->regmap, CAP11XX_REG_CONFIG2,
+                                           CAP11XX_REG_CONFIG2_ALT_POL, 0);
+                if (error)
+                        return error;
+        }
+
         /* Provide some useful defaults */
         for (i = 0; i < cap->num_channels; i++)
                 priv->keycodes[i] = KEY_A + i;