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
a37a9407
Commit
a37a9407
authored
Apr 12, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/pcm512x' into asoc-linus
parents
a55ede16
cd02e3df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
Documentation/sound/alsa/ControlNames.txt
Documentation/sound/alsa/ControlNames.txt
+5
-5
sound/soc/codecs/pcm512x.c
sound/soc/codecs/pcm512x.c
+4
-4
No files found.
Documentation/sound/alsa/ControlNames.txt
View file @
a37a9407
...
...
@@ -71,11 +71,11 @@ SOURCE:
HDMI/DP (either HDMI or DisplayPort)
Exceptions (deprecated):
[Digital] Capture Source
[Digital] Capture Switch (aka input gain switch)
[Digital] Capture Volume (aka input gain volume)
[Digital] Playback Switch (aka output gain switch)
[Digital] Playback Volume (aka output gain volume)
[
Analogue|
Digital] Capture Source
[
Analogue|
Digital] Capture Switch (aka input gain switch)
[
Analogue|
Digital] Capture Volume (aka input gain volume)
[
Analogue|
Digital] Playback Switch (aka output gain switch)
[
Analogue|
Digital] Playback Volume (aka output gain volume)
Tone Control - Switch
Tone Control - Bass
Tone Control - Treble
...
...
sound/soc/codecs/pcm512x.c
View file @
a37a9407
...
...
@@ -304,9 +304,9 @@ static const struct soc_enum pcm512x_veds =
static
const
struct
snd_kcontrol_new
pcm512x_controls
[]
=
{
SOC_DOUBLE_R_TLV
(
"Digital Playback Volume"
,
PCM512x_DIGITAL_VOLUME_2
,
PCM512x_DIGITAL_VOLUME_3
,
0
,
255
,
1
,
digital_tlv
),
SOC_DOUBLE_TLV
(
"Playback Volume"
,
PCM512x_ANALOG_GAIN_CTRL
,
SOC_DOUBLE_TLV
(
"
Analogue
Playback Volume"
,
PCM512x_ANALOG_GAIN_CTRL
,
PCM512x_LAGN_SHIFT
,
PCM512x_RAGN_SHIFT
,
1
,
1
,
analog_tlv
),
SOC_DOUBLE_TLV
(
"Playback Boost Volume"
,
PCM512x_ANALOG_GAIN_BOOST
,
SOC_DOUBLE_TLV
(
"
Analogue
Playback Boost Volume"
,
PCM512x_ANALOG_GAIN_BOOST
,
PCM512x_AGBL_SHIFT
,
PCM512x_AGBR_SHIFT
,
1
,
0
,
boost_tlv
),
SOC_DOUBLE
(
"Digital Playback Switch"
,
PCM512x_MUTE
,
PCM512x_RQML_SHIFT
,
PCM512x_RQMR_SHIFT
,
1
,
1
),
...
...
@@ -576,8 +576,8 @@ static int pcm512x_find_pll_coeff(struct snd_soc_dai *dai,
/* pllin_rate / P (or here, den) cannot be greater than 20 MHz */
if
(
pllin_rate
/
den
>
20000000
&&
num
<
8
)
{
num
*=
20000000
/
(
pllin_rate
/
den
);
den
*=
20000000
/
(
pllin_rate
/
den
);
num
*=
DIV_ROUND_UP
(
pllin_rate
/
den
,
20000000
);
den
*=
DIV_ROUND_UP
(
pllin_rate
/
den
,
20000000
);
}
dev_dbg
(
dev
,
"num / den = %lu / %lu
\n
"
,
num
,
den
);
...
...
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