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
e72ceb2a
Commit
e72ceb2a
authored
Jan 11, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'asoc/topic/bcm2835' and 'asoc/topic/cleanup' into asoc-next
parents
188bdf72
7905f082
bb18f097
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
14 deletions
+10
-14
sound/soc/bcm/bcm2835-i2s.c
sound/soc/bcm/bcm2835-i2s.c
+6
-6
sound/soc/codecs/twl6040.c
sound/soc/codecs/twl6040.c
+1
-2
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/fsl/mpc8610_hpcd.c
+1
-2
sound/soc/fsl/p1022_ds.c
sound/soc/fsl/p1022_ds.c
+1
-2
sound/soc/fsl/p1022_rdk.c
sound/soc/fsl/p1022_rdk.c
+1
-2
No files found.
sound/soc/bcm/bcm2835-i2s.c
View file @
e72ceb2a
...
@@ -31,20 +31,20 @@
...
@@ -31,20 +31,20 @@
* General Public License for more details.
* General Public License for more details.
*/
*/
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/init.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/module.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/clk.h>
#include <sound/core.h>
#include <sound/core.h>
#include <sound/dmaengine_pcm.h>
#include <sound/initval.h>
#include <sound/pcm.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/pcm_params.h>
#include <sound/initval.h>
#include <sound/soc.h>
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
/* Clock registers */
/* Clock registers */
#define BCM2835_CLK_PCMCTL_REG 0x00
#define BCM2835_CLK_PCMCTL_REG 0x00
...
...
sound/soc/codecs/twl6040.c
View file @
e72ceb2a
...
@@ -1097,8 +1097,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
...
@@ -1097,8 +1097,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
{
{
struct
twl6040_data
*
priv
;
struct
twl6040_data
*
priv
;
struct
twl6040
*
twl6040
=
dev_get_drvdata
(
codec
->
dev
->
parent
);
struct
twl6040
*
twl6040
=
dev_get_drvdata
(
codec
->
dev
->
parent
);
struct
platform_device
*
pdev
=
container_of
(
codec
->
dev
,
struct
platform_device
*
pdev
=
to_platform_device
(
codec
->
dev
);
struct
platform_device
,
dev
);
int
ret
=
0
;
int
ret
=
0
;
priv
=
devm_kzalloc
(
codec
->
dev
,
sizeof
(
*
priv
),
GFP_KERNEL
);
priv
=
devm_kzalloc
(
codec
->
dev
,
sizeof
(
*
priv
),
GFP_KERNEL
);
...
...
sound/soc/fsl/mpc8610_hpcd.c
View file @
e72ceb2a
...
@@ -189,8 +189,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
...
@@ -189,8 +189,7 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
{
{
struct
device
*
dev
=
pdev
->
dev
.
parent
;
struct
device
*
dev
=
pdev
->
dev
.
parent
;
/* ssi_pdev is the platform device for the SSI node that probed us */
/* ssi_pdev is the platform device for the SSI node that probed us */
struct
platform_device
*
ssi_pdev
=
struct
platform_device
*
ssi_pdev
=
to_platform_device
(
dev
);
container_of
(
dev
,
struct
platform_device
,
dev
);
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
codec_np
=
NULL
;
struct
device_node
*
codec_np
=
NULL
;
struct
mpc8610_hpcd_data
*
machine_data
;
struct
mpc8610_hpcd_data
*
machine_data
;
...
...
sound/soc/fsl/p1022_ds.c
View file @
e72ceb2a
...
@@ -199,8 +199,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
...
@@ -199,8 +199,7 @@ static int p1022_ds_probe(struct platform_device *pdev)
{
{
struct
device
*
dev
=
pdev
->
dev
.
parent
;
struct
device
*
dev
=
pdev
->
dev
.
parent
;
/* ssi_pdev is the platform device for the SSI node that probed us */
/* ssi_pdev is the platform device for the SSI node that probed us */
struct
platform_device
*
ssi_pdev
=
struct
platform_device
*
ssi_pdev
=
to_platform_device
(
dev
);
container_of
(
dev
,
struct
platform_device
,
dev
);
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
codec_np
=
NULL
;
struct
device_node
*
codec_np
=
NULL
;
struct
machine_data
*
mdata
;
struct
machine_data
*
mdata
;
...
...
sound/soc/fsl/p1022_rdk.c
View file @
e72ceb2a
...
@@ -203,8 +203,7 @@ static int p1022_rdk_probe(struct platform_device *pdev)
...
@@ -203,8 +203,7 @@ static int p1022_rdk_probe(struct platform_device *pdev)
{
{
struct
device
*
dev
=
pdev
->
dev
.
parent
;
struct
device
*
dev
=
pdev
->
dev
.
parent
;
/* ssi_pdev is the platform device for the SSI node that probed us */
/* ssi_pdev is the platform device for the SSI node that probed us */
struct
platform_device
*
ssi_pdev
=
struct
platform_device
*
ssi_pdev
=
to_platform_device
(
dev
);
container_of
(
dev
,
struct
platform_device
,
dev
);
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
np
=
ssi_pdev
->
dev
.
of_node
;
struct
device_node
*
codec_np
=
NULL
;
struct
device_node
*
codec_np
=
NULL
;
struct
machine_data
*
mdata
;
struct
machine_data
*
mdata
;
...
...
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