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

Commit 28972eaa authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

regmap: add regmap_field_update_bits_base() 



This patch adds new regmap_field_update_bits_base() which is using
regmap_update_bits_base().
Current regmap_field_xxx() 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 89d8d4b8

drivers/base/regmap/regmap.c

+27 −0
Original line number Diff line number Diff line
@@ -1689,6 +1689,33 @@ int regmap_raw_write(struct regmap *map, unsigned int reg, 
}

EXPORT_SYMBOL_GPL(regmap_raw_write);



/**

 * regmap_field_update_bits_base():

 *	Perform a read/modify/write cycle on the register field

 *	with change, async, force option

 *

 * @field: Register field to write to

 * @mask: Bitmask to change

 * @val: Value to be written

 * @change: Boolean indicating if a write was done

 * @async: Boolean indicating asynchronously

 * @force: Boolean indicating use force update

 *

 * A value of zero will be returned on success, a negative errno will

 * be returned in error cases.

 */

int regmap_field_update_bits_base(struct regmap_field *field,

				  unsigned int mask, unsigned int val,

				  bool *change, bool async, bool force)

{

	mask = (mask << field->shift) & field->mask;



	return regmap_update_bits_base(field->regmap, field->reg,

				       mask, val << field->shift,

				       change, async, force);

}

EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);



/**

 * regmap_field_write(): Write a value to a single register field

 *

include/linux/regmap.h

+11 −1
Original line number Diff line number Diff line
@@ -773,9 +773,11 @@ void devm_regmap_field_free(struct device *dev, struct regmap_field *field); 


int regmap_field_read(struct regmap_field *field, unsigned int *val);

int regmap_field_write(struct regmap_field *field, unsigned int val);

int regmap_field_update_bits_base(struct regmap_field *field,

				  unsigned int mask, unsigned int val,

				  bool *change, bool async, bool force);

int regmap_field_update_bits(struct regmap_field *field,

			     unsigned int mask, unsigned int val);



int regmap_fields_write(struct regmap_field *field, unsigned int id,

			unsigned int val);

int regmap_fields_force_write(struct regmap_field *field, unsigned int id,
@@ -954,6 +956,14 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_field_update_bits_base(struct regmap_field *field,

					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_get_val_bytes(struct regmap *map)

{

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