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
587691ea
Commit
587691ea
authored
Jan 10, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/cs4271' into tmp
parents
a18a31a1
b8455c9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
include/sound/cs4271.h
include/sound/cs4271.h
+1
-1
sound/soc/codecs/cs4271.c
sound/soc/codecs/cs4271.c
+3
-3
No files found.
include/sound/cs4271.h
View file @
587691ea
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
struct
cs4271_platform_data
{
struct
cs4271_platform_data
{
int
gpio_nreset
;
/* GPIO driving Reset pin, if any */
int
gpio_nreset
;
/* GPIO driving Reset pin, if any */
int
amutec_eq_bmutec
:
1
;
/* flag to enable AMUTEC=BMUTEC */
bool
amutec_eq_bmutec
;
/* flag to enable AMUTEC=BMUTEC */
};
};
#endif
/* __CS4271_H */
#endif
/* __CS4271_H */
sound/soc/codecs/cs4271.c
View file @
587691ea
...
@@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec)
...
@@ -474,16 +474,16 @@ static int cs4271_probe(struct snd_soc_codec *codec)
struct
cs4271_platform_data
*
cs4271plat
=
codec
->
dev
->
platform_data
;
struct
cs4271_platform_data
*
cs4271plat
=
codec
->
dev
->
platform_data
;
int
ret
;
int
ret
;
int
gpio_nreset
=
-
EINVAL
;
int
gpio_nreset
=
-
EINVAL
;
int
amutec_eq_bmutec
=
0
;
bool
amutec_eq_bmutec
=
false
;
#ifdef CONFIG_OF
#ifdef CONFIG_OF
if
(
of_match_device
(
cs4271_dt_ids
,
codec
->
dev
))
{
if
(
of_match_device
(
cs4271_dt_ids
,
codec
->
dev
))
{
gpio_nreset
=
of_get_named_gpio
(
codec
->
dev
->
of_node
,
gpio_nreset
=
of_get_named_gpio
(
codec
->
dev
->
of_node
,
"reset-gpio"
,
0
);
"reset-gpio"
,
0
);
if
(
!
of_get_property
(
codec
->
dev
->
of_node
,
if
(
of_get_property
(
codec
->
dev
->
of_node
,
"cirrus,amutec-eq-bmutec"
,
NULL
))
"cirrus,amutec-eq-bmutec"
,
NULL
))
amutec_eq_bmutec
=
1
;
amutec_eq_bmutec
=
true
;
}
}
#endif
#endif
...
...
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