From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Ranostay Subject: [PATCH v2 2/2] cap1106: support for irq-active-high option Date: Mon, 22 Sep 2014 21:04:17 -0700 Message-ID: <1411445057-30048-3-git-send-email-mranostay@gmail.com> References: <1411445057-30048-1-git-send-email-mranostay@gmail.com> Return-path: In-Reply-To: <1411445057-30048-1-git-send-email-mranostay@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: galak@codeaurora.org, dmitry.torokhov@gmail.com, zonque@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, Matt Ranostay List-Id: linux-input@vger.kernel.org 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 --- Documentation/devicetree/bindings/input/cap1106.txt | 4 ++++ drivers/input/keyboard/cap1106.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/input/cap1106.txt b/Documentation/devicetree/bindings/input/cap1106.txt index 4b46390..6f5a143 100644 --- a/Documentation/devicetree/bindings/input/cap1106.txt +++ b/Documentation/devicetree/bindings/input/cap1106.txt @@ -26,6 +26,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/cap1106.c b/drivers/input/keyboard/cap1106.c index 07f9e88..d5ce060 100644 --- a/drivers/input/keyboard/cap1106.c +++ b/drivers/input/keyboard/cap1106.c @@ -47,6 +47,7 @@ #define CAP1106_REG_STANDBY_SENSITIVITY 0x42 #define CAP1106_REG_STANDBY_THRESH 0x43 #define CAP1106_REG_CONFIG2 0x44 +#define CAP1106_REG_CONFIG2_ALT_POL BIT(6) #define CAP1106_REG_SENSOR_BASE_CNT(X) (0x50 + (X)) #define CAP1106_REG_SENSOR_CALIB (0xb1 + (X)) #define CAP1106_REG_SENSOR_CALIB_LSB1 0xb9 @@ -260,6 +261,13 @@ static int cap1106_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, CAP1106_REG_CONFIG2, + CAP1106_REG_CONFIG2_ALT_POL, 0); + if (error) + return error; + } + /* Provide some useful defaults */ for (i = 0; i < priv->num_channels; i++) priv->keycodes[i] = KEY_A + i; -- 1.9.1