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
7cf143ca
Commit
7cf143ca
authored
Jan 26, 2018
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/nuc900' into asoc-next
parents
19c2d849
fa25b4f5
65a12b3a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
46 deletions
+73
-46
Documentation/devicetree/bindings/sound/nau8825.txt
Documentation/devicetree/bindings/sound/nau8825.txt
+2
-2
sound/soc/codecs/nau8825.c
sound/soc/codecs/nau8825.c
+64
-37
sound/soc/codecs/nau8825.h
sound/soc/codecs/nau8825.h
+2
-1
sound/soc/nuc900/nuc900-ac97.c
sound/soc/nuc900/nuc900-ac97.c
+5
-6
No files found.
Documentation/devicetree/bindings/sound/nau8825.txt
View file @
7cf143ca
...
@@ -69,7 +69,7 @@ Optional properties:
...
@@ -69,7 +69,7 @@ Optional properties:
- nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
- nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
- nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
- nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
- nuvoton,crosstalk-
bypass: make crosstalk function bypass
if set.
- nuvoton,crosstalk-
enable: make crosstalk function enable
if set.
- clocks: list of phandle and clock specifier pairs according to common clock bindings for the
- clocks: list of phandle and clock specifier pairs according to common clock bindings for the
clocks described in clock-names
clocks described in clock-names
...
@@ -98,7 +98,7 @@ Example:
...
@@ -98,7 +98,7 @@ Example:
nuvoton,short-key-debounce = <2>;
nuvoton,short-key-debounce = <2>;
nuvoton,jack-insert-debounce = <7>;
nuvoton,jack-insert-debounce = <7>;
nuvoton,jack-eject-debounce = <7>;
nuvoton,jack-eject-debounce = <7>;
nuvoton,crosstalk-
bypass
;
nuvoton,crosstalk-
enable
;
clock-names = "mclk";
clock-names = "mclk";
clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;
clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;
...
...
sound/soc/codecs/nau8825.c
View file @
7cf143ca
This diff is collapsed.
Click to expand it.
sound/soc/codecs/nau8825.h
View file @
7cf143ca
...
@@ -476,7 +476,8 @@ struct nau8825 {
...
@@ -476,7 +476,8 @@ struct nau8825 {
int
xtalk_event_mask
;
int
xtalk_event_mask
;
bool
xtalk_protect
;
bool
xtalk_protect
;
int
imp_rms
[
NAU8825_XTALK_IMM
];
int
imp_rms
[
NAU8825_XTALK_IMM
];
int
xtalk_bypass
;
int
xtalk_enable
;
bool
xtalk_baktab_initialized
;
/* True if initialized. */
};
};
int
nau8825_enable_jack_detect
(
struct
snd_soc_codec
*
codec
,
int
nau8825_enable_jack_detect
(
struct
snd_soc_codec
*
codec
,
...
...
sound/soc/nuc900/nuc900-ac97.c
View file @
7cf143ca
...
@@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
...
@@ -67,7 +67,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97,
/* polling the AC_R_FINISH */
/* polling the AC_R_FINISH */
while
(
!
(
AUDIO_READ
(
nuc900_audio
->
mmio
+
ACTL_ACCON
)
&
AC_R_FINISH
)
while
(
!
(
AUDIO_READ
(
nuc900_audio
->
mmio
+
ACTL_ACCON
)
&
AC_R_FINISH
)
&&
timeout
--
)
&&
--
timeout
)
mdelay
(
1
);
mdelay
(
1
);
if
(
!
timeout
)
{
if
(
!
timeout
)
{
...
@@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
...
@@ -121,7 +121,7 @@ static void nuc900_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
/* polling the AC_W_FINISH */
/* polling the AC_W_FINISH */
while
((
AUDIO_READ
(
nuc900_audio
->
mmio
+
ACTL_ACCON
)
&
AC_W_FINISH
)
while
((
AUDIO_READ
(
nuc900_audio
->
mmio
+
ACTL_ACCON
)
&
AC_W_FINISH
)
&&
timeout
--
)
&&
--
timeout
)
mdelay
(
1
);
mdelay
(
1
);
if
(
!
timeout
)
if
(
!
timeout
)
...
@@ -345,11 +345,10 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
...
@@ -345,11 +345,10 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
goto
out
;
goto
out
;
}
}
nuc900_audio
->
irq_num
=
platform_get_irq
(
pdev
,
0
);
ret
=
platform_get_irq
(
pdev
,
0
);
if
(
!
nuc900_audio
->
irq_num
)
{
if
(
ret
<
0
)
ret
=
-
EBUSY
;
goto
out
;
goto
out
;
}
nuc900_audio
->
irq_num
=
ret
;
nuc900_ac97_data
=
nuc900_audio
;
nuc900_ac97_data
=
nuc900_audio
;
...
...
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