From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 21 Feb 2012 19:34:01 +0000 (+0000)
Subject: Merge tag 'topic/introspection' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.4-rc3~5^2~23^2~25^2~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82150451816ac6d735d8f90babe102636121d67e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'topic/introspection' of git://git./linux/kernel/git/broonie/regmap into HEAD

New interfaces to allow other subsystems to gather information about the
regmap, allowing them to build further subsystem specific generic
features on top of the regmap.

Merged into ASoC in order to allow us to implement SND_SOC_BYTES_MASK()
controls which need to know the word size of the underlying registers.
---

82150451816ac6d735d8f90babe102636121d67e
diff --cc drivers/base/regmap/regmap.c
index 2cf4bbc,e091196..7ac234f
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -673,63 -673,20 +673,78 @@@ int regmap_update_bits_check(struct reg
  EXPORT_SYMBOL_GPL(regmap_update_bits_check);
  
  /**
 + * regmap_register_patch: Register and apply register updates to be applied
 + *                        on device initialistion
 + *
 + * @map: Register map to apply updates to.
 + * @regs: Values to update.
 + * @num_regs: Number of entries in regs.
 + *
 + * Register a set of register updates to be applied to the device
 + * whenever the device registers are synchronised with the cache and
 + * apply them immediately.  Typically this is used to apply
 + * corrections to be applied to the device defaults on startup, such
 + * as the updates some vendors provide to undocumented registers.
 + */
 +int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 +			  int num_regs)
 +{
 +	int i, ret;
 +	bool bypass;
 +
 +	/* If needed the implementation can be extended to support this */
 +	if (map->patch)
 +		return -EBUSY;
 +
 +	mutex_lock(&map->lock);
 +
 +	bypass = map->cache_bypass;
 +
 +	map->cache_bypass = 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;
 +		}
 +	}
 +
 +	map->patch = kcalloc(sizeof(struct reg_default), num_regs, GFP_KERNEL);
 +	if (map->patch != NULL) {
 +		memcpy(map->patch, regs,
 +		       num_regs * sizeof(struct reg_default));
 +		map->patch_regs = num_regs;
 +	} else {
 +		ret = -ENOMEM;
 +	}
 +
 +out:
 +	map->cache_bypass = bypass;
 +
 +	mutex_unlock(&map->lock);
 +
 +	return ret;
 +}
 +EXPORT_SYMBOL_GPL(regmap_register_patch);
 +
++/*
+  * regmap_get_val_bytes(): Report the size of a register value
+  *
+  * Report the size of a register value, mainly intended to for use by
+  * generic infrastructure built on top of regmap.
+  */
+ int regmap_get_val_bytes(struct regmap *map)
+ {
+ 	if (map->format.format_write)
+ 		return -EINVAL;
+ 
+ 	return map->format.val_bytes;
+ }
+ EXPORT_SYMBOL_GPL(regmap_get_val_bytes);
+ 
  static int __init regmap_initcall(void)
  {
  	regmap_debugfs_initcall();