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
Kirill Smelkov
linux
Commits
77b2555b
Commit
77b2555b
authored
Sep 14, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-i2c
parents
4117b61f
da16e324
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
drivers/i2c/busses/i2c-pxa.c
drivers/i2c/busses/i2c-pxa.c
+8
-4
No files found.
drivers/i2c/busses/i2c-pxa.c
View file @
77b2555b
...
@@ -914,19 +914,23 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
...
@@ -914,19 +914,23 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
return
ret
;
return
ret
;
}
}
static
u32
i2c_pxa_functionality
(
struct
i2c_adapter
*
adap
)
{
return
I2C_FUNC_I2C
|
I2C_FUNC_SMBUS_EMUL
;
}
static
struct
i2c_algorithm
i2c_pxa_algorithm
=
{
static
struct
i2c_algorithm
i2c_pxa_algorithm
=
{
.
name
=
"PXA-I2C-Algorithm"
,
.
id
=
I2C_ALGO_PXA
,
.
master_xfer
=
i2c_pxa_xfer
,
.
master_xfer
=
i2c_pxa_xfer
,
.
functionality
=
i2c_pxa_functionality
,
};
};
static
struct
pxa_i2c
i2c_pxa
=
{
static
struct
pxa_i2c
i2c_pxa
=
{
.
lock
=
SPIN_LOCK_UNLOCKED
,
.
lock
=
SPIN_LOCK_UNLOCKED
,
.
wait
=
__WAIT_QUEUE_HEAD_INITIALIZER
(
i2c_pxa
.
wait
),
.
wait
=
__WAIT_QUEUE_HEAD_INITIALIZER
(
i2c_pxa
.
wait
),
.
adap
=
{
.
adap
=
{
.
name
=
"pxa2xx-i2c"
,
.
owner
=
THIS_MODULE
,
.
id
=
I2C_ALGO_PXA
,
.
algo
=
&
i2c_pxa_algorithm
,
.
algo
=
&
i2c_pxa_algorithm
,
.
name
=
"pxa2xx-i2c"
,
.
retries
=
5
,
.
retries
=
5
,
},
},
};
};
...
...
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