Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux-seco-intel
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nicola Sparnacci
linux-seco-intel
Commits
c200d888
Commit
c200d888
authored
11 years ago
by
Mark Brown
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linus
parents
d4e4ab86
8806d96d
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sound/soc/codecs/cs42l52.c
+4
-1
4 additions, 1 deletion
sound/soc/codecs/cs42l52.c
with
4 additions
and
1 deletion
sound/soc/codecs/cs42l52.c
+
4
−
1
View file @
c200d888
...
@@ -195,6 +195,8 @@ static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);
...
@@ -195,6 +195,8 @@ static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);
static
DECLARE_TLV_DB_SCALE
(
mix_tlv
,
-
50
,
50
,
0
);
static
DECLARE_TLV_DB_SCALE
(
mix_tlv
,
-
50
,
50
,
0
);
static
DECLARE_TLV_DB_SCALE
(
beep_tlv
,
-
56
,
200
,
0
);
static
const
unsigned
int
limiter_tlv
[]
=
{
static
const
unsigned
int
limiter_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
2
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
3000
,
600
,
0
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
3000
,
600
,
0
),
...
@@ -451,7 +453,8 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = {
...
@@ -451,7 +453,8 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = {
SOC_ENUM
(
"Beep Pitch"
,
beep_pitch_enum
),
SOC_ENUM
(
"Beep Pitch"
,
beep_pitch_enum
),
SOC_ENUM
(
"Beep on Time"
,
beep_ontime_enum
),
SOC_ENUM
(
"Beep on Time"
,
beep_ontime_enum
),
SOC_ENUM
(
"Beep off Time"
,
beep_offtime_enum
),
SOC_ENUM
(
"Beep off Time"
,
beep_offtime_enum
),
SOC_SINGLE_TLV
(
"Beep Volume"
,
CS42L52_BEEP_VOL
,
0
,
0x1f
,
0x07
,
hl_tlv
),
SOC_SINGLE_SX_TLV
(
"Beep Volume"
,
CS42L52_BEEP_VOL
,
0
,
0x07
,
0x1f
,
beep_tlv
),
SOC_SINGLE
(
"Beep Mixer Switch"
,
CS42L52_BEEP_TONE_CTL
,
5
,
1
,
1
),
SOC_SINGLE
(
"Beep Mixer Switch"
,
CS42L52_BEEP_TONE_CTL
,
5
,
1
,
1
),
SOC_ENUM
(
"Beep Treble Corner Freq"
,
beep_treble_enum
),
SOC_ENUM
(
"Beep Treble Corner Freq"
,
beep_treble_enum
),
SOC_ENUM
(
"Beep Bass Corner Freq"
,
beep_bass_enum
),
SOC_ENUM
(
"Beep Bass Corner Freq"
,
beep_bass_enum
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment