Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 15:33:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: tm2-touchkey - add support for midas touchkey

Browse Source 
The touchkey on midas boards is almost identical.
The only real difference is that it uses the same register for both
keycode and base.

Signed-off-by: Simon Shields <simon@lineageos.org>
Signed-off-by: Paweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Simon Shields 2019-01-07 11:09:26 -08:00 committed by Dmitry Torokhov
parent e9eb788f94
commit d6f66f6185
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt
View File

@ -1,7 +1,9 @@
Samsung tm2-touchkey Samsung tm2-touchkey
Required properties: Required properties:
- compatible: must be "cypress,tm2-touchkey" - compatible:
* "cypress,tm2-touchkey" - for the touchkey found on the tm2 board
* "cypress,midas-touchkey" - for the touchkey found on midas boards
- reg: I2C address of the chip. - reg: I2C address of the chip.
- interrupt-parent: a phandle for the interrupt controller (see interrupt - interrupt-parent: a phandle for the interrupt controller (see interrupt
binding[0]). binding[0]).

34
drivers/input/keyboard/tm2-touchkey.c
View File

@ -22,12 +22,12 @@
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#define TM2_TOUCHKEY_DEV_NAME "tm2-touchkey" #define TM2_TOUCHKEY_DEV_NAME "tm2-touchkey"
#define TM2_TOUCHKEY_KEYCODE_REG 0x03
#define TM2_TOUCHKEY_BASE_REG 0x00
#define TM2_TOUCHKEY_CMD_LED_ON 0x10 #define TM2_TOUCHKEY_CMD_LED_ON 0x10
#define TM2_TOUCHKEY_CMD_LED_OFF 0x20 #define TM2_TOUCHKEY_CMD_LED_OFF 0x20
#define TM2_TOUCHKEY_BIT_PRESS_EV BIT(3) #define TM2_TOUCHKEY_BIT_PRESS_EV BIT(3)
@ -40,12 +40,28 @@ enum {
TM2_TOUCHKEY_KEY_BACK, TM2_TOUCHKEY_KEY_BACK,
}; };
struct touchkey_variant {
u8 keycode_reg;
u8 base_reg;
};
struct tm2_touchkey_data { struct tm2_touchkey_data {
struct i2c_client *client; struct i2c_client *client;
struct input_dev *input_dev; struct input_dev *input_dev;
struct led_classdev led_dev; struct led_classdev led_dev;
struct regulator *vdd; struct regulator *vdd;
struct regulator_bulk_data regulators[2]; struct regulator_bulk_data regulators[2];
const struct touchkey_variant *variant;
};
static const struct touchkey_variant tm2_touchkey_variant = {
.keycode_reg = 0x03,
.base_reg = 0x00,
};
static const struct touchkey_variant midas_touchkey_variant = {
.keycode_reg = 0x00,
.base_reg = 0x00,
}; };
static void tm2_touchkey_led_brightness_set(struct led_classdev *led_dev, static void tm2_touchkey_led_brightness_set(struct led_classdev *led_dev,
@ -66,7 +82,7 @@ static void tm2_touchkey_led_brightness_set(struct led_classdev *led_dev,
regulator_set_voltage(touchkey->vdd, volt, volt); regulator_set_voltage(touchkey->vdd, volt, volt);
i2c_smbus_write_byte_data(touchkey->client, i2c_smbus_write_byte_data(touchkey->client,
TM2_TOUCHKEY_BASE_REG, data); touchkey->variant->base_reg, data);
} }
static int tm2_touchkey_power_enable(struct tm2_touchkey_data *touchkey) static int tm2_touchkey_power_enable(struct tm2_touchkey_data *touchkey)
@ -99,7 +115,7 @@ static irqreturn_t tm2_touchkey_irq_handler(int irq, void *devid)
int key; int key;
data = i2c_smbus_read_byte_data(touchkey->client, data = i2c_smbus_read_byte_data(touchkey->client,
TM2_TOUCHKEY_KEYCODE_REG); touchkey->variant->keycode_reg);
if (data < 0) { if (data < 0) {
dev_err(&touchkey->client->dev, dev_err(&touchkey->client->dev,
"failed to read i2c data: %d\n", data); "failed to read i2c data: %d\n", data);
@ -153,6 +169,8 @@ static int tm2_touchkey_probe(struct i2c_client *client,
touchkey->client = client; touchkey->client = client;
i2c_set_clientdata(client, touchkey); i2c_set_clientdata(client, touchkey);
touchkey->variant = of_device_get_match_data(&client->dev);
touchkey->regulators[0].supply = "vcc"; touchkey->regulators[0].supply = "vcc";
touchkey->regulators[1].supply = "vdd"; touchkey->regulators[1].supply = "vdd";
error = devm_regulator_bulk_get(&client->dev, error = devm_regulator_bulk_get(&client->dev,
@ -262,7 +280,13 @@ static const struct i2c_device_id tm2_touchkey_id_table[] = {
MODULE_DEVICE_TABLE(i2c, tm2_touchkey_id_table); MODULE_DEVICE_TABLE(i2c, tm2_touchkey_id_table);
static const struct of_device_id tm2_touchkey_of_match[] = { static const struct of_device_id tm2_touchkey_of_match[] = {
{ .compatible = "cypress,tm2-touchkey", }, {
.compatible = "cypress,tm2-touchkey",
.data = &tm2_touchkey_variant,
}, {
.compatible = "cypress,midas-touchkey",
.data = &midas_touchkey_variant,
},
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, tm2_touchkey_of_match); MODULE_DEVICE_TABLE(of, tm2_touchkey_of_match);