Commit d2cdb122 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap update from Mark Brown:
 "A single change to use the maximum transfer and message sizes
  advertised by SPI controllers to configure limits within the
  regmap core, ensuring better interoperation"

* tag 'regmap-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: spi: Set regmap max raw r/w from max_transfer_size
parents 247ee3e7 f231ff38
...@@ -109,13 +109,37 @@ static const struct regmap_bus regmap_spi = { ...@@ -109,13 +109,37 @@ static const struct regmap_bus regmap_spi = {
.val_format_endian_default = REGMAP_ENDIAN_BIG, .val_format_endian_default = REGMAP_ENDIAN_BIG,
}; };
static const struct regmap_bus *regmap_get_spi_bus(struct spi_device *spi,
const struct regmap_config *config)
{
size_t max_size = spi_max_transfer_size(spi);
struct regmap_bus *bus;
if (max_size != SIZE_MAX) {
bus = kmemdup(&regmap_spi, sizeof(*bus), GFP_KERNEL);
if (!bus)
return ERR_PTR(-ENOMEM);
bus->free_on_exit = true;
bus->max_raw_read = max_size;
bus->max_raw_write = max_size;
return bus;
}
return &regmap_spi;
}
struct regmap *__regmap_init_spi(struct spi_device *spi, struct regmap *__regmap_init_spi(struct spi_device *spi,
const struct regmap_config *config, const struct regmap_config *config,
struct lock_class_key *lock_key, struct lock_class_key *lock_key,
const char *lock_name) const char *lock_name)
{ {
return __regmap_init(&spi->dev, &regmap_spi, &spi->dev, config, const struct regmap_bus *bus = regmap_get_spi_bus(spi, config);
lock_key, lock_name);
if (IS_ERR(bus))
return ERR_CAST(bus);
return __regmap_init(&spi->dev, bus, &spi->dev, config, lock_key, lock_name);
} }
EXPORT_SYMBOL_GPL(__regmap_init_spi); EXPORT_SYMBOL_GPL(__regmap_init_spi);
...@@ -124,8 +148,12 @@ struct regmap *__devm_regmap_init_spi(struct spi_device *spi, ...@@ -124,8 +148,12 @@ struct regmap *__devm_regmap_init_spi(struct spi_device *spi,
struct lock_class_key *lock_key, struct lock_class_key *lock_key,
const char *lock_name) const char *lock_name)
{ {
return __devm_regmap_init(&spi->dev, &regmap_spi, &spi->dev, config, const struct regmap_bus *bus = regmap_get_spi_bus(spi, config);
lock_key, lock_name);
if (IS_ERR(bus))
return ERR_CAST(bus);
return __devm_regmap_init(&spi->dev, bus, &spi->dev, config, lock_key, lock_name);
} }
EXPORT_SYMBOL_GPL(__devm_regmap_init_spi); EXPORT_SYMBOL_GPL(__devm_regmap_init_spi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment