diff options
| author |   Mark Brown <broonie@kernel.org> | 2017-12-13 16:46:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-13 16:46:37 +0000 |
| commit | 4045559c099998642e35d1444251c3bf042c7a4f (patch) | |
| tree | 6a5cf332ae8f37382c8f31acf9a66a8a6fa78114 /include/linux | |
| parent | regmap: Remove the redundant config to select hwspinlock (diff) | |
| parent | regmap: Disable debugfs when locking is disabled (diff) | |
Merge branches 'topic/hwspinlock' and 'topic/nolock' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-const
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regmap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 15eddc1353ba..072a90229e34 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -264,6 +264,9 @@ typedef void (*regmap_unlock)(void *); * field is NULL but precious_table (see below) is not, the * check is performed on such table (a register is precious if * it belongs to one of the ranges specified by precious_table). + * @disable_locking: This regmap is either protected by external means or + * is guaranteed not be be accessed from multiple threads. + * Don't use any locking mechanisms. * @lock: Optional lock callback (overrides regmap's default lock * function, based on spinlock or mutex). * @unlock: As above for unlocking. @@ -333,6 +336,8 @@ struct regmap_config { bool (*readable_reg)(struct device *dev, unsigned int reg); bool (*volatile_reg)(struct device *dev, unsigned int reg); bool (*precious_reg)(struct device *dev, unsigned int reg); + + bool disable_locking; regmap_lock lock; regmap_unlock unlock; void *lock_arg; |