Unverified Commit 26968e61 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'regmap-field-bit-helpers' of... 

Merge tag 'regmap-field-bit-helpers' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-5.20

regmap: Add regmap_field helpers for simple bit operations

Add simple bit operations for setting, clearing and testing specific
bits with regmap_field.
parents 72607f37 f67be8b7

drivers/base/regmap/regmap.c

+22 −0
Original line number Diff line number Diff line
@@ -2220,6 +2220,28 @@ int regmap_field_update_bits_base(struct regmap_field *field, 
}

EXPORT_SYMBOL_GPL(regmap_field_update_bits_base);



/**

 * regmap_field_test_bits() - Check if all specified bits are set in a

 *                            register field.

 *

 * @field: Register field to operate on

 * @bits: Bits to test

 *

 * Returns -1 if the underlying regmap_field_read() fails, 0 if at least one of the

 * tested bits is not set and 1 if all tested bits are set.

 */

int regmap_field_test_bits(struct regmap_field *field, unsigned int bits)

{

	unsigned int val, ret;



	ret = regmap_field_read(field, &val);

	if (ret)

		return ret;



	return (val & bits) == bits;

}

EXPORT_SYMBOL_GPL(regmap_field_test_bits);



/**

 * regmap_fields_update_bits_base() - Perform a read/modify/write cycle a

 *                                    register field with port ID

include/linux/regmap.h

+37 −0
Original line number Diff line number Diff line
@@ -1336,6 +1336,22 @@ static inline int regmap_field_update_bits(struct regmap_field *field, 
					     NULL, false, false);

}



static inline int regmap_field_set_bits(struct regmap_field *field,

					unsigned int bits)

{

	return regmap_field_update_bits_base(field, bits, bits, NULL, false,

					     false);

}



static inline int regmap_field_clear_bits(struct regmap_field *field,

					  unsigned int bits)

{

	return regmap_field_update_bits_base(field, bits, 0, NULL, false,

					     false);

}



int regmap_field_test_bits(struct regmap_field *field, unsigned int bits);



static inline int

regmap_field_force_update_bits(struct regmap_field *field,

			       unsigned int mask, unsigned int val)
@@ -1769,6 +1785,27 @@ regmap_field_force_update_bits(struct regmap_field *field, 
	return -EINVAL;

}



static inline int regmap_field_set_bits(struct regmap_field *field,

					unsigned int bits)

{

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

	return -EINVAL;

}



static inline int regmap_field_clear_bits(struct regmap_field *field,

					  unsigned int bits)

{

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

	return -EINVAL;

}



static inline int regmap_field_test_bits(struct regmap_field *field,

					 unsigned int bits)

{

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

	return -EINVAL;

}



static inline int regmap_fields_write(struct regmap_field *field,

				      unsigned int id, unsigned int val)

{