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

Commit f735aa27 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus

parents 3eab887a 815806e3

drivers/base/regmap/regcache.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -38,10 +38,11 @@ static int regcache_hw_init(struct regmap *map) 




	/* calculate the size of reg_defaults */

	/* calculate the size of reg_defaults */

	for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++)

	for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++)

		if (!regmap_volatile(map, i * map->reg_stride))

		if (regmap_readable(map, i * map->reg_stride) &&

		    !regmap_volatile(map, i * map->reg_stride))

			count++;

			count++;





	/* all registers are volatile, so just bypass */

	/* all registers are unreadable or volatile, so just bypass */

	if (!count) {

	if (!count) {

		map->cache_bypass = true;

		map->cache_bypass = true;

		return 0;

		return 0;

drivers/base/regmap/regmap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1474,6 +1474,8 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, 
		ret = map->bus->write(map->bus_context, buf, len);

		ret = map->bus->write(map->bus_context, buf, len);





		kfree(buf);

		kfree(buf);

	} else if (ret != 0 && !map->cache_bypass && map->format.parse_val) {

		regcache_drop_region(map, reg, reg + 1);

	}

	}





	trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes);

	trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes);