p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'regmap/topic/core' into regmap-next

This commit is contained in:
Mark Brown 2014-09-29 20:49:41 +01:00
parent 18a64d844c 336fb81b31
commit 88507a2ba8
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -7596,6 +7596,7 @@ F: fs/reiserfs/
REGISTER MAP ABSTRACTION
M: Mark Brown <broonie@kernel.org>
L: linux-kernel@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
S: Supported
F: drivers/base/regmap/

3
drivers/base/regmap/Kconfig
View File

@ -11,12 +11,15 @@ config REGMAP
config REGMAP_I2C
tristate
depends on I2C
config REGMAP_SPI
tristate
depends on SPI
config REGMAP_SPMI
tristate
depends on SPMI
config REGMAP_MMIO
tristate

6
drivers/base/regmap/internal.h
View File

@ -49,8 +49,10 @@ struct regmap_async {
};
struct regmap {
struct mutex mutex;
spinlock_t spinlock;
union {
struct mutex mutex;
spinlock_t spinlock;
};
unsigned long spinlock_flags;
regmap_lock lock;
regmap_unlock unlock;