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

diff --cc drivers/base/regmap/internal.h
index e93d7b7d1cf90ecdafdf87e4fcb6f6a658c2fed1,d141b80479b5257d9fff00b9be47e47029e0f163..abd76678ed7309036c3b1e6091422bfba2078659
--- 1/drivers/base/regmap/internal.h
--- 2/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@@ -75,7 -74,10 +75,10 @@@ struct regmap 
        struct reg_default *reg_defaults;
        const void *reg_defaults_raw;
        void *cache;
 -      bool cache_dirty;
 +      u32 cache_dirty;
+ 
+       struct reg_default *patch;
+       int patch_regs;
  };
  
  struct regcache_ops {

diff --cc drivers/base/regmap/regcache.c
Simple merge

diff --cc drivers/base/regmap/regmap.c
index 58f84c3a6fc1031261f9d78cbdd9ee5101a096e5,1752f13ddebc391b27dee4b791b9676de69f515d..e3ee9cabccb46d9ff31d2954715308c08007aedd
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -372,8 -323,9 +372,11 @@@ int regmap_reinit_cache(struct regmap *
        map->precious_reg = config->precious_reg;
        map->cache_type = config->cache_type;
  
 +      regmap_debugfs_init(map);
 +
+       map->cache_bypass = false;
+       map->cache_only = false;
+ 
        ret = regcache_init(map, config);
  
        mutex_unlock(&map->lock);

diff --cc include/linux/regmap.h
Simple merge