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

Unverified Commit a4887813 authored by Baolin Wang's avatar Baolin Wang Committed by Mark Brown
Browse files

regmap: Add one flag to indicate if a hwlock should be used 



Since the hwlock id 0 is valid for hardware spinlock core, but now id 0
is treated as one invalid value for regmap. Thus we should add one extra
flag for regmap config to indicate if a hardware spinlock should be used,
then id 0 can be valid for regmap to request.

Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a1a68fca

drivers/base/regmap/regmap.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ struct regmap *__regmap_init(struct device *dev, 
		map->lock = config->lock;

		map->unlock = config->unlock;

		map->lock_arg = config->lock_arg;

	} else if (config->hwlock_id) {

	} else if (config->use_hwlock) {

		map->hwlock = hwspin_lock_request_specific(config->hwlock_id);

		if (!map->hwlock) {

			ret = -ENXIO;

include/linux/regmap.h

+2 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ typedef void (*regmap_unlock)(void *); 
 *

 * @ranges: Array of configuration entries for virtual address ranges.

 * @num_ranges: Number of range configuration entries.

 * @use_hwlock: Indicate if a hardware spinlock should be used.

 * @hwlock_id: Specify the hardware spinlock id.

 * @hwlock_mode: The hardware spinlock mode, should be HWLOCK_IRQSTATE,

 *		 HWLOCK_IRQ or 0.
@@ -365,6 +366,7 @@ struct regmap_config { 
	const struct regmap_range_cfg *ranges;

	unsigned int num_ranges;



	bool use_hwlock;

	unsigned int hwlock_id;

	unsigned int hwlock_mode;

};