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
c1e0bb92
Commit
c1e0bb92
authored
Aug 30, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ALSA: hda - Use new inputs[] field to parse input-pins for CirrusLogic codecs
Signed-off-by:
Takashi Iwai
<
tiwai@suse.de
>
parent
fa4968a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
21 deletions
+17
-21
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_cirrus.c
+17
-21
No files found.
sound/pci/hda/patch_cirrus.c
View file @
c1e0bb92
...
@@ -329,7 +329,7 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx)
...
@@ -329,7 +329,7 @@ static int is_ext_mic(struct hda_codec *codec, unsigned int idx)
{
{
struct
cs_spec
*
spec
=
codec
->
spec
;
struct
cs_spec
*
spec
=
codec
->
spec
;
struct
auto_pin_cfg
*
cfg
=
&
spec
->
autocfg
;
struct
auto_pin_cfg
*
cfg
=
&
spec
->
autocfg
;
hda_nid_t
pin
=
cfg
->
input
_pins
[
idx
]
;
hda_nid_t
pin
=
cfg
->
input
s
[
idx
].
pin
;
unsigned
int
val
=
snd_hda_query_pin_caps
(
codec
,
pin
);
unsigned
int
val
=
snd_hda_query_pin_caps
(
codec
,
pin
);
if
(
!
(
val
&
AC_PINCAP_PRES_DETECT
))
if
(
!
(
val
&
AC_PINCAP_PRES_DETECT
))
return
0
;
return
0
;
...
@@ -424,10 +424,8 @@ static int parse_input(struct hda_codec *codec)
...
@@ -424,10 +424,8 @@ static int parse_input(struct hda_codec *codec)
struct
auto_pin_cfg
*
cfg
=
&
spec
->
autocfg
;
struct
auto_pin_cfg
*
cfg
=
&
spec
->
autocfg
;
int
i
;
int
i
;
for
(
i
=
0
;
i
<
AUTO_PIN_LAST
;
i
++
)
{
for
(
i
=
0
;
i
<
cfg
->
num_inputs
;
i
++
)
{
hda_nid_t
pin
=
cfg
->
input_pins
[
i
];
hda_nid_t
pin
=
cfg
->
inputs
[
i
].
pin
;
if
(
!
pin
)
continue
;
spec
->
input_idx
[
spec
->
num_inputs
]
=
i
;
spec
->
input_idx
[
spec
->
num_inputs
]
=
i
;
spec
->
capsrc_idx
[
i
]
=
spec
->
num_inputs
++
;
spec
->
capsrc_idx
[
i
]
=
spec
->
num_inputs
++
;
spec
->
cur_input
=
i
;
spec
->
cur_input
=
i
;
...
@@ -438,16 +436,17 @@ static int parse_input(struct hda_codec *codec)
...
@@ -438,16 +436,17 @@ static int parse_input(struct hda_codec *codec)
/* check whether the automatic mic switch is available */
/* check whether the automatic mic switch is available */
if
(
spec
->
num_inputs
==
2
&&
if
(
spec
->
num_inputs
==
2
&&
spec
->
adc_nid
[
AUTO_PIN_MIC
]
&&
spec
->
adc_nid
[
AUTO_PIN_FRONT_MIC
])
{
cfg
->
inputs
[
0
].
type
<=
AUTO_PIN_FRONT_MIC
&&
if
(
is_ext_mic
(
codec
,
cfg
->
input_pins
[
AUTO_PIN_FRONT_MIC
]))
{
cfg
->
inputs
[
1
].
type
==
AUTO_PIN_FRONT_MIC
)
{
if
(
!
is_ext_mic
(
codec
,
cfg
->
input_pins
[
AUTO_PIN_MIC
]))
{
if
(
is_ext_mic
(
codec
,
cfg
->
inputs
[
0
].
pin
))
{
if
(
!
is_ext_mic
(
codec
,
cfg
->
inputs
[
1
].
pin
))
{
spec
->
mic_detect
=
1
;
spec
->
mic_detect
=
1
;
spec
->
automic_idx
=
AUTO_PIN_FRONT_MIC
;
spec
->
automic_idx
=
0
;
}
}
}
else
{
}
else
{
if
(
is_ext_mic
(
codec
,
cfg
->
input
_pins
[
AUTO_PIN_MIC
]
))
{
if
(
is_ext_mic
(
codec
,
cfg
->
input
s
[
1
].
pin
))
{
spec
->
mic_detect
=
1
;
spec
->
mic_detect
=
1
;
spec
->
automic_idx
=
AUTO_PIN_MIC
;
spec
->
automic_idx
=
1
;
}
}
}
}
}
}
...
@@ -853,15 +852,12 @@ static void cs_automic(struct hda_codec *codec)
...
@@ -853,15 +852,12 @@ static void cs_automic(struct hda_codec *codec)
hda_nid_t
nid
;
hda_nid_t
nid
;
unsigned
int
present
;
unsigned
int
present
;
nid
=
cfg
->
input
_pins
[
spec
->
automic_idx
]
;
nid
=
cfg
->
input
s
[
spec
->
automic_idx
].
pin
;
present
=
snd_hda_jack_detect
(
codec
,
nid
);
present
=
snd_hda_jack_detect
(
codec
,
nid
);
if
(
present
)
if
(
present
)
change_cur_input
(
codec
,
spec
->
automic_idx
,
0
);
change_cur_input
(
codec
,
spec
->
automic_idx
,
0
);
else
{
else
unsigned
int
imic
=
(
spec
->
automic_idx
==
AUTO_PIN_MIC
)
?
change_cur_input
(
codec
,
!
spec
->
automic_idx
,
0
);
AUTO_PIN_FRONT_MIC
:
AUTO_PIN_MIC
;
change_cur_input
(
codec
,
imic
,
0
);
}
}
}
/*
/*
...
@@ -918,14 +914,14 @@ static void init_input(struct hda_codec *codec)
...
@@ -918,14 +914,14 @@ static void init_input(struct hda_codec *codec)
unsigned
int
coef
;
unsigned
int
coef
;
int
i
;
int
i
;
for
(
i
=
0
;
i
<
AUTO_PIN_LAST
;
i
++
)
{
for
(
i
=
0
;
i
<
cfg
->
num_inputs
;
i
++
)
{
unsigned
int
ctl
;
unsigned
int
ctl
;
hda_nid_t
pin
=
cfg
->
input
_pins
[
i
]
;
hda_nid_t
pin
=
cfg
->
input
s
[
i
].
pin
;
if
(
!
pin
||
!
spec
->
adc_nid
[
i
])
if
(
!
spec
->
adc_nid
[
i
])
continue
;
continue
;
/* set appropriate pin control and mute first */
/* set appropriate pin control and mute first */
ctl
=
PIN_IN
;
ctl
=
PIN_IN
;
if
(
i
<=
AUTO_PIN_FRONT_MIC
)
{
if
(
cfg
->
inputs
[
i
].
type
<=
AUTO_PIN_FRONT_MIC
)
{
unsigned
int
caps
=
snd_hda_query_pin_caps
(
codec
,
pin
);
unsigned
int
caps
=
snd_hda_query_pin_caps
(
codec
,
pin
);
caps
>>=
AC_PINCAP_VREF_SHIFT
;
caps
>>=
AC_PINCAP_VREF_SHIFT
;
if
(
caps
&
AC_PINCAP_VREF_80
)
if
(
caps
&
AC_PINCAP_VREF_80
)
...
...
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