diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-22 20:17:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-22 20:17:27 -0400 |
commit | 6214a9fe2aeca5e22184b20954774424e2efc1f6 (patch) | |
tree | d541f4b12762814750038a60b04654bdb81e7cca /drivers/input | |
parent | a36cf6865120d7534fcb132d311f03e5159f2da7 (diff) | |
parent | ae2399c48c023ef8a6e0d260950420296252b3e9 (diff) |
Merge tag 'regmap-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"A small update with a couple of new APIs that are useful for some
small sets of devices:
- Split up the single_rw flagging to map read and write separately as
some devices support bulk operations for only read or only write.
- Add a write version of the noinc API.
- Clean up the code for LOG_DEVICE a bit"
* tag 'regmap-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: use less #ifdef for LOG_DEVICE
regmap: Add regmap_noinc_write API
regmap: split up regmap_config.use_single_rw
regmap: fix comment for regmap.use_single_write
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/touchscreen/tsc200x-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c index e0fde590df8e..62973ac01381 100644 --- a/drivers/input/touchscreen/tsc200x-core.c +++ b/drivers/input/touchscreen/tsc200x-core.c | |||
@@ -68,7 +68,8 @@ const struct regmap_config tsc200x_regmap_config = { | |||
68 | .read_flag_mask = TSC200X_REG_READ, | 68 | .read_flag_mask = TSC200X_REG_READ, |
69 | .write_flag_mask = TSC200X_REG_PND0, | 69 | .write_flag_mask = TSC200X_REG_PND0, |
70 | .wr_table = &tsc200x_writable_table, | 70 | .wr_table = &tsc200x_writable_table, |
71 | .use_single_rw = true, | 71 | .use_single_read = true, |
72 | .use_single_write = true, | ||
72 | }; | 73 | }; |
73 | EXPORT_SYMBOL_GPL(tsc200x_regmap_config); | 74 | EXPORT_SYMBOL_GPL(tsc200x_regmap_config); |
74 | 75 | ||