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
159c6fc0
Commit
159c6fc0
authored
Mar 04, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rt5670' into asoc-linus
parents
e0427428
85052924
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
sound/soc/codecs/rt5670.c
sound/soc/codecs/rt5670.c
+6
-1
No files found.
sound/soc/codecs/rt5670.c
View file @
159c6fc0
...
...
@@ -225,7 +225,6 @@ static bool rt5670_volatile_register(struct device *dev, unsigned int reg)
case
RT5670_ADC_EQ_CTRL1
:
case
RT5670_EQ_CTRL1
:
case
RT5670_ALC_CTRL_1
:
case
RT5670_IRQ_CTRL1
:
case
RT5670_IRQ_CTRL2
:
case
RT5670_INT_IRQ_ST
:
case
RT5670_IL_CMD
:
...
...
@@ -2703,6 +2702,12 @@ static int rt5670_i2c_probe(struct i2c_client *i2c,
regmap_write
(
rt5670
->
regmap
,
RT5670_RESET
,
0
);
regmap_read
(
rt5670
->
regmap
,
RT5670_VENDOR_ID
,
&
val
);
if
(
val
>=
4
)
regmap_write
(
rt5670
->
regmap
,
RT5670_GPIO_CTRL3
,
0x0980
);
else
regmap_write
(
rt5670
->
regmap
,
RT5670_GPIO_CTRL3
,
0x0d00
);
ret
=
regmap_register_patch
(
rt5670
->
regmap
,
init_list
,
ARRAY_SIZE
(
init_list
));
if
(
ret
!=
0
)
...
...
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