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
f1608cca
Commit
f1608cca
authored
Dec 04, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.33' into for-2.6.34
parents
a47979b5
43f0de8d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
arch/arm/plat-s3c64xx/dev-audio.c
arch/arm/plat-s3c64xx/dev-audio.c
+2
-2
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c
+8
-8
No files found.
arch/arm/plat-s3c64xx/dev-audio.c
View file @
f1608cca
...
...
@@ -118,7 +118,7 @@ static struct resource s3c64xx_pcm0_resource[] = {
},
};
struct
s3c_audio_pdata
s3c_pcm0_pdata
=
{
st
atic
st
ruct
s3c_audio_pdata
s3c_pcm0_pdata
=
{
.
cfg_gpio
=
s3c64xx_pcm_cfg_gpio
,
};
...
...
@@ -151,7 +151,7 @@ static struct resource s3c64xx_pcm1_resource[] = {
},
};
struct
s3c_audio_pdata
s3c_pcm1_pdata
=
{
st
atic
st
ruct
s3c_audio_pdata
s3c_pcm1_pdata
=
{
.
cfg_gpio
=
s3c64xx_pcm_cfg_gpio
,
};
...
...
sound/soc/codecs/wm_hubs.c
View file @
f1608cca
...
...
@@ -438,11 +438,11 @@ static const struct snd_soc_dapm_widget analogue_dapm_widgets[] = {
SND_SOC_DAPM_INPUT
(
"IN1LN"
),
SND_SOC_DAPM_INPUT
(
"IN1LP"
),
SND_SOC_DAPM_INPUT
(
"IN2LN"
),
SND_SOC_DAPM_INPUT
(
"IN2LP
/
VXRN"
),
SND_SOC_DAPM_INPUT
(
"IN2LP
:
VXRN"
),
SND_SOC_DAPM_INPUT
(
"IN1RN"
),
SND_SOC_DAPM_INPUT
(
"IN1RP"
),
SND_SOC_DAPM_INPUT
(
"IN2RN"
),
SND_SOC_DAPM_INPUT
(
"IN2RP
/
VXRP"
),
SND_SOC_DAPM_INPUT
(
"IN2RP
:
VXRP"
),
SND_SOC_DAPM_MICBIAS
(
"MICBIAS2"
,
WM8993_POWER_MANAGEMENT_1
,
5
,
0
),
SND_SOC_DAPM_MICBIAS
(
"MICBIAS1"
,
WM8993_POWER_MANAGEMENT_1
,
4
,
0
),
...
...
@@ -537,14 +537,14 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
{
"IN1R PGA"
,
"IN1RP Switch"
,
"IN1RP"
},
{
"IN1R PGA"
,
"IN1RN Switch"
,
"IN1RN"
},
{
"IN2L PGA"
,
"IN2LP Switch"
,
"IN2LP
/
VXRN"
},
{
"IN2L PGA"
,
"IN2LP Switch"
,
"IN2LP
:
VXRN"
},
{
"IN2L PGA"
,
"IN2LN Switch"
,
"IN2LN"
},
{
"IN2R PGA"
,
"IN2RP Switch"
,
"IN2RP
/
VXRP"
},
{
"IN2R PGA"
,
"IN2RP Switch"
,
"IN2RP
:
VXRP"
},
{
"IN2R PGA"
,
"IN2RN Switch"
,
"IN2RN"
},
{
"Direct Voice"
,
NULL
,
"IN2LP
/
VXRN"
},
{
"Direct Voice"
,
NULL
,
"IN2RP
/
VXRP"
},
{
"Direct Voice"
,
NULL
,
"IN2LP
:
VXRN"
},
{
"Direct Voice"
,
NULL
,
"IN2RP
:
VXRP"
},
{
"MIXINL"
,
"IN1L Switch"
,
"IN1L PGA"
},
{
"MIXINL"
,
"IN2L Switch"
,
"IN2L PGA"
},
...
...
@@ -565,7 +565,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
{
"Left Output Mixer"
,
"Right Input Switch"
,
"MIXINR"
},
{
"Left Output Mixer"
,
"IN2RN Switch"
,
"IN2RN"
},
{
"Left Output Mixer"
,
"IN2LN Switch"
,
"IN2LN"
},
{
"Left Output Mixer"
,
"IN2LP Switch"
,
"IN2LP
/
VXRN"
},
{
"Left Output Mixer"
,
"IN2LP Switch"
,
"IN2LP
:
VXRN"
},
{
"Left Output Mixer"
,
"IN1L Switch"
,
"IN1L PGA"
},
{
"Left Output Mixer"
,
"IN1R Switch"
,
"IN1R PGA"
},
...
...
@@ -573,7 +573,7 @@ static const struct snd_soc_dapm_route analogue_routes[] = {
{
"Right Output Mixer"
,
"Right Input Switch"
,
"MIXINR"
},
{
"Right Output Mixer"
,
"IN2LN Switch"
,
"IN2LN"
},
{
"Right Output Mixer"
,
"IN2RN Switch"
,
"IN2RN"
},
{
"Right Output Mixer"
,
"IN2RP Switch"
,
"IN2RP
/
VXRP"
},
{
"Right Output Mixer"
,
"IN2RP Switch"
,
"IN2RP
:
VXRP"
},
{
"Right Output Mixer"
,
"IN1L Switch"
,
"IN1L PGA"
},
{
"Right Output Mixer"
,
"IN1R Switch"
,
"IN1R PGA"
},
...
...
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