leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
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 REGISTER MAP ABSTRACTION
M: Mark Brown <broonie@kernel.org> 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 T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
S: Supported S: Supported
F: drivers/base/regmap/ F: drivers/base/regmap/

3
drivers/base/regmap/Kconfig
View File

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

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

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