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
923125c6
Commit
923125c6
authored
Apr 16, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/hda' into for-linus
parents
872d65f6
8815cd03
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
179 additions
and
33 deletions
+179
-33
sound/pci/hda/hda_intel.c
sound/pci/hda/hda_intel.c
+1
-0
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_realtek.c
+154
-16
sound/pci/hda/patch_via.c
sound/pci/hda/patch_via.c
+24
-17
No files found.
sound/pci/hda/hda_intel.c
View file @
923125c6
...
...
@@ -2272,6 +2272,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = {
SND_PCI_QUIRK
(
0x1458
,
0xa022
,
"ga-ma770-ud3"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1462
,
0x1002
,
"MSI Wind U115"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1565
,
0x820f
,
"Biostar Microtech"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x1565
,
0x8218
,
"Biostar Microtech"
,
POS_FIX_LPIB
),
SND_PCI_QUIRK
(
0x8086
,
0xd601
,
"eMachines T5212"
,
POS_FIX_LPIB
),
{}
};
...
...
sound/pci/hda/patch_realtek.c
View file @
923125c6
This diff is collapsed.
Click to expand it.
sound/pci/hda/patch_via.c
View file @
923125c6
...
...
@@ -476,7 +476,7 @@ static struct snd_kcontrol_new *via_clone_control(struct via_spec *spec,
knew
->
name
=
kstrdup
(
tmpl
->
name
,
GFP_KERNEL
);
if
(
!
knew
->
name
)
return
NULL
;
return
0
;
return
knew
;
}
static
void
via_free_kctls
(
struct
hda_codec
*
codec
)
...
...
@@ -1215,14 +1215,13 @@ static struct snd_kcontrol_new via_hp_mixer[2] = {
},
};
static
int
via_hp_build
(
struct
via_spec
*
sp
ec
)
static
int
via_hp_build
(
struct
hda_codec
*
cod
ec
)
{
struct
via_spec
*
spec
=
codec
->
spec
;
struct
snd_kcontrol_new
*
knew
;
hda_nid_t
nid
;
knew
=
via_clone_control
(
spec
,
&
via_hp_mixer
[
0
]);
if
(
knew
==
NULL
)
return
-
ENOMEM
;
int
nums
;
hda_nid_t
conn
[
HDA_MAX_CONNECTIONS
];
switch
(
spec
->
codec_type
)
{
case
VT1718S
:
...
...
@@ -1239,6 +1238,14 @@ static int via_hp_build(struct via_spec *spec)
break
;
}
nums
=
snd_hda_get_connections
(
codec
,
nid
,
conn
,
HDA_MAX_CONNECTIONS
);
if
(
nums
<=
1
)
return
0
;
knew
=
via_clone_control
(
spec
,
&
via_hp_mixer
[
0
]);
if
(
knew
==
NULL
)
return
-
ENOMEM
;
knew
->
subdevice
=
HDA_SUBDEV_NID_FLAG
|
nid
;
knew
->
private_value
=
nid
;
...
...
@@ -2561,7 +2568,7 @@ static int vt1708_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
return
1
;
...
...
@@ -3087,7 +3094,7 @@ static int vt1709_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
return
1
;
...
...
@@ -3654,7 +3661,7 @@ static int vt1708B_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
return
1
;
...
...
@@ -4140,7 +4147,7 @@ static int vt1708S_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
return
1
;
...
...
@@ -4510,7 +4517,7 @@ static int vt1702_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
return
1
;
}
...
...
@@ -4930,7 +4937,7 @@ static int vt1718S_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
...
...
@@ -5425,7 +5432,7 @@ static int vt1716S_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
via_smart51_build
(
spec
);
...
...
@@ -5781,7 +5788,7 @@ static int vt2002P_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
return
1
;
}
...
...
@@ -6000,12 +6007,12 @@ static int vt1812_auto_create_multi_out_ctls(struct via_spec *spec,
/* Line-Out: PortE */
err
=
via_add_control
(
spec
,
VIA_CTL_WIDGET_VOL
,
"
Master
Front Playback Volume"
,
"Front Playback Volume"
,
HDA_COMPOSE_AMP_VAL
(
0x8
,
3
,
0
,
HDA_OUTPUT
));
if
(
err
<
0
)
return
err
;
err
=
via_add_control
(
spec
,
VIA_CTL_WIDGET_BIND_PIN_MUTE
,
"
Master
Front Playback Switch"
,
"Front Playback Switch"
,
HDA_COMPOSE_AMP_VAL
(
0x28
,
3
,
0
,
HDA_OUTPUT
));
if
(
err
<
0
)
return
err
;
...
...
@@ -6130,7 +6137,7 @@ static int vt1812_parse_auto_config(struct hda_codec *codec)
spec
->
input_mux
=
&
spec
->
private_imux
[
0
];
if
(
spec
->
hp_mux
)
via_hp_build
(
sp
ec
);
via_hp_build
(
cod
ec
);
return
1
;
}
...
...
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