Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: edt-ft5x06 - add support to update ev-ft5726 registers

Currently only the threshold and gain parameters can be read.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Marco Felsch and committed by
Dmitry Torokhov
2ebc1919 a2f39dac

+15 -5
+15 -5
drivers/input/touchscreen/edt-ft5x06.c
··· 353 353 u8 limit_high; 354 354 u8 addr_m06; 355 355 u8 addr_m09; 356 + u8 addr_ev; 356 357 }; 357 358 358 - #define EDT_ATTR(_field, _mode, _addr_m06, _addr_m09, \ 359 + #define EDT_ATTR(_field, _mode, _addr_m06, _addr_m09, _addr_ev, \ 359 360 _limit_low, _limit_high) \ 360 361 struct edt_ft5x06_attribute edt_ft5x06_attr_##_field = { \ 361 362 .dattr = __ATTR(_field, _mode, \ ··· 365 364 .field_offset = offsetof(struct edt_ft5x06_ts_data, _field), \ 366 365 .addr_m06 = _addr_m06, \ 367 366 .addr_m09 = _addr_m09, \ 367 + .addr_ev = _addr_ev, \ 368 368 .limit_low = _limit_low, \ 369 369 .limit_high = _limit_high, \ 370 370 } ··· 400 398 case EDT_M12: 401 399 case GENERIC_FT: 402 400 addr = attr->addr_m09; 401 + break; 402 + 403 + case EV_FT: 404 + addr = attr->addr_ev; 403 405 break; 404 406 405 407 default: ··· 477 471 addr = attr->addr_m09; 478 472 break; 479 473 474 + case EV_FT: 475 + addr = attr->addr_ev; 476 + break; 477 + 480 478 default: 481 479 error = -ENODEV; 482 480 goto out; ··· 504 494 505 495 /* m06, m09: range 0-31, m12: range 0-5 */ 506 496 static EDT_ATTR(gain, S_IWUSR | S_IRUGO, WORK_REGISTER_GAIN, 507 - M09_REGISTER_GAIN, 0, 31); 497 + M09_REGISTER_GAIN, EV_REGISTER_GAIN, 0, 31); 508 498 /* m06, m09: range 0-31, m12: range 0-16 */ 509 499 static EDT_ATTR(offset, S_IWUSR | S_IRUGO, WORK_REGISTER_OFFSET, 510 - M09_REGISTER_OFFSET, 0, 31); 500 + M09_REGISTER_OFFSET, NO_REGISTER, 0, 31); 511 501 /* m06: range 20 to 80, m09: range 0 to 30, m12: range 1 to 255... */ 512 502 static EDT_ATTR(threshold, S_IWUSR | S_IRUGO, WORK_REGISTER_THRESHOLD, 513 - M09_REGISTER_THRESHOLD, 0, 255); 503 + M09_REGISTER_THRESHOLD, EV_REGISTER_THRESHOLD, 0, 255); 514 504 /* m06: range 3 to 14, m12: (0x64: 100Hz) */ 515 505 static EDT_ATTR(report_rate, S_IWUSR | S_IRUGO, WORK_REGISTER_REPORT_RATE, 516 - NO_REGISTER, 0, 255); 506 + NO_REGISTER, NO_REGISTER, 0, 255); 517 507 518 508 static struct attribute *edt_ft5x06_attrs[] = { 519 509 &edt_ft5x06_attr_gain.dattr.attr,