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

Commit 91d31b9f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

regmap: add regmap_update_bits_base() 



Current regmap has many similar update functions like below,
but the difference is very few.
	regmap_update_bits()
	regmap_update_bits_async()
	regmap_update_bits_check()
	regmap_update_bits_check_async()
Furthermore, we can add *force* write option too in the future.

This patch adds new regmap_update_bits_base() which is feature
merged function. Above functions can be merged into it by macro.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 92e963f5

drivers/base/regmap/regmap.c

+40 −0
Original line number Diff line number Diff line
@@ -2647,6 +2647,46 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, 
	return ret;

}



/**

 * regmap_update_bits_base:

 *	Perform a read/modify/write cycle on the

 *	register map with change, async, force option

 *

 * @map: Register map to update

 * @reg: Register to update

 * @mask: Bitmask to change

 * @val: New value for bitmask

 * @change: Boolean indicating if a write was done

 * @async: Boolean indicating asynchronously

 * @force: Boolean indicating use force update

 *

 * if async was true,

 * With most buses the read must be done synchronously so this is most

 * useful for devices with a cache which do not need to interact with

 * the hardware to determine the current register value.

 *

 * Returns zero for success, a negative number on error.

 */

int regmap_update_bits_base(struct regmap *map, unsigned int reg,

			    unsigned int mask, unsigned int val,

			    bool *change, bool async, bool force)

{

	int ret;



	map->lock(map->lock_arg);



	map->async = async;



	ret = _regmap_update_bits(map, reg, mask, val, change, force);



	map->async = false;



	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_update_bits_base);



/**

 * regmap_update_bits: Perform a read/modify/write cycle on the register map

 *

include/linux/regmap.h

+11 −0
Original line number Diff line number Diff line
@@ -691,6 +691,9 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, 
		    void *val, size_t val_len);

int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,

		     size_t val_count);

int regmap_update_bits_base(struct regmap *map, unsigned int reg,

			    unsigned int mask, unsigned int val,

			    bool *change, bool async, bool force);

int regmap_update_bits(struct regmap *map, unsigned int reg,

		       unsigned int mask, unsigned int val);

int regmap_write_bits(struct regmap *map, unsigned int reg,
@@ -937,6 +940,14 @@ static inline int regmap_bulk_read(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_update_bits_base(struct regmap *map, unsigned int reg,

					  unsigned int mask, unsigned int val,

					  bool *change, bool async, bool force)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_update_bits(struct regmap *map, unsigned int reg,

				     unsigned int mask, unsigned int val)

{