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
3504e85c
Commit
3504e85c
authored
4 years ago
by
Jiri Kosina
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-5.10/i2c-hid' into for-linus
- i2c-hid support for wakeup from suspend-to-idle
parents
9b14b066
203c38fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
drivers/hid/i2c-hid/i2c-hid-core.c
drivers/hid/i2c-hid/i2c-hid-core.c
+12
-0
No files found.
drivers/hid/i2c-hid/i2c-hid-core.c
View file @
3504e85c
...
...
@@ -935,6 +935,14 @@ static void i2c_hid_acpi_fix_up_power(struct device *dev)
acpi_device_fix_up_power
(
adev
);
}
static
void
i2c_hid_acpi_enable_wakeup
(
struct
device
*
dev
)
{
if
(
acpi_gbl_FADT
.
flags
&
ACPI_FADT_LOW_POWER_S0
)
{
device_set_wakeup_capable
(
dev
,
true
);
device_set_wakeup_enable
(
dev
,
false
);
}
}
static
const
struct
acpi_device_id
i2c_hid_acpi_match
[]
=
{
{
"ACPI0C50"
,
0
},
{
"PNP0C50"
,
0
},
...
...
@@ -949,6 +957,8 @@ static inline int i2c_hid_acpi_pdata(struct i2c_client *client,
}
static
inline
void
i2c_hid_acpi_fix_up_power
(
struct
device
*
dev
)
{}
static
inline
void
i2c_hid_acpi_enable_wakeup
(
struct
device
*
dev
)
{}
#endif
#ifdef CONFIG_OF
...
...
@@ -1076,6 +1086,8 @@ static int i2c_hid_probe(struct i2c_client *client,
i2c_hid_acpi_fix_up_power
(
&
client
->
dev
);
i2c_hid_acpi_enable_wakeup
(
&
client
->
dev
);
device_enable_async_suspend
(
&
client
->
dev
);
/* Make sure there is something at this address */
...
...
This diff is collapsed.
Click to expand it.
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