Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 5b0908a7f5b..56ca477d509 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -162,6 +162,9 @@ void regcache_cache_only(struct regmap *map, bool enable);
 void regcache_cache_bypass(struct regmap *map, bool enable);
 void regcache_mark_dirty(struct regmap *map);
 
+int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
+                          int num_regs);
+
 /**
  * Description of an IRQ for the generic regmap irq_chip.
  *