On Fri, Oct 06, 2017 at 11:53:02AM +0200, Steffen Trumtrar wrote:
> Port the regmap_update_bits function from linux v4.14-rc1 to barebox.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@xxxxxxxxxxxxxx>
> ---
> drivers/base/regmap/regmap.c | 29 +++++++++++++++++++++++++++++
> include/regmap.h | 3 ++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
> index 52b7d88c74ed..67d95fe30a0b 100644
> --- a/drivers/base/regmap/regmap.c
> +++ b/drivers/base/regmap/regmap.c
> @@ -137,6 +137,35 @@ int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val)
> }
>
> /**
> + * regmap_update_bits() - Perform a read/modify/write cycle on a register
> + *
> + * @map: Register map to update
> + * @reg: Register to update
> + * @mask: Bitmask to change
> + * @val: New value for bitmask
> + *
> + * Returns zero for success, a negative number on error.
> + */
> +int regmap_update_bits(struct regmap *map, unsigned int reg,
> + unsigned int mask, unsigned int val)
> +{
> + int ret;
> + unsigned int tmp, orig;
> +
> + ret = regmap_read(map, reg, &orig);
> + if (ret != 0)
> + return ret;
> +
> + tmp = orig & ~mask;
> + tmp |= val & mask;
> +
> + if (tmp != orig)
> + ret = regmap_write(map, reg, tmp);
> +
> + return ret;
> +}
> +
> +/**
> * regmap_write_bits - write bits of a register in a map
> *
> * @map: The map
> diff --git a/include/regmap.h b/include/regmap.h
> index 9675a17b9641..09b7b57d52f3 100644
> --- a/include/regmap.h
> +++ b/include/regmap.h
> @@ -62,6 +62,7 @@ int regmap_get_reg_stride(struct regmap *map);
>
> int regmap_write_bits(struct regmap *map, unsigned int reg,
> unsigned int mask, unsigned int val);
> -
> +int regmap_update_bits(struct regmap *map, unsigned int reg,
> + unsigned int mask, unsigned int val);
>
> #endif /* __REGMAP_H */
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
