Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
Mark Brown [Wed, 14 Mar 2012 13:13:25 +0000 (13:13 +0000)]
Resolved simple add/add conflicts:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c

1  2 
drivers/base/regmap/internal.h
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c
include/linux/regmap.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 {
Simple merge
@@@ -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);
Simple merge