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
61461241
Commit
61461241
authored
Feb 13, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
965b76d2
6ed8f148
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
8 deletions
+38
-8
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+22
-4
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-evm.c
+15
-3
sound/soc/soc-core.c
sound/soc/soc-core.c
+1
-1
No files found.
sound/soc/codecs/wm8994.c
View file @
61461241
...
...
@@ -1287,9 +1287,9 @@ SND_SOC_DAPM_SUPPLY("DSPINTCLK", WM8994_CLOCKING_1, 1, 0, NULL, 0),
SND_SOC_DAPM_SUPPLY
(
"AIF1CLK"
,
WM8994_AIF1_CLOCKING_1
,
0
,
0
,
NULL
,
0
),
SND_SOC_DAPM_SUPPLY
(
"AIF2CLK"
,
WM8994_AIF2_CLOCKING_1
,
0
,
0
,
NULL
,
0
),
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC1L"
,
"AIF1 Capture"
,
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC1L"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_4
,
9
,
0
),
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC1R"
,
"AIF1 Capture"
,
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC1R"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_4
,
8
,
0
),
SND_SOC_DAPM_AIF_IN_E
(
"AIF1DAC1L"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_5
,
9
,
0
,
wm8958_aif_ev
,
...
...
@@ -1298,9 +1298,9 @@ SND_SOC_DAPM_AIF_IN_E("AIF1DAC1R", NULL, 0,
WM8994_POWER_MANAGEMENT_5
,
8
,
0
,
wm8958_aif_ev
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_POST_PMD
),
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC2L"
,
"AIF1 Capture"
,
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC2L"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_4
,
11
,
0
),
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC2R"
,
"AIF1 Capture"
,
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADC2R"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_4
,
10
,
0
),
SND_SOC_DAPM_AIF_IN_E
(
"AIF1DAC2L"
,
NULL
,
0
,
WM8994_POWER_MANAGEMENT_5
,
11
,
0
,
wm8958_aif_ev
,
...
...
@@ -1345,6 +1345,7 @@ SND_SOC_DAPM_AIF_IN_E("AIF2DACR", NULL, 0,
SND_SOC_DAPM_AIF_IN
(
"AIF1DACDAT"
,
"AIF1 Playback"
,
0
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_AIF_IN
(
"AIF2DACDAT"
,
"AIF2 Playback"
,
0
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_AIF_OUT
(
"AIF1ADCDAT"
,
"AIF1 Capture"
,
0
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_AIF_OUT
(
"AIF2ADCDAT"
,
"AIF2 Capture"
,
0
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_MUX
(
"AIF1DAC Mux"
,
SND_SOC_NOPM
,
0
,
0
,
&
aif1dac_mux
),
...
...
@@ -1546,6 +1547,11 @@ static const struct snd_soc_dapm_route intercon[] = {
{
"AIF2DAC2R Mixer"
,
"Left Sidetone Switch"
,
"Left Sidetone"
},
{
"AIF2DAC2R Mixer"
,
"Right Sidetone Switch"
,
"Right Sidetone"
},
{
"AIF1ADCDAT"
,
NULL
,
"AIF1ADC1L"
},
{
"AIF1ADCDAT"
,
NULL
,
"AIF1ADC1R"
},
{
"AIF1ADCDAT"
,
NULL
,
"AIF1ADC2L"
},
{
"AIF1ADCDAT"
,
NULL
,
"AIF1ADC2R"
},
{
"AIF2ADCDAT"
,
NULL
,
"AIF2ADC Mux"
},
/* AIF3 output */
...
...
@@ -1578,6 +1584,13 @@ static const struct snd_soc_dapm_route intercon[] = {
{
"Right Headphone Mux"
,
"DAC"
,
"DAC1R"
},
};
static
const
struct
snd_soc_dapm_route
wm8994_revd_intercon
[]
=
{
{
"AIF1DACDAT"
,
NULL
,
"AIF2DACDAT"
},
{
"AIF2DACDAT"
,
NULL
,
"AIF1DACDAT"
},
{
"AIF1ADCDAT"
,
NULL
,
"AIF2ADCDAT"
},
{
"AIF2ADCDAT"
,
NULL
,
"AIF1ADCDAT"
},
};
static
const
struct
snd_soc_dapm_route
wm8994_intercon
[]
=
{
{
"AIF2DACL"
,
NULL
,
"AIF2DAC Mux"
},
{
"AIF2DACR"
,
NULL
,
"AIF2DAC Mux"
},
...
...
@@ -3129,6 +3142,11 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
case
WM8994
:
snd_soc_dapm_add_routes
(
dapm
,
wm8994_intercon
,
ARRAY_SIZE
(
wm8994_intercon
));
if
(
wm8994
->
revision
<
4
)
snd_soc_dapm_add_routes
(
dapm
,
wm8994_revd_intercon
,
ARRAY_SIZE
(
wm8994_revd_intercon
));
break
;
case
WM8958
:
snd_soc_dapm_add_routes
(
dapm
,
wm8958_intercon
,
...
...
sound/soc/davinci/davinci-evm.c
View file @
61461241
...
...
@@ -218,7 +218,19 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = {
.
ops
=
&
evm_spdif_ops
,
},
};
static
struct
snd_soc_dai_link
da8xx_evm_dai
=
{
static
struct
snd_soc_dai_link
da830_evm_dai
=
{
.
name
=
"TLV320AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-mcasp.1"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_name
=
"tlv320aic3x-codec.1-0018"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
init
=
evm_aic3x_init
,
.
ops
=
&
evm_ops
,
};
static
struct
snd_soc_dai_link
da850_evm_dai
=
{
.
name
=
"TLV320AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-mcasp.0"
,
...
...
@@ -259,13 +271,13 @@ static struct snd_soc_card dm6467_snd_soc_card_evm = {
static
struct
snd_soc_card
da830_snd_soc_card
=
{
.
name
=
"DA830/OMAP-L137 EVM"
,
.
dai_link
=
&
da8
xx
_evm_dai
,
.
dai_link
=
&
da8
30
_evm_dai
,
.
num_links
=
1
,
};
static
struct
snd_soc_card
da850_snd_soc_card
=
{
.
name
=
"DA850/OMAP-L138 EVM"
,
.
dai_link
=
&
da8
xx
_evm_dai
,
.
dai_link
=
&
da8
50
_evm_dai
,
.
num_links
=
1
,
};
...
...
sound/soc/soc-core.c
View file @
61461241
...
...
@@ -1449,6 +1449,7 @@ static int soc_post_component_init(struct snd_soc_card *card,
rtd
=
&
card
->
rtd_aux
[
num
];
name
=
aux_dev
->
name
;
}
rtd
->
card
=
card
;
/* machine controls, routes and widgets are not prefixed */
temp
=
codec
->
name_prefix
;
...
...
@@ -1471,7 +1472,6 @@ static int soc_post_component_init(struct snd_soc_card *card,
/* register the rtd device */
rtd
->
codec
=
codec
;
rtd
->
card
=
card
;
rtd
->
dev
.
parent
=
card
->
dev
;
rtd
->
dev
.
release
=
rtd_release
;
rtd
->
dev
.
init_name
=
name
;
...
...
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