Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
be0ae923
Commit
be0ae923
authored
Aug 31, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into topic/hda
Conflicts: sound/pci/hda/patch_realtek.c
parents
e9af4f36
a3f730af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
14 deletions
+21
-14
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+20
-14
sound/pci/hda/patch_via.c
sound/pci/hda/patch_via.c
+1
-0
No files found.
sound/pci/hda/patch_realtek.c
View file @
be0ae923
...
...
@@ -6698,9 +6698,9 @@ static struct hda_verb alc885_mbp_ch2_init[] = {
};
/*
*
6
ch mode
*
4
ch mode
*/
static
struct
hda_verb
alc885_mbp_ch
6
_init
[]
=
{
static
struct
hda_verb
alc885_mbp_ch
4
_init
[]
=
{
{
0x1a
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
{
0x1a
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_UNMUTE
},
{
0x1a
,
AC_VERB_SET_CONNECT_SEL
,
0x01
},
...
...
@@ -6709,9 +6709,9 @@ static struct hda_verb alc885_mbp_ch6_init[] = {
{
}
/* end */
};
static
struct
hda_channel_mode
alc885_mbp_
6
ch_modes
[
2
]
=
{
static
struct
hda_channel_mode
alc885_mbp_
4
ch_modes
[
2
]
=
{
{
2
,
alc885_mbp_ch2_init
},
{
6
,
alc885_mbp_ch6
_init
},
{
4
,
alc885_mbp_ch4
_init
},
};
/*
...
...
@@ -6955,10 +6955,11 @@ static struct snd_kcontrol_new alc882_base_mixer[] = {
};
static
struct
snd_kcontrol_new
alc885_mbp3_mixer
[]
=
{
HDA_CODEC_VOLUME
(
"Front Playback Volume"
,
0x0c
,
0x00
,
HDA_OUTPUT
),
HDA_BIND_MUTE
(
"Front Playback Switch"
,
0x0c
,
0x02
,
HDA_INPUT
),
HDA_CODEC_MUTE
(
"Speaker Playback Switch"
,
0x14
,
0x00
,
HDA_OUTPUT
),
HDA_CODEC_VOLUME
(
"Line-Out Playback Volume"
,
0x0d
,
0x00
,
HDA_OUTPUT
),
HDA_CODEC_VOLUME
(
"Speaker Playback Volume"
,
0x0c
,
0x00
,
HDA_OUTPUT
),
HDA_BIND_MUTE
(
"Speaker Playback Switch"
,
0x0c
,
0x02
,
HDA_INPUT
),
HDA_CODEC_VOLUME
(
"Headphone Playback Volume"
,
0x0e
,
0x00
,
HDA_OUTPUT
),
HDA_BIND_MUTE
(
"Headphone Playback Switch"
,
0x0e
,
0x02
,
HDA_INPUT
),
HDA_CODEC_VOLUME
(
"Surround Playback Volume"
,
0x0d
,
0x00
,
HDA_OUTPUT
),
HDA_CODEC_VOLUME
(
"Line Playback Volume"
,
0x0b
,
0x02
,
HDA_INPUT
),
HDA_CODEC_MUTE
(
"Line Playback Switch"
,
0x0b
,
0x02
,
HDA_INPUT
),
HDA_CODEC_VOLUME
(
"Mic Playback Volume"
,
0x0b
,
0x00
,
HDA_INPUT
),
...
...
@@ -7387,14 +7388,18 @@ static struct hda_verb alc885_mbp3_init_verbs[] = {
{
0x0d
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_ZERO
},
{
0x0d
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_IN_MUTE
(
0
)},
{
0x0d
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_IN_MUTE
(
1
)},
/* HP mixer */
{
0x0e
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_ZERO
},
{
0x0e
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_IN_MUTE
(
0
)},
{
0x0e
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_IN_MUTE
(
1
)},
/* Front Pin: output 0 (0x0c) */
{
0x14
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_OUT
},
{
0x14
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_UNMUTE
},
{
0x14
,
AC_VERB_SET_CONNECT_SEL
,
0x00
},
/* HP Pin: output 0 (0x0
d
) */
/* HP Pin: output 0 (0x0
e
) */
{
0x15
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
0xc4
},
{
0x15
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_MUTE
},
{
0x15
,
AC_VERB_SET_CONNECT_SEL
,
0x0
0
},
{
0x15
,
AC_VERB_SET_AMP_GAIN_MUTE
,
AMP_OUT_
UN
MUTE
},
{
0x15
,
AC_VERB_SET_CONNECT_SEL
,
0x0
2
},
{
0x15
,
AC_VERB_SET_UNSOLICITED_ENABLE
,
ALC880_HP_EVENT
|
AC_USRSP_EN
},
/* Mic (rear) pin: input vref at 80% */
{
0x18
,
AC_VERB_SET_PIN_WIDGET_CONTROL
,
PIN_VREF80
},
...
...
@@ -8872,10 +8877,11 @@ static struct alc_config_preset alc882_presets[] = {
.
mixers
=
{
alc885_mbp3_mixer
,
alc882_chmode_mixer
},
.
init_verbs
=
{
alc885_mbp3_init_verbs
,
alc880_gpio1_init_verbs
},
.
num_dacs
=
ARRAY_SIZE
(
alc882_dac_nids
)
,
.
num_dacs
=
2
,
.
dac_nids
=
alc882_dac_nids
,
.
channel_mode
=
alc885_mbp_6ch_modes
,
.
num_channel_mode
=
ARRAY_SIZE
(
alc885_mbp_6ch_modes
),
.
hp_nid
=
0x04
,
.
channel_mode
=
alc885_mbp_4ch_modes
,
.
num_channel_mode
=
ARRAY_SIZE
(
alc885_mbp_4ch_modes
),
.
input_mux
=
&
alc882_capture_source
,
.
dig_out_nid
=
ALC882_DIGOUT_NID
,
.
dig_in_nid
=
ALC882_DIGIN_NID
,
...
...
sound/pci/hda/patch_via.c
View file @
be0ae923
...
...
@@ -1394,6 +1394,7 @@ static int patch_vt1708(struct hda_codec *codec)
if
(
!
spec
->
adc_nids
&&
spec
->
input_mux
)
{
spec
->
adc_nids
=
vt1708_adc_nids
;
spec
->
num_adc_nids
=
ARRAY_SIZE
(
vt1708_adc_nids
);
get_mux_nids
(
codec
);
spec
->
mixers
[
spec
->
num_mixers
]
=
vt1708_capture_mixer
;
spec
->
num_mixers
++
;
}
...
...
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