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
555fedac
Commit
555fedac
authored
Aug 08, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'regmap-linus' and 'regmap-interface' into regmap-next
parents
2547e201
40c5cc26
18694886
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
1 deletion
+33
-1
drivers/base/regmap/regmap.c
drivers/base/regmap/regmap.c
+10
-1
include/linux/regmap.h
include/linux/regmap.h
+23
-0
No files found.
drivers/base/regmap/regmap.c
View file @
555fedac
...
@@ -37,6 +37,11 @@ struct regmap {
...
@@ -37,6 +37,11 @@ struct regmap {
void
*
work_buf
;
/* Scratch buffer used to format I/O */
void
*
work_buf
;
/* Scratch buffer used to format I/O */
struct
regmap_format
format
;
/* Buffer format */
struct
regmap_format
format
;
/* Buffer format */
const
struct
regmap_bus
*
bus
;
const
struct
regmap_bus
*
bus
;
unsigned
int
max_register
;
bool
(
*
writeable_reg
)(
struct
device
*
dev
,
unsigned
int
reg
);
bool
(
*
readable_reg
)(
struct
device
*
dev
,
unsigned
int
reg
);
bool
(
*
volatile_reg
)(
struct
device
*
dev
,
unsigned
int
reg
);
};
};
static
void
regmap_format_4_12_write
(
struct
regmap
*
map
,
static
void
regmap_format_4_12_write
(
struct
regmap
*
map
,
...
@@ -116,6 +121,10 @@ struct regmap *regmap_init(struct device *dev,
...
@@ -116,6 +121,10 @@ struct regmap *regmap_init(struct device *dev,
map
->
format
.
val_bytes
=
config
->
val_bits
/
8
;
map
->
format
.
val_bytes
=
config
->
val_bits
/
8
;
map
->
dev
=
dev
;
map
->
dev
=
dev
;
map
->
bus
=
bus
;
map
->
bus
=
bus
;
map
->
max_register
=
config
->
max_register
;
map
->
writeable_reg
=
config
->
writeable_reg
;
map
->
readable_reg
=
config
->
readable_reg
;
map
->
volatile_reg
=
config
->
volatile_reg
;
switch
(
config
->
reg_bits
)
{
switch
(
config
->
reg_bits
)
{
case
4
:
case
4
:
...
@@ -323,7 +332,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
...
@@ -323,7 +332,7 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
u8
[
0
]
|=
map
->
bus
->
read_flag_mask
;
u8
[
0
]
|=
map
->
bus
->
read_flag_mask
;
ret
=
map
->
bus
->
read
(
map
->
dev
,
map
->
work_buf
,
map
->
format
.
reg_bytes
,
ret
=
map
->
bus
->
read
(
map
->
dev
,
map
->
work_buf
,
map
->
format
.
reg_bytes
,
val
,
map
->
format
.
val_bytes
);
val
,
val_len
);
if
(
ret
!=
0
)
if
(
ret
!=
0
)
return
ret
;
return
ret
;
...
...
include/linux/regmap.h
View file @
555fedac
...
@@ -20,9 +20,32 @@
...
@@ -20,9 +20,32 @@
struct
i2c_client
;
struct
i2c_client
;
struct
spi_device
;
struct
spi_device
;
/**
* Configuration for the register map of a device.
*
* @reg_bits: Number of bits in a register address, mandatory.
* @val_bits: Number of bits in a register value, mandatory.
*
* @max_register: Optional, specifies the maximum valid register index.
* @writeable_register: Optional callback returning true if the register
* can be written to.
* @readable_register: Optional callback returning true if the register
* can be read from.
* @volatile_register: Optional callback returning true if the register
* value can't be cached.
* @precious_register: Optional callback returning true if the rgister
* should not be read outside of a call from the driver
* (eg, a clear on read interrupt status register).
*/
struct
regmap_config
{
struct
regmap_config
{
int
reg_bits
;
int
reg_bits
;
int
val_bits
;
int
val_bits
;
unsigned
int
max_register
;
bool
(
*
writeable_reg
)(
struct
device
*
dev
,
unsigned
int
reg
);
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
);
};
};
typedef
int
(
*
regmap_hw_write
)(
struct
device
*
dev
,
const
void
*
data
,
typedef
int
(
*
regmap_hw_write
)(
struct
device
*
dev
,
const
void
*
data
,
...
...
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