Merge remote-tracking branches 'regmap/topic/cache', 'regmap/topic/irq', 'regmap/topic/lock', 'regmap/topic/mmio', 'regmap/topic/nodev', 'regmap/topic/parse-val' and 'regmap/topic/patch' into regmap-next

This commit is contained in:
Mark Brown 2014-03-28 11:50:43 +00:00
8 изменённых файлов: 364 добавлений и 90 удалений

Просмотреть файл

@ -134,6 +134,8 @@ struct regmap {
/* if set, converts bulk rw to single rw */ /* if set, converts bulk rw to single rw */
bool use_single_rw; bool use_single_rw;
/* if set, the device supports multi write mode */
bool can_multi_write;
struct rb_root range_tree; struct rb_root range_tree;
void *selector_work_buf; /* Scratch buffer used for selector */ void *selector_work_buf; /* Scratch buffer used for selector */

Просмотреть файл

@ -249,11 +249,12 @@ static int regcache_default_sync(struct regmap *map, unsigned int min,
{ {
unsigned int reg; unsigned int reg;
for (reg = min; reg <= max; reg++) { for (reg = min; reg <= max; reg += map->reg_stride) {
unsigned int val; unsigned int val;
int ret; int ret;
if (regmap_volatile(map, reg)) if (regmap_volatile(map, reg) ||
!regmap_writeable(map, reg))
continue; continue;
ret = regcache_read(map, reg, &val); ret = regcache_read(map, reg, &val);
@ -312,10 +313,6 @@ int regcache_sync(struct regmap *map)
/* Apply any patch first */ /* Apply any patch first */
map->cache_bypass = 1; map->cache_bypass = 1;
for (i = 0; i < map->patch_regs; i++) { for (i = 0; i < map->patch_regs; i++) {
if (map->patch[i].reg % map->reg_stride) {
ret = -EINVAL;
goto out;
}
ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def); ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
if (ret != 0) { if (ret != 0) {
dev_err(map->dev, "Failed to write %x = %x: %d\n", dev_err(map->dev, "Failed to write %x = %x: %d\n",

Просмотреть файл

@ -368,8 +368,6 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
if (!d) if (!d)
return -ENOMEM; return -ENOMEM;
*data = d;
d->status_buf = kzalloc(sizeof(unsigned int) * chip->num_regs, d->status_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,
GFP_KERNEL); GFP_KERNEL);
if (!d->status_buf) if (!d->status_buf)
@ -506,6 +504,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
goto err_domain; goto err_domain;
} }
*data = d;
return 0; return 0;
err_domain: err_domain:
@ -533,7 +533,7 @@ void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)
return; return;
free_irq(irq, d); free_irq(irq, d);
/* We should unmap the domain but... */ irq_domain_remove(d->domain);
kfree(d->wake_buf); kfree(d->wake_buf);
kfree(d->mask_buf_def); kfree(d->mask_buf_def);
kfree(d->mask_buf); kfree(d->mask_buf);

Просмотреть файл

@ -26,10 +26,47 @@
struct regmap_mmio_context { struct regmap_mmio_context {
void __iomem *regs; void __iomem *regs;
unsigned reg_bytes;
unsigned val_bytes; unsigned val_bytes;
unsigned pad_bytes;
struct clk *clk; struct clk *clk;
}; };
static inline void regmap_mmio_regsize_check(size_t reg_size)
{
switch (reg_size) {
case 1:
case 2:
case 4:
#ifdef CONFIG_64BIT
case 8:
#endif
break;
default:
BUG();
}
}
static int regmap_mmio_regbits_check(size_t reg_bits)
{
switch (reg_bits) {
case 8:
case 16:
case 32:
#ifdef CONFIG_64BIT
case 64:
#endif
return 0;
default:
return -EINVAL;
}
}
static inline void regmap_mmio_count_check(size_t count)
{
BUG_ON(count % 2 != 0);
}
static int regmap_mmio_gather_write(void *context, static int regmap_mmio_gather_write(void *context,
const void *reg, size_t reg_size, const void *reg, size_t reg_size,
const void *val, size_t val_size) const void *val, size_t val_size)
@ -38,7 +75,7 @@ static int regmap_mmio_gather_write(void *context,
u32 offset; u32 offset;
int ret; int ret;
BUG_ON(reg_size != 4); regmap_mmio_regsize_check(reg_size);
if (!IS_ERR(ctx->clk)) { if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk); ret = clk_enable(ctx->clk);
@ -81,9 +118,13 @@ static int regmap_mmio_gather_write(void *context,
static int regmap_mmio_write(void *context, const void *data, size_t count) static int regmap_mmio_write(void *context, const void *data, size_t count)
{ {
BUG_ON(count < 4); struct regmap_mmio_context *ctx = context;
u32 offset = ctx->reg_bytes + ctx->pad_bytes;
return regmap_mmio_gather_write(context, data, 4, data + 4, count - 4); regmap_mmio_count_check(count);
return regmap_mmio_gather_write(context, data, ctx->reg_bytes,
data + offset, count - offset);
} }
static int regmap_mmio_read(void *context, static int regmap_mmio_read(void *context,
@ -94,7 +135,7 @@ static int regmap_mmio_read(void *context,
u32 offset; u32 offset;
int ret; int ret;
BUG_ON(reg_size != 4); regmap_mmio_regsize_check(reg_size);
if (!IS_ERR(ctx->clk)) { if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk); ret = clk_enable(ctx->clk);
@ -165,8 +206,9 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
int min_stride; int min_stride;
int ret; int ret;
if (config->reg_bits != 32) ret = regmap_mmio_regbits_check(config->reg_bits);
return ERR_PTR(-EINVAL); if (ret)
return ERR_PTR(ret);
if (config->pad_bits) if (config->pad_bits)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
@ -209,6 +251,8 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
ctx->regs = regs; ctx->regs = regs;
ctx->val_bytes = config->val_bits / 8; ctx->val_bytes = config->val_bits / 8;
ctx->reg_bytes = config->reg_bits / 8;
ctx->pad_bytes = config->pad_bits / 8;
ctx->clk = ERR_PTR(-ENODEV); ctx->clk = ERR_PTR(-ENODEV);
if (clk_id == NULL) if (clk_id == NULL)

Просмотреть файл

@ -380,6 +380,28 @@ static void regmap_range_exit(struct regmap *map)
kfree(map->selector_work_buf); kfree(map->selector_work_buf);
} }
int regmap_attach_dev(struct device *dev, struct regmap *map,
const struct regmap_config *config)
{
struct regmap **m;
map->dev = dev;
regmap_debugfs_init(map, config->name);
/* Add a devres resource for dev_get_regmap() */
m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL);
if (!m) {
regmap_debugfs_exit(map);
return -ENOMEM;
}
*m = map;
devres_add(dev, m);
return 0;
}
EXPORT_SYMBOL_GPL(regmap_attach_dev);
/** /**
* regmap_init(): Initialise register map * regmap_init(): Initialise register map
* *
@ -397,7 +419,7 @@ struct regmap *regmap_init(struct device *dev,
void *bus_context, void *bus_context,
const struct regmap_config *config) const struct regmap_config *config)
{ {
struct regmap *map, **m; struct regmap *map;
int ret = -EINVAL; int ret = -EINVAL;
enum regmap_endian reg_endian, val_endian; enum regmap_endian reg_endian, val_endian;
int i, j; int i, j;
@ -439,6 +461,7 @@ struct regmap *regmap_init(struct device *dev,
else else
map->reg_stride = 1; map->reg_stride = 1;
map->use_single_rw = config->use_single_rw; map->use_single_rw = config->use_single_rw;
map->can_multi_write = config->can_multi_write;
map->dev = dev; map->dev = dev;
map->bus = bus; map->bus = bus;
map->bus_context = bus_context; map->bus_context = bus_context;
@ -734,25 +757,18 @@ skip_format_initialization:
} }
} }
regmap_debugfs_init(map, config->name);
ret = regcache_init(map, config); ret = regcache_init(map, config);
if (ret != 0) if (ret != 0)
goto err_range; goto err_range;
/* Add a devres resource for dev_get_regmap() */ if (dev)
m = devres_alloc(dev_get_regmap_release, sizeof(*m), GFP_KERNEL); ret = regmap_attach_dev(dev, map, config);
if (!m) { if (ret != 0)
ret = -ENOMEM; goto err_regcache;
goto err_debugfs;
}
*m = map;
devres_add(dev, m);
return map; return map;
err_debugfs: err_regcache:
regmap_debugfs_exit(map);
regcache_exit(map); regcache_exit(map);
err_range: err_range:
regmap_range_exit(map); regmap_range_exit(map);
@ -1520,12 +1536,12 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
if (reg % map->reg_stride) if (reg % map->reg_stride)
return -EINVAL; return -EINVAL;
map->lock(map->lock_arg);
/* /*
* Some devices don't support bulk write, for * Some devices don't support bulk write, for
* them we have a series of single write operations. * them we have a series of single write operations.
*/ */
if (!map->bus || map->use_single_rw) { if (!map->bus || map->use_single_rw) {
map->lock(map->lock_arg);
for (i = 0; i < val_count; i++) { for (i = 0; i < val_count; i++) {
unsigned int ival; unsigned int ival;
@ -1554,31 +1570,239 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
if (ret != 0) if (ret != 0)
goto out; goto out;
} }
out:
map->unlock(map->lock_arg);
} else { } else {
void *wval; void *wval;
wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL); wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);
if (!wval) { if (!wval) {
ret = -ENOMEM;
dev_err(map->dev, "Error in memory allocation\n"); dev_err(map->dev, "Error in memory allocation\n");
goto out; return -ENOMEM;
} }
for (i = 0; i < val_count * val_bytes; i += val_bytes) for (i = 0; i < val_count * val_bytes; i += val_bytes)
map->format.parse_inplace(wval + i); map->format.parse_inplace(wval + i);
map->lock(map->lock_arg);
ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count); ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
map->unlock(map->lock_arg);
kfree(wval); kfree(wval);
} }
out:
map->unlock(map->lock_arg);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(regmap_bulk_write); EXPORT_SYMBOL_GPL(regmap_bulk_write);
/*
* _regmap_raw_multi_reg_write()
*
* the (register,newvalue) pairs in regs have not been formatted, but
* they are all in the same page and have been changed to being page
* relative. The page register has been written if that was neccessary.
*/
static int _regmap_raw_multi_reg_write(struct regmap *map,
const struct reg_default *regs,
size_t num_regs)
{
int ret;
void *buf;
int i;
u8 *u8;
size_t val_bytes = map->format.val_bytes;
size_t reg_bytes = map->format.reg_bytes;
size_t pad_bytes = map->format.pad_bytes;
size_t pair_size = reg_bytes + pad_bytes + val_bytes;
size_t len = pair_size * num_regs;
buf = kzalloc(len, GFP_KERNEL);
if (!buf)
return -ENOMEM;
/* We have to linearise by hand. */
u8 = buf;
for (i = 0; i < num_regs; i++) {
int reg = regs[i].reg;
int val = regs[i].def;
trace_regmap_hw_write_start(map->dev, reg, 1);
map->format.format_reg(u8, reg, map->reg_shift);
u8 += reg_bytes + pad_bytes;
map->format.format_val(u8, val, 0);
u8 += val_bytes;
}
u8 = buf;
*u8 |= map->write_flag_mask;
ret = map->bus->write(map->bus_context, buf, len);
kfree(buf);
for (i = 0; i < num_regs; i++) {
int reg = regs[i].reg;
trace_regmap_hw_write_done(map->dev, reg, 1);
}
return ret;
}
static unsigned int _regmap_register_page(struct regmap *map,
unsigned int reg,
struct regmap_range_node *range)
{
unsigned int win_page = (reg - range->range_min) / range->window_len;
return win_page;
}
static int _regmap_range_multi_paged_reg_write(struct regmap *map,
struct reg_default *regs,
size_t num_regs)
{
int ret;
int i, n;
struct reg_default *base;
unsigned int this_page;
/*
* the set of registers are not neccessarily in order, but
* since the order of write must be preserved this algorithm
* chops the set each time the page changes
*/
base = regs;
for (i = 0, n = 0; i < num_regs; i++, n++) {
unsigned int reg = regs[i].reg;
struct regmap_range_node *range;
range = _regmap_range_lookup(map, reg);
if (range) {
unsigned int win_page = _regmap_register_page(map, reg,
range);
if (i == 0)
this_page = win_page;
if (win_page != this_page) {
this_page = win_page;
ret = _regmap_raw_multi_reg_write(map, base, n);
if (ret != 0)
return ret;
base += n;
n = 0;
}
ret = _regmap_select_page(map, &base[n].reg, range, 1);
if (ret != 0)
return ret;
}
}
if (n > 0)
return _regmap_raw_multi_reg_write(map, base, n);
return 0;
}
static int _regmap_multi_reg_write(struct regmap *map,
const struct reg_default *regs,
size_t num_regs)
{
int i;
int ret;
if (!map->can_multi_write) {
for (i = 0; i < num_regs; i++) {
ret = _regmap_write(map, regs[i].reg, regs[i].def);
if (ret != 0)
return ret;
}
return 0;
}
if (!map->format.parse_inplace)
return -EINVAL;
if (map->writeable_reg)
for (i = 0; i < num_regs; i++) {
int reg = regs[i].reg;
if (!map->writeable_reg(map->dev, reg))
return -EINVAL;
if (reg % map->reg_stride)
return -EINVAL;
}
if (!map->cache_bypass) {
for (i = 0; i < num_regs; i++) {
unsigned int val = regs[i].def;
unsigned int reg = regs[i].reg;
ret = regcache_write(map, reg, val);
if (ret) {
dev_err(map->dev,
"Error in caching of register: %x ret: %d\n",
reg, ret);
return ret;
}
}
if (map->cache_only) {
map->cache_dirty = true;
return 0;
}
}
WARN_ON(!map->bus);
for (i = 0; i < num_regs; i++) {
unsigned int reg = regs[i].reg;
struct regmap_range_node *range;
range = _regmap_range_lookup(map, reg);
if (range) {
size_t len = sizeof(struct reg_default)*num_regs;
struct reg_default *base = kmemdup(regs, len,
GFP_KERNEL);
if (!base)
return -ENOMEM;
ret = _regmap_range_multi_paged_reg_write(map, base,
num_regs);
kfree(base);
return ret;
}
}
return _regmap_raw_multi_reg_write(map, regs, num_regs);
}
/* /*
* regmap_multi_reg_write(): Write multiple registers to the device * regmap_multi_reg_write(): Write multiple registers to the device
* *
* where the set of register,value pairs are supplied in any order,
* possibly not all in a single range.
*
* @map: Register map to write to
* @regs: Array of structures containing register,value to be written
* @num_regs: Number of registers to write
*
* The 'normal' block write mode will send ultimately send data on the
* target bus as R,V1,V2,V3,..,Vn where successively higer registers are
* addressed. However, this alternative block multi write mode will send
* the data as R1,V1,R2,V2,..,Rn,Vn on the target bus. The target device
* must of course support the mode.
*
* A value of zero will be returned on success, a negative errno will be
* returned in error cases.
*/
int regmap_multi_reg_write(struct regmap *map, const struct reg_default *regs,
int num_regs)
{
int ret;
map->lock(map->lock_arg);
ret = _regmap_multi_reg_write(map, regs, num_regs);
map->unlock(map->lock_arg);
return ret;
}
EXPORT_SYMBOL_GPL(regmap_multi_reg_write);
/*
* regmap_multi_reg_write_bypassed(): Write multiple registers to the
* device but not the cache
*
* where the set of register are supplied in any order * where the set of register are supplied in any order
* *
* @map: Register map to write to * @map: Register map to write to
@ -1592,30 +1816,27 @@ EXPORT_SYMBOL_GPL(regmap_bulk_write);
* A value of zero will be returned on success, a negative errno will * A value of zero will be returned on success, a negative errno will
* be returned in error cases. * be returned in error cases.
*/ */
int regmap_multi_reg_write(struct regmap *map, struct reg_default *regs, int regmap_multi_reg_write_bypassed(struct regmap *map,
int num_regs) const struct reg_default *regs,
int num_regs)
{ {
int ret = 0, i; int ret;
bool bypass;
for (i = 0; i < num_regs; i++) {
int reg = regs[i].reg;
if (reg % map->reg_stride)
return -EINVAL;
}
map->lock(map->lock_arg); map->lock(map->lock_arg);
for (i = 0; i < num_regs; i++) { bypass = map->cache_bypass;
ret = _regmap_write(map, regs[i].reg, regs[i].def); map->cache_bypass = true;
if (ret != 0)
goto out; ret = _regmap_multi_reg_write(map, regs, num_regs);
}
out: map->cache_bypass = bypass;
map->unlock(map->lock_arg); map->unlock(map->lock_arg);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(regmap_multi_reg_write); EXPORT_SYMBOL_GPL(regmap_multi_reg_write_bypassed);
/** /**
* regmap_raw_write_async(): Write raw values to one or more registers * regmap_raw_write_async(): Write raw values to one or more registers
@ -2176,35 +2397,21 @@ EXPORT_SYMBOL_GPL(regmap_async_complete);
* apply them immediately. Typically this is used to apply * apply them immediately. Typically this is used to apply
* corrections to be applied to the device defaults on startup, such * corrections to be applied to the device defaults on startup, such
* as the updates some vendors provide to undocumented registers. * as the updates some vendors provide to undocumented registers.
*
* The caller must ensure that this function cannot be called
* concurrently with either itself or regcache_sync().
*/ */
int regmap_register_patch(struct regmap *map, const struct reg_default *regs, int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
int num_regs) int num_regs)
{ {
struct reg_default *p; struct reg_default *p;
int i, ret; int ret;
bool bypass; bool bypass;
if (WARN_ONCE(num_regs <= 0, "invalid registers number (%d)\n", if (WARN_ONCE(num_regs <= 0, "invalid registers number (%d)\n",
num_regs)) num_regs))
return 0; return 0;
map->lock(map->lock_arg);
bypass = map->cache_bypass;
map->cache_bypass = true;
map->async = true;
/* Write out first; it's useful to apply even if we fail later. */
for (i = 0; i < num_regs; i++) {
ret = _regmap_write(map, regs[i].reg, regs[i].def);
if (ret != 0) {
dev_err(map->dev, "Failed to write %x = %x: %d\n",
regs[i].reg, regs[i].def, ret);
goto out;
}
}
p = krealloc(map->patch, p = krealloc(map->patch,
sizeof(struct reg_default) * (map->patch_regs + num_regs), sizeof(struct reg_default) * (map->patch_regs + num_regs),
GFP_KERNEL); GFP_KERNEL);
@ -2213,9 +2420,20 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
map->patch = p; map->patch = p;
map->patch_regs += num_regs; map->patch_regs += num_regs;
} else { } else {
ret = -ENOMEM; return -ENOMEM;
} }
map->lock(map->lock_arg);
bypass = map->cache_bypass;
map->cache_bypass = true;
map->async = true;
ret = _regmap_multi_reg_write(map, regs, num_regs);
if (ret != 0)
goto out;
out: out:
map->async = false; map->async = false;
map->cache_bypass = bypass; map->cache_bypass = bypass;
@ -2243,6 +2461,18 @@ int regmap_get_val_bytes(struct regmap *map)
} }
EXPORT_SYMBOL_GPL(regmap_get_val_bytes); EXPORT_SYMBOL_GPL(regmap_get_val_bytes);
int regmap_parse_val(struct regmap *map, const void *buf,
unsigned int *val)
{
if (!map->format.parse_val)
return -EINVAL;
*val = map->format.parse_val(buf);
return 0;
}
EXPORT_SYMBOL_GPL(regmap_parse_val);
static int __init regmap_initcall(void) static int __init regmap_initcall(void)
{ {
regmap_debugfs_initcall(); regmap_debugfs_initcall();

Просмотреть файл

@ -251,8 +251,6 @@ static int arizona_apply_hardware_patch(struct arizona* arizona)
unsigned int fll, sysclk; unsigned int fll, sysclk;
int ret, err; int ret, err;
regcache_cache_bypass(arizona->regmap, true);
/* Cache existing FLL and SYSCLK settings */ /* Cache existing FLL and SYSCLK settings */
ret = regmap_read(arizona->regmap, ARIZONA_FLL1_CONTROL_1, &fll); ret = regmap_read(arizona->regmap, ARIZONA_FLL1_CONTROL_1, &fll);
if (ret != 0) { if (ret != 0) {
@ -322,8 +320,6 @@ err_fll:
err); err);
} }
regcache_cache_bypass(arizona->regmap, false);
if (ret != 0) if (ret != 0)
return ret; return ret;
else else

Просмотреть файл

@ -80,8 +80,7 @@ static const struct reg_default wm5102_revb_patch[] = {
int wm5102_patch(struct arizona *arizona) int wm5102_patch(struct arizona *arizona)
{ {
const struct reg_default *wm5102_patch; const struct reg_default *wm5102_patch;
int ret = 0; int patch_size;
int i, patch_size;
switch (arizona->rev) { switch (arizona->rev) {
case 0: case 0:
@ -92,21 +91,9 @@ int wm5102_patch(struct arizona *arizona)
patch_size = ARRAY_SIZE(wm5102_revb_patch); patch_size = ARRAY_SIZE(wm5102_revb_patch);
} }
regcache_cache_bypass(arizona->regmap, true); return regmap_multi_reg_write_bypassed(arizona->regmap,
wm5102_patch,
for (i = 0; i < patch_size; i++) { patch_size);
ret = regmap_write(arizona->regmap, wm5102_patch[i].reg,
wm5102_patch[i].def);
if (ret != 0) {
dev_err(arizona->dev, "Failed to write %x = %x: %d\n",
wm5102_patch[i].reg, wm5102_patch[i].def, ret);
goto out;
}
}
out:
regcache_cache_bypass(arizona->regmap, false);
return ret;
} }
static const struct regmap_irq wm5102_aod_irqs[ARIZONA_NUM_IRQ] = { static const struct regmap_irq wm5102_aod_irqs[ARIZONA_NUM_IRQ] = {

Просмотреть файл

@ -164,6 +164,9 @@ typedef void (*regmap_unlock)(void *);
* @use_single_rw: If set, converts the bulk read and write operations into * @use_single_rw: If set, converts the bulk read and write operations into
* a series of single read and write operations. This is useful * a series of single read and write operations. This is useful
* for device that does not support bulk read and write. * for device that does not support bulk read and write.
* @can_multi_write: If set, the device supports the multi write mode of bulk
* write operations, if clear multi write requests will be
* split into individual write operations
* *
* @cache_type: The actual cache type. * @cache_type: The actual cache type.
* @reg_defaults_raw: Power on reset values for registers (for use with * @reg_defaults_raw: Power on reset values for registers (for use with
@ -215,6 +218,7 @@ struct regmap_config {
u8 write_flag_mask; u8 write_flag_mask;
bool use_single_rw; bool use_single_rw;
bool can_multi_write;
enum regmap_endian reg_format_endian; enum regmap_endian reg_format_endian;
enum regmap_endian val_format_endian; enum regmap_endian val_format_endian;
@ -317,6 +321,8 @@ struct regmap *regmap_init(struct device *dev,
const struct regmap_bus *bus, const struct regmap_bus *bus,
void *bus_context, void *bus_context,
const struct regmap_config *config); const struct regmap_config *config);
int regmap_attach_dev(struct device *dev, struct regmap *map,
const struct regmap_config *config);
struct regmap *regmap_init_i2c(struct i2c_client *i2c, struct regmap *regmap_init_i2c(struct i2c_client *i2c,
const struct regmap_config *config); const struct regmap_config *config);
struct regmap *regmap_init_spi(struct spi_device *dev, struct regmap *regmap_init_spi(struct spi_device *dev,
@ -386,8 +392,11 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
const void *val, size_t val_len); const void *val, size_t val_len);
int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
size_t val_count); size_t val_count);
int regmap_multi_reg_write(struct regmap *map, struct reg_default *regs, int regmap_multi_reg_write(struct regmap *map, const struct reg_default *regs,
int num_regs); int num_regs);
int regmap_multi_reg_write_bypassed(struct regmap *map,
const struct reg_default *regs,
int num_regs);
int regmap_raw_write_async(struct regmap *map, unsigned int reg, int regmap_raw_write_async(struct regmap *map, unsigned int reg,
const void *val, size_t val_len); const void *val, size_t val_len);
int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val); int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val);
@ -423,6 +432,8 @@ bool regmap_check_range_table(struct regmap *map, unsigned int reg,
int regmap_register_patch(struct regmap *map, const struct reg_default *regs, int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
int num_regs); int num_regs);
int regmap_parse_val(struct regmap *map, const void *buf,
unsigned int *val);
static inline bool regmap_reg_in_range(unsigned int reg, static inline bool regmap_reg_in_range(unsigned int reg,
const struct regmap_range *range) const struct regmap_range *range)
@ -695,6 +706,13 @@ static inline int regmap_register_patch(struct regmap *map,
return -EINVAL; return -EINVAL;
} }
static inline int regmap_parse_val(struct regmap *map, const void *buf,
unsigned int *val)
{
WARN_ONCE(1, "regmap API is disabled");
return -EINVAL;
}
static inline struct regmap *dev_get_regmap(struct device *dev, static inline struct regmap *dev_get_regmap(struct device *dev,
const char *name) const char *name)
{ {