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
38e3c63d
Commit
38e3c63d
authored
May 27, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next
parents
5d8cf768
f5cc1772
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
0 deletions
+10
-0
sound/soc/codecs/tlv320aic31xx.c
sound/soc/codecs/tlv320aic31xx.c
+10
-0
No files found.
sound/soc/codecs/tlv320aic31xx.c
View file @
38e3c63d
...
...
@@ -28,6 +28,7 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/acpi.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
#include <linux/slab.h>
...
...
@@ -1280,10 +1281,19 @@ static const struct i2c_device_id aic31xx_i2c_id[] = {
};
MODULE_DEVICE_TABLE
(
i2c
,
aic31xx_i2c_id
);
#ifdef CONFIG_ACPI
static
const
struct
acpi_device_id
aic31xx_acpi_match
[]
=
{
{
"10TI3100"
,
0
},
{
}
};
MODULE_DEVICE_TABLE
(
acpi
,
aic31xx_acpi_match
);
#endif
static
struct
i2c_driver
aic31xx_i2c_driver
=
{
.
driver
=
{
.
name
=
"tlv320aic31xx-codec"
,
.
of_match_table
=
of_match_ptr
(
tlv320aic31xx_of_match
),
.
acpi_match_table
=
ACPI_PTR
(
aic31xx_acpi_match
),
},
.
probe
=
aic31xx_i2c_probe
,
.
remove
=
aic31xx_i2c_remove
,
...
...
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