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

Merge tag 'regmap-offload-update-bits' into regmap-next 

regmap: Allow buses to provide a custom update_bits() operation

Some buses provide a native _update_bits() operation which for uncached
registers is faster than doing a read/modify/write cycle as it is a
single bus transaction.  Add support for implementing this to regmap.

# gpg: Signature made Tue 06 Oct 2015 16:21:47 BST using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: key 00000000 occurs more than once in the trustdb
# gpg: key 16005C11: no public key for trusted key - skipped
# gpg: key 16005C11 marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
parents ba5890a0 77792b11

drivers/base/regmap/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ struct regmap { 


	int (*reg_read)(void *context, unsigned int reg, unsigned int *val);

	int (*reg_write)(void *context, unsigned int reg, unsigned int val);

	int (*reg_update_bits)(void *context, unsigned int reg,

			       unsigned int mask, unsigned int val);



	bool defer_caching;

drivers/base/regmap/regmap.c

+18 −11
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ struct regmap *__regmap_init(struct device *dev, 
		goto skip_format_initialization;

	} else {

		map->reg_read  = _regmap_bus_read;

		map->reg_update_bits = bus->reg_update_bits;

	}



	reg_endian = regmap_get_reg_endian(bus, config);
@@ -2509,6 +2510,14 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 
	int ret;

	unsigned int tmp, orig;



	if (change)

		*change = false;



	if (regmap_volatile(map, reg) && map->reg_update_bits) {

		ret = map->reg_update_bits(map->bus_context, reg, mask, val);

		if (ret == 0 && change)

			*change = true;

	} else {

		ret = _regmap_read(map, reg, &orig);

		if (ret != 0)

			return ret;
@@ -2518,11 +2527,9 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 


		if (force_write || (tmp != orig)) {

			ret = _regmap_write(map, reg, tmp);

		if (change)

			if (ret == 0 && change)

				*change = true;

	} else {

		if (change)

			*change = false;

		}

	}



	return ret;

include/linux/regmap.h

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ typedef int (*regmap_hw_reg_read)(void *context, unsigned int reg, 
				  unsigned int *val);

typedef int (*regmap_hw_reg_write)(void *context, unsigned int reg,

				   unsigned int val);

typedef int (*regmap_hw_reg_update_bits)(void *context, unsigned int reg,

					 unsigned int mask, unsigned int val);

typedef struct regmap_async *(*regmap_hw_async_alloc)(void);

typedef void (*regmap_hw_free_context)(void *context);
@@ -335,6 +337,7 @@ struct regmap_bus { 
	regmap_hw_gather_write gather_write;

	regmap_hw_async_write async_write;

	regmap_hw_reg_write reg_write;

	regmap_hw_reg_update_bits reg_update_bits;

	regmap_hw_read read;

	regmap_hw_reg_read reg_read;

	regmap_hw_free_context free_context;

CRA Git | Maintained and supported by SUSTech CRA and CCSE