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
8e8f0eda
Commit
8e8f0eda
authored
Jun 22, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
parents
0f57d867
7ea3470a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
sound/soc/codecs/rt5645.c
sound/soc/codecs/rt5645.c
+4
-4
No files found.
sound/soc/codecs/rt5645.c
View file @
8e8f0eda
...
@@ -464,9 +464,9 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = {
...
@@ -464,9 +464,9 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = {
RT5645_L_VOL_SFT
,
RT5645_R_VOL_SFT
,
39
,
1
,
out_vol_tlv
),
RT5645_L_VOL_SFT
,
RT5645_R_VOL_SFT
,
39
,
1
,
out_vol_tlv
),
/* Headphone Output Volume */
/* Headphone Output Volume */
SOC_DOUBLE
(
"H
P
Channel Switch"
,
RT5645_HP_VOL
,
SOC_DOUBLE
(
"H
eadphone
Channel Switch"
,
RT5645_HP_VOL
,
RT5645_VOL_L_SFT
,
RT5645_VOL_R_SFT
,
1
,
1
),
RT5645_VOL_L_SFT
,
RT5645_VOL_R_SFT
,
1
,
1
),
SOC_DOUBLE_TLV
(
"H
P
Playback Volume"
,
RT5645_HP_VOL
,
SOC_DOUBLE_TLV
(
"H
eadphone
Playback Volume"
,
RT5645_HP_VOL
,
RT5645_L_VOL_SFT
,
RT5645_R_VOL_SFT
,
39
,
1
,
out_vol_tlv
),
RT5645_L_VOL_SFT
,
RT5645_R_VOL_SFT
,
39
,
1
,
out_vol_tlv
),
/* OUTPUT Control */
/* OUTPUT Control */
...
@@ -2837,6 +2837,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
...
@@ -2837,6 +2837,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
}
}
}
}
INIT_DELAYED_WORK
(
&
rt5645
->
jack_detect_work
,
rt5645_jack_detect_work
);
if
(
rt5645
->
i2c
->
irq
)
{
if
(
rt5645
->
i2c
->
irq
)
{
ret
=
request_threaded_irq
(
rt5645
->
i2c
->
irq
,
NULL
,
rt5645_irq
,
ret
=
request_threaded_irq
(
rt5645
->
i2c
->
irq
,
NULL
,
rt5645_irq
,
IRQF_TRIGGER_RISING
|
IRQF_TRIGGER_FALLING
IRQF_TRIGGER_RISING
|
IRQF_TRIGGER_FALLING
...
@@ -2855,8 +2857,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
...
@@ -2855,8 +2857,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c,
dev_err
(
&
i2c
->
dev
,
"Fail gpio_direction hp_det_gpio
\n
"
);
dev_err
(
&
i2c
->
dev
,
"Fail gpio_direction hp_det_gpio
\n
"
);
}
}
INIT_DELAYED_WORK
(
&
rt5645
->
jack_detect_work
,
rt5645_jack_detect_work
);
return
snd_soc_register_codec
(
&
i2c
->
dev
,
&
soc_codec_dev_rt5645
,
return
snd_soc_register_codec
(
&
i2c
->
dev
,
&
soc_codec_dev_rt5645
,
rt5645_dai
,
ARRAY_SIZE
(
rt5645_dai
));
rt5645_dai
,
ARRAY_SIZE
(
rt5645_dai
));
}
}
...
...
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