From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 14 Mar 2012 13:13:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next
X-Git-Tag: v3.4-rc1~126^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d9aca39dcacd2b3f42e2e287162329f410f93e1;p=platform%2Fkernel%2Flinux-exynos.git

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
---

7d9aca39dcacd2b3f42e2e287162329f410f93e1
diff --cc drivers/base/regmap/internal.h
index e93d7b7d1cf9,d141b80479b5..abd76678ed73
--- a/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/regmap.c
index 58f84c3a6fc1,1752f13ddebc..e3ee9cabccb4
--- a/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);