Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
88507a2b
Commit
88507a2b
authored
Sep 29, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
parents
18a64d84
336fb81b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
MAINTAINERS
MAINTAINERS
+1
-0
drivers/base/regmap/Kconfig
drivers/base/regmap/Kconfig
+3
-0
drivers/base/regmap/internal.h
drivers/base/regmap/internal.h
+4
-2
No files found.
MAINTAINERS
View file @
88507a2b
...
@@ -7596,6 +7596,7 @@ F: fs/reiserfs/
...
@@ -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/
...
...
drivers/base/regmap/Kconfig
View file @
88507a2b
...
@@ -11,12 +11,15 @@ config REGMAP
...
@@ -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
...
...
drivers/base/regmap/internal.h
View file @
88507a2b
...
@@ -49,8 +49,10 @@ struct regmap_async {
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment