diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2015-08-21 08:26:42 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-21 16:33:10 (GMT) |
| commit | 67921a1a6660d32cc2770d05d656a1187b6d94d5 (patch) | |
| tree | 7106e1e16b5a97b7ffa38c20bbd54811b3520390 /drivers/base/regmap/regmap.c | |
| parent | c594b7f21d7d02115e828db46fddbba1da7ed1b8 (diff) | |
| download | linux-67921a1a6660d32cc2770d05d656a1187b6d94d5.tar.xz | |
regmap: Split use_single_rw internally into use_single_read/write
use_single_rw currently reflects the capabilities of the connected
device. The capabilities of the bus are currently missing for this
variable.
As there are read only and write only buses we need seperate values for
use_single_rw to also reflect tha capabilities of the bus.
This patch splits use_single_rw into use_single_read and
use_single_write. The initialization is changed to check the
configuration for use_single_rw and to check the capabilities of the
used bus.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 90bf5ea..bc82fd3 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -576,7 +576,8 @@ struct regmap *regmap_init(struct device *dev, map->reg_stride = config->reg_stride; else map->reg_stride = 1; - map->use_single_rw = config->use_single_rw; + map->use_single_read = config->use_single_rw || !bus || !bus->read; + map->use_single_write = config->use_single_rw || !bus || !bus->write; map->can_multi_write = config->can_multi_write; map->dev = dev; map->bus = bus; @@ -766,7 +767,7 @@ struct regmap *regmap_init(struct device *dev, if ((reg_endian != REGMAP_ENDIAN_BIG) || (val_endian != REGMAP_ENDIAN_BIG)) goto err_map; - map->use_single_rw = true; + map->use_single_write = true; } if (!map->format.format_write && @@ -1720,7 +1721,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, } out: map->unlock(map->lock_arg); - } else if (map->use_single_rw) { + } else if (map->use_single_write) { map->lock(map->lock_arg); for (i = 0; i < val_count; i++) { ret = _regmap_raw_write(map, @@ -2312,7 +2313,7 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, * Some devices does not support bulk read, for * them we have a series of single read operations. */ - if (map->use_single_rw) { + if (map->use_single_read) { for (i = 0; i < val_count; i++) { ret = regmap_raw_read(map, reg + (i * map->reg_stride), |