Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce15667 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap fixes from Mark Brown:
 "Several bug fixes for issues that have been lurking for a while:

   - Check that devices haven't set the flag saying they only support
     register at a time operation while we're doing cache syncs,
     otherwise we fail to restore caches

   - Ensure that we don't mark all registers on devices using
     format_write() as cacheable, avoiding adding a cache of things like
     reset registers which we don't want to rewrite during cache sync

   - Make sure we create the debugfs files in the correct directory"

* tag 'regmap-v3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: Don't attempt block writes when syncing cache on single_rw devices
  regmap: Fix handling of volatile registers for format_write() chips
  regmap: Fix regcache debugfs initialization
parents 70c8038d d3b05339

drivers/base/regmap/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ struct regcache_ops { 
	enum regcache_type type;

	int (*init)(struct regmap *map);

	int (*exit)(struct regmap *map);

#ifdef CONFIG_DEBUG_FS

	void (*debugfs_init)(struct regmap *map);

#endif

	int (*read)(struct regmap *map, unsigned int reg, unsigned int *value);

	int (*write)(struct regmap *map, unsigned int reg, unsigned int value);

	int (*sync)(struct regmap *map, unsigned int min, unsigned int max);

drivers/base/regmap/regcache-rbtree.c

+3 −6
Original line number Diff line number Diff line
@@ -194,10 +194,6 @@ static void rbtree_debugfs_init(struct regmap *map) 
{

	debugfs_create_file("rbtree", 0400, map->debugfs, map, &rbtree_fops);

}

#else

static void rbtree_debugfs_init(struct regmap *map)

{

}

#endif



static int regcache_rbtree_init(struct regmap *map)
@@ -222,8 +218,6 @@ static int regcache_rbtree_init(struct regmap *map) 
			goto err;

	}



	rbtree_debugfs_init(map);



	return 0;



err:
@@ -532,6 +526,9 @@ struct regcache_ops regcache_rbtree_ops = { 
	.name = "rbtree",

	.init = regcache_rbtree_init,

	.exit = regcache_rbtree_exit,

#ifdef CONFIG_DEBUG_FS

	.debugfs_init = rbtree_debugfs_init,

#endif

	.read = regcache_rbtree_read,

	.write = regcache_rbtree_write,

	.sync = regcache_rbtree_sync,

drivers/base/regmap/regcache.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ int regcache_sync_block(struct regmap *map, void *block, 
			unsigned int block_base, unsigned int start,

			unsigned int end)

{

	if (regmap_can_raw_write(map))

	if (regmap_can_raw_write(map) && !map->use_single_rw)

		return regcache_sync_block_raw(map, block, cache_present,

					       block_base, start, end);

	else

drivers/base/regmap/regmap-debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -538,6 +538,9 @@ void regmap_debugfs_init(struct regmap *map, const char *name) 


		next = rb_next(&range_node->node);

	}



	if (map->cache_ops && map->cache_ops->debugfs_init)

		map->cache_ops->debugfs_init(map);

}



void regmap_debugfs_exit(struct regmap *map)

drivers/base/regmap/regmap.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg) 


bool regmap_volatile(struct regmap *map, unsigned int reg)

{

	if (!regmap_readable(map, reg))

	if (!map->format.format_write && !regmap_readable(map, reg))

		return false;



	if (map->volatile_reg)