Input: atmel_mxt_ts - improve T19 GPIO keys handling
* The mapping of the GPIO numbers into the T19 status byte varies between different maXTouch chips. Some have up to 7 GPIOs. Allowing a keycode array of up to 8 items is simpler and more generic. So replace #define with configurable number of keys which also allows the removal of is_tp. * Rename platform data parameters to include "t19" to prevent confusion with T15 key array. * Probe aborts early on when pdata is NULL, so no need to check. * Move "int i" to beginning of function (mixed declarations and code) * Use API calls rather than __set_bit() * Remove unused dev variable. Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk> Acked-by: Yufeng Shen <miletus@chromium.org> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:

committed by
Dmitry Torokhov

parent
2cefdb1f0a
commit
fb5e4c3ee1
@@ -84,16 +84,22 @@ static struct i2c_board_info tsl2563_als_device = {
|
||||
I2C_BOARD_INFO("tsl2563", TAOS_ALS_I2C_ADDR),
|
||||
};
|
||||
|
||||
static int mxt_t19_keys[] = {
|
||||
KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
BTN_LEFT
|
||||
};
|
||||
|
||||
static struct mxt_platform_data atmel_224s_tp_platform_data = {
|
||||
.x_size = 102*20,
|
||||
.y_size = 68*20,
|
||||
.orient = MXT_VERTICAL_FLIP,
|
||||
.irqflags = IRQF_TRIGGER_FALLING,
|
||||
.is_tp = true,
|
||||
.key_map = { KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
KEY_RESERVED,
|
||||
BTN_LEFT },
|
||||
.t19_num_keys = ARRAY_SIZE(mxt_t19_keys),
|
||||
.t19_keymap = mxt_t19_keys,
|
||||
.config = NULL,
|
||||
.config_length = 0,
|
||||
};
|
||||
@@ -109,7 +115,6 @@ static struct mxt_platform_data atmel_1664s_platform_data = {
|
||||
.y_size = 2560,
|
||||
.orient = MXT_ROTATED_90_COUNTER,
|
||||
.irqflags = IRQF_TRIGGER_FALLING,
|
||||
.is_tp = false,
|
||||
.config = NULL,
|
||||
.config_length = 0,
|
||||
};
|
||||
|
Reference in New Issue
Block a user