Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bdd2fd1 authored by Matt Ranostay's avatar Matt Ranostay Committed by Dmitry Torokhov
Browse files

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: default avatarMatt Ranostay <mranostay@gmail.com>
Reviewed-by: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 7609a5e9

Documentation/devicetree/bindings/input/cap11xx.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,10 @@ Optional properties: 
				Valid values are 1, 2, 4, and 8.

				Valid values are 1, 2, 4, and 8.

				By default, a gain of 1 is set.

				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

	linux,keycodes:		Specifies an array of numeric keycode values to

				be used for the channels. If this property is

				be used for the channels. If this property is

				omitted, KEY_A, KEY_B, etc are used as

				omitted, KEY_A, KEY_B, etc are used as

drivers/input/keyboard/cap11xx.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define CAP11XX_REG_STANDBY_SENSITIVITY	0x42

#define CAP11XX_REG_STANDBY_SENSITIVITY	0x42

#define CAP11XX_REG_STANDBY_THRESH	0x43

#define CAP11XX_REG_STANDBY_THRESH	0x43

#define CAP11XX_REG_CONFIG2		0x44

#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_BASE_CNT(X)	(0x50 + (X))

#define CAP11XX_REG_SENSOR_CALIB	(0xb1 + (X))

#define CAP11XX_REG_SENSOR_CALIB	(0xb1 + (X))

#define CAP11XX_REG_SENSOR_CALIB_LSB1	0xb9

#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);

			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 */

	/* Provide some useful defaults */

	for (i = 0; i < cap->num_channels; i++)

	for (i = 0; i < cap->num_channels; i++)

		priv->keycodes[i] = KEY_A + i;

		priv->keycodes[i] = KEY_A + i;