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
e56236b0
Commit
e56236b0
authored
Jan 31, 2018
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-4.16/i2c-hid' into for-linus
parents
740c84ee
847989e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
Documentation/devicetree/bindings/input/hid-over-i2c.txt
Documentation/devicetree/bindings/input/hid-over-i2c.txt
+1
-1
drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/i2c-hid/i2c-hid.c
+13
-5
No files found.
Documentation/devicetree/bindings/input/hid-over-i2c.txt
View file @
e56236b0
...
@@ -31,7 +31,7 @@ device-specific compatible properties, which should be used in addition to the
...
@@ -31,7 +31,7 @@ device-specific compatible properties, which should be used in addition to the
- vdd-supply: phandle of the regulator that provides the supply voltage.
- vdd-supply: phandle of the regulator that provides the supply voltage.
- post-power-on-delay-ms: time required by the device after enabling its regulators
- post-power-on-delay-ms: time required by the device after enabling its regulators
before it is ready for communication. Must be used with 'vdd-supply'
.
or powering it on, before it is ready for communication
.
Example:
Example:
...
...
drivers/hid/i2c-hid/i2c-hid.c
View file @
e56236b0
...
@@ -934,11 +934,6 @@ static int i2c_hid_of_probe(struct i2c_client *client,
...
@@ -934,11 +934,6 @@ static int i2c_hid_of_probe(struct i2c_client *client,
}
}
pdata
->
hid_descriptor_address
=
val
;
pdata
->
hid_descriptor_address
=
val
;
ret
=
of_property_read_u32
(
dev
->
of_node
,
"post-power-on-delay-ms"
,
&
val
);
if
(
!
ret
)
pdata
->
post_power_delay_ms
=
val
;
return
0
;
return
0
;
}
}
...
@@ -955,6 +950,16 @@ static inline int i2c_hid_of_probe(struct i2c_client *client,
...
@@ -955,6 +950,16 @@ static inline int i2c_hid_of_probe(struct i2c_client *client,
}
}
#endif
#endif
static
void
i2c_hid_fwnode_probe
(
struct
i2c_client
*
client
,
struct
i2c_hid_platform_data
*
pdata
)
{
u32
val
;
if
(
!
device_property_read_u32
(
&
client
->
dev
,
"post-power-on-delay-ms"
,
&
val
))
pdata
->
post_power_delay_ms
=
val
;
}
static
int
i2c_hid_probe
(
struct
i2c_client
*
client
,
static
int
i2c_hid_probe
(
struct
i2c_client
*
client
,
const
struct
i2c_device_id
*
dev_id
)
const
struct
i2c_device_id
*
dev_id
)
{
{
...
@@ -998,6 +1003,9 @@ static int i2c_hid_probe(struct i2c_client *client,
...
@@ -998,6 +1003,9 @@ static int i2c_hid_probe(struct i2c_client *client,
ihid
->
pdata
=
*
platform_data
;
ihid
->
pdata
=
*
platform_data
;
}
}
/* Parse platform agnostic common properties from ACPI / device tree */
i2c_hid_fwnode_probe
(
client
,
&
ihid
->
pdata
);
ihid
->
pdata
.
supply
=
devm_regulator_get
(
&
client
->
dev
,
"vdd"
);
ihid
->
pdata
.
supply
=
devm_regulator_get
(
&
client
->
dev
,
"vdd"
);
if
(
IS_ERR
(
ihid
->
pdata
.
supply
))
{
if
(
IS_ERR
(
ihid
->
pdata
.
supply
))
{
ret
=
PTR_ERR
(
ihid
->
pdata
.
supply
);
ret
=
PTR_ERR
(
ihid
->
pdata
.
supply
);
...
...
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