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
Kirill Smelkov
linux
Commits
56692396
Commit
56692396
authored
Jan 20, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.29' into for-2.6.30
parents
927b0aea
8a9dee59
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
12 deletions
+6
-12
sound/soc/fsl/mpc8610_hpcd.c
sound/soc/fsl/mpc8610_hpcd.c
+6
-12
No files found.
sound/soc/fsl/mpc8610_hpcd.c
View file @
56692396
...
@@ -182,16 +182,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
...
@@ -182,16 +182,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
.
startup
=
mpc8610_hpcd_startup
,
.
startup
=
mpc8610_hpcd_startup
,
};
};
/**
* mpc8610_hpcd_machine: ASoC machine data
*/
static
struct
snd_soc_card
mpc8610_hpcd_machine
=
{
.
probe
=
mpc8610_hpcd_machine_probe
,
.
remove
=
mpc8610_hpcd_machine_remove
,
.
name
=
"MPC8610 HPCD"
,
.
num_links
=
1
,
};
/**
/**
* mpc8610_hpcd_probe: OF probe function for the fabric driver
* mpc8610_hpcd_probe: OF probe function for the fabric driver
*
*
...
@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
...
@@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
machine_data
->
dai
.
codec_dai
=
&
cs4270_dai
;
/* The codec_dai we want */
machine_data
->
dai
.
codec_dai
=
&
cs4270_dai
;
/* The codec_dai we want */
machine_data
->
dai
.
ops
=
&
mpc8610_hpcd_ops
;
machine_data
->
dai
.
ops
=
&
mpc8610_hpcd_ops
;
mpc8610_hpcd_machine
.
dai_link
=
&
machine_data
->
dai
;
machine_data
->
machine
.
probe
=
mpc8610_hpcd_machine_probe
;
machine_data
->
machine
.
remove
=
mpc8610_hpcd_machine_remove
;
machine_data
->
machine
.
name
=
"MPC8610 HPCD"
;
machine_data
->
machine
.
num_links
=
1
;
machine_data
->
machine
.
dai_link
=
&
machine_data
->
dai
;
/* Allocate a new audio platform device structure */
/* Allocate a new audio platform device structure */
sound_device
=
platform_device_alloc
(
"soc-audio"
,
-
1
);
sound_device
=
platform_device_alloc
(
"soc-audio"
,
-
1
);
...
@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
...
@@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
goto
error
;
goto
error
;
}
}
machine_data
->
sound_devdata
.
card
=
&
m
pc8610_hpcd_
machine
;
machine_data
->
sound_devdata
.
card
=
&
m
achine_data
->
machine
;
machine_data
->
sound_devdata
.
codec_dev
=
&
soc_codec_device_cs4270
;
machine_data
->
sound_devdata
.
codec_dev
=
&
soc_codec_device_cs4270
;
machine_data
->
machine
.
platform
=
&
fsl_soc_platform
;
machine_data
->
machine
.
platform
=
&
fsl_soc_platform
;
...
...
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