linux-next: manual merge of the regmap tree with Linus' tree

linux-next: manual merge of the regmap tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

Hi Mark,

Today's linux-next merge of the regmap tree got a conflict in
drivers/base/regmap/regmap-debugfs.c between commit 480738de0e07
("regmap: debugfs: Simplify calculation of `c->max_reg'") from Linus'
tree and commit 5e3f5901ac6c ("regmap: debugfs: Fix start_reg
calculation") from the regmap tree.

I am not sure that the latter patch is ever required on top of the
former, so for now I just used the former version (except for the last
hunk) (see below) and can carry the fix as necessary (no action is
required).

Please let me know if this is the incorrect resolution.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/regmap/regmap-debugfs.c
index 23b701f,6cd1b78a..0000000
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@@ -144,8 -146,7 +144,8 @@@ static unsigned int regmap_debugfs_get_
  			fpos_offset = from - c->min;
  			reg_offset = fpos_offset / map->debugfs_tot_len;
  			*pos = c->min + (reg_offset * map->debugfs_tot_len);
 +			mutex_unlock(&map->cache_lock);
- 			return c->base_reg + reg_offset;
+ 			return c->base_reg + (reg_offset * map->reg_stride);
  		}
  
  		*pos = c->max;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the regmap tree with Linus' tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

On Thu, May 09, 2013 at 11:56:59AM +1000, Stephen Rothwell wrote:

> Today's linux-next merge of the regmap tree got a conflict in
> drivers/base/regmap/regmap-debugfs.c between commit 480738de0e07
> ("regmap: debugfs: Simplify calculation of `c->max_reg'") from Linus'
> tree and commit 5e3f5901ac6c ("regmap: debugfs: Fix start_reg
> calculation") from the regmap tree.

> I am not sure that the latter patch is ever required on top of the
> former, so for now I just used the former version (except for the last
> hunk) (see below) and can carry the fix as necessary (no action is
> required).

> Please let me know if this is the incorrect resolution.

Looks sensible.  I'll resolve everything on top of -rc1 once that's
released but I think that's the solution.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the regmap tree with Linus' tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On Tue, Jan 31, 2012 at 01:59:50PM +1100, Stephen Rothwell wrote:

> I fixed it up (I think - see below) and can carry the fix as necessary.

Yes, that's the fix I've got.  I'm kind of surprised git didn't figure
this out for itself, the tag I sent to Linus should be pre-merged into
my -next branch as it was sitting in -next for a while.  I'll probably
merge Linus' tree up at some point when he tags a new -rc.  Thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the regmap tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]

Hi Mark,

Today's linux-next merge of the regmap tree got a conflict in
drivers/base/regmap/regmap.c between commit 421e8d2de3bd ("regmap: Reset
cache status when reinitialsing the cache") from Linus' tree and commit
a24f64a64837 ("regmap: Reset device debugfs when reinitialising the
cache") from the regmap tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/base/regmap/regmap.c
index 2cf4bbc,efe287e..0000000
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -284,9 -347,8 +347,11 @@@ int regmap_reinit_cache(struct regmap *
  	map->precious_reg = config->precious_reg;
  	map->cache_type = config->cache_type;
  
 +	map->cache_bypass = false;
 +	map->cache_only = false;
 +
+ 	regmap_debugfs_init(map);
+ 
  	ret = regcache_init(map, config);
  
  	mutex_unlock(&map->lock);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]