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
fc592b3b
Commit
fc592b3b
authored
Dec 24, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
parents
1521b379
ba5295e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
Documentation/devicetree/bindings/sound/pcm512x.txt
Documentation/devicetree/bindings/sound/pcm512x.txt
+2
-1
sound/soc/codecs/pcm512x-i2c.c
sound/soc/codecs/pcm512x-i2c.c
+4
-0
sound/soc/codecs/pcm512x-spi.c
sound/soc/codecs/pcm512x-spi.c
+4
-0
No files found.
Documentation/devicetree/bindings/sound/pcm512x.txt
View file @
fc592b3b
...
...
@@ -5,7 +5,8 @@ on the board).
Required properties:
- compatible : One of "ti,pcm5121" or "ti,pcm5122"
- compatible : One of "ti,pcm5121", "ti,pcm5122", "ti,pcm5141" or
"ti,pcm5142"
- reg : the I2C address of the device for I2C, the chip select
number for SPI.
...
...
sound/soc/codecs/pcm512x-i2c.c
View file @
fc592b3b
...
...
@@ -46,6 +46,8 @@ static int pcm512x_i2c_remove(struct i2c_client *i2c)
static
const
struct
i2c_device_id
pcm512x_i2c_id
[]
=
{
{
"pcm5121"
,
},
{
"pcm5122"
,
},
{
"pcm5141"
,
},
{
"pcm5142"
,
},
{
}
};
MODULE_DEVICE_TABLE
(
i2c
,
pcm512x_i2c_id
);
...
...
@@ -53,6 +55,8 @@ MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
static
const
struct
of_device_id
pcm512x_of_match
[]
=
{
{
.
compatible
=
"ti,pcm5121"
,
},
{
.
compatible
=
"ti,pcm5122"
,
},
{
.
compatible
=
"ti,pcm5141"
,
},
{
.
compatible
=
"ti,pcm5142"
,
},
{
}
};
MODULE_DEVICE_TABLE
(
of
,
pcm512x_of_match
);
...
...
sound/soc/codecs/pcm512x-spi.c
View file @
fc592b3b
...
...
@@ -43,6 +43,8 @@ static int pcm512x_spi_remove(struct spi_device *spi)
static
const
struct
spi_device_id
pcm512x_spi_id
[]
=
{
{
"pcm5121"
,
},
{
"pcm5122"
,
},
{
"pcm5141"
,
},
{
"pcm5142"
,
},
{
},
};
MODULE_DEVICE_TABLE
(
spi
,
pcm512x_spi_id
);
...
...
@@ -50,6 +52,8 @@ MODULE_DEVICE_TABLE(spi, pcm512x_spi_id);
static
const
struct
of_device_id
pcm512x_of_match
[]
=
{
{
.
compatible
=
"ti,pcm5121"
,
},
{
.
compatible
=
"ti,pcm5122"
,
},
{
.
compatible
=
"ti,pcm5141"
,
},
{
.
compatible
=
"ti,pcm5142"
,
},
{
}
};
MODULE_DEVICE_TABLE
(
of
,
pcm512x_of_match
);
...
...
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