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
84a5347b
Commit
84a5347b
authored
Jan 05, 2016
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
parents
449af266
ca8457bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
sound/soc/codecs/rt5645.c
sound/soc/codecs/rt5645.c
+4
-0
sound/soc/codecs/rt5645.h
sound/soc/codecs/rt5645.h
+4
-0
No files found.
sound/soc/codecs/rt5645.c
View file @
84a5347b
...
...
@@ -1667,9 +1667,13 @@ static int rt5645_spk_event(struct snd_soc_dapm_widget *w,
RT5645_PWR_CLS_D_L
,
RT5645_PWR_CLS_D
|
RT5645_PWR_CLS_D_R
|
RT5645_PWR_CLS_D_L
);
snd_soc_update_bits
(
codec
,
RT5645_GEN_CTRL3
,
RT5645_DET_CLK_MASK
,
RT5645_DET_CLK_MODE1
);
break
;
case
SND_SOC_DAPM_PRE_PMD
:
snd_soc_update_bits
(
codec
,
RT5645_GEN_CTRL3
,
RT5645_DET_CLK_MASK
,
RT5645_DET_CLK_DIS
);
snd_soc_write
(
codec
,
RT5645_EQ_CTRL2
,
0
);
snd_soc_update_bits
(
codec
,
RT5645_PWR_DIG1
,
RT5645_PWR_CLS_D
|
RT5645_PWR_CLS_D_R
|
...
...
sound/soc/codecs/rt5645.h
View file @
84a5347b
...
...
@@ -2122,6 +2122,10 @@ enum {
/* General Control3 (0xfc) */
#define RT5645_JD_PSV_MODE (0x1 << 12)
#define RT5645_IRQ_CLK_GATE_CTRL (0x1 << 11)
#define RT5645_DET_CLK_MASK (0x3 << 9)
#define RT5645_DET_CLK_DIS (0x0 << 9)
#define RT5645_DET_CLK_MODE1 (0x1 << 9)
#define RT5645_DET_CLK_MODE2 (0x2 << 9)
#define RT5645_MICINDET_MANU (0x1 << 7)
#define RT5645_RING2_SLEEVE_GND (0x1 << 5)
...
...
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