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
1d9a91db
Commit
1d9a91db
authored
Nov 21, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'DB_RANGE-size-fixes' of
git://git.alsa-project.org/alsa-kprivate
into for-3.2
parents
ef0cd470
028aa634
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
10 deletions
+10
-10
sound/soc/codecs/adau1373.c
sound/soc/codecs/adau1373.c
+1
-1
sound/soc/codecs/rt5631.c
sound/soc/codecs/rt5631.c
+1
-1
sound/soc/codecs/sgtl5000.c
sound/soc/codecs/sgtl5000.c
+1
-1
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+2
-2
sound/soc/codecs/wm8993.c
sound/soc/codecs/wm8993.c
+1
-1
sound/soc/codecs/wm9090.c
sound/soc/codecs/wm9090.c
+3
-3
sound/soc/codecs/wm_hubs.c
sound/soc/codecs/wm_hubs.c
+1
-1
No files found.
sound/soc/codecs/adau1373.c
View file @
1d9a91db
...
@@ -245,7 +245,7 @@ static const char *adau1373_bass_hpf_cutoff_text[] = {
...
@@ -245,7 +245,7 @@ static const char *adau1373_bass_hpf_cutoff_text[] = {
};
};
static
const
unsigned
int
adau1373_bass_tlv
[]
=
{
static
const
unsigned
int
adau1373_bass_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
4
),
TLV_DB_RANGE_HEAD
(
3
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
600
,
600
,
1
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
600
,
600
,
1
),
3
,
4
,
TLV_DB_SCALE_ITEM
(
950
,
250
,
0
),
3
,
4
,
TLV_DB_SCALE_ITEM
(
950
,
250
,
0
),
5
,
7
,
TLV_DB_SCALE_ITEM
(
1400
,
150
,
0
),
5
,
7
,
TLV_DB_SCALE_ITEM
(
1400
,
150
,
0
),
...
...
sound/soc/codecs/rt5631.c
View file @
1d9a91db
...
@@ -177,7 +177,7 @@ static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -95625, 375, 0);
...
@@ -177,7 +177,7 @@ static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -95625, 375, 0);
static
const
DECLARE_TLV_DB_SCALE
(
in_vol_tlv
,
-
3450
,
150
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
in_vol_tlv
,
-
3450
,
150
,
0
);
/* {0, +20, +24, +30, +35, +40, +44, +50, +52}dB */
/* {0, +20, +24, +30, +35, +40, +44, +50, +52}dB */
static
unsigned
int
mic_bst_tlv
[]
=
{
static
unsigned
int
mic_bst_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
6
),
TLV_DB_RANGE_HEAD
(
7
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
1
,
1
,
TLV_DB_SCALE_ITEM
(
2000
,
0
,
0
),
1
,
1
,
TLV_DB_SCALE_ITEM
(
2000
,
0
,
0
),
2
,
2
,
TLV_DB_SCALE_ITEM
(
2400
,
0
,
0
),
2
,
2
,
TLV_DB_SCALE_ITEM
(
2400
,
0
,
0
),
...
...
sound/soc/codecs/sgtl5000.c
View file @
1d9a91db
...
@@ -365,7 +365,7 @@ static const DECLARE_TLV_DB_SCALE(capture_6db_attenuate, -600, 600, 0);
...
@@ -365,7 +365,7 @@ static const DECLARE_TLV_DB_SCALE(capture_6db_attenuate, -600, 600, 0);
/* tlv for mic gain, 0db 20db 30db 40db */
/* tlv for mic gain, 0db 20db 30db 40db */
static
const
unsigned
int
mic_gain_tlv
[]
=
{
static
const
unsigned
int
mic_gain_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
4
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
1
,
3
,
TLV_DB_SCALE_ITEM
(
2000
,
1000
,
0
),
1
,
3
,
TLV_DB_SCALE_ITEM
(
2000
,
1000
,
0
),
};
};
...
...
sound/soc/codecs/wm8962.c
View file @
1d9a91db
...
@@ -1973,7 +1973,7 @@ static int wm8962_reset(struct snd_soc_codec *codec)
...
@@ -1973,7 +1973,7 @@ static int wm8962_reset(struct snd_soc_codec *codec)
static
const
DECLARE_TLV_DB_SCALE
(
inpga_tlv
,
-
2325
,
75
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
inpga_tlv
,
-
2325
,
75
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
mixin_tlv
,
-
1500
,
300
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
mixin_tlv
,
-
1500
,
300
,
0
);
static
const
unsigned
int
mixinpga_tlv
[]
=
{
static
const
unsigned
int
mixinpga_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
7
),
TLV_DB_RANGE_HEAD
(
5
),
0
,
1
,
TLV_DB_SCALE_ITEM
(
0
,
600
,
0
),
0
,
1
,
TLV_DB_SCALE_ITEM
(
0
,
600
,
0
),
2
,
2
,
TLV_DB_SCALE_ITEM
(
1300
,
1300
,
0
),
2
,
2
,
TLV_DB_SCALE_ITEM
(
1300
,
1300
,
0
),
3
,
4
,
TLV_DB_SCALE_ITEM
(
1800
,
200
,
0
),
3
,
4
,
TLV_DB_SCALE_ITEM
(
1800
,
200
,
0
),
...
@@ -1988,7 +1988,7 @@ static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0);
...
@@ -1988,7 +1988,7 @@ static const DECLARE_TLV_DB_SCALE(bypass_tlv, -1500, 300, 0);
static
const
DECLARE_TLV_DB_SCALE
(
out_tlv
,
-
12100
,
100
,
1
);
static
const
DECLARE_TLV_DB_SCALE
(
out_tlv
,
-
12100
,
100
,
1
);
static
const
DECLARE_TLV_DB_SCALE
(
hp_tlv
,
-
700
,
100
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
hp_tlv
,
-
700
,
100
,
0
);
static
const
unsigned
int
classd_tlv
[]
=
{
static
const
unsigned
int
classd_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
7
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
0
),
};
};
...
...
sound/soc/codecs/wm8993.c
View file @
1d9a91db
...
@@ -512,7 +512,7 @@ static const DECLARE_TLV_DB_SCALE(drc_comp_threash, -4500, 75, 0);
...
@@ -512,7 +512,7 @@ static const DECLARE_TLV_DB_SCALE(drc_comp_threash, -4500, 75, 0);
static
const
DECLARE_TLV_DB_SCALE
(
drc_comp_amp
,
-
2250
,
75
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
drc_comp_amp
,
-
2250
,
75
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
drc_min_tlv
,
-
1800
,
600
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
drc_min_tlv
,
-
1800
,
600
,
0
);
static
const
unsigned
int
drc_max_tlv
[]
=
{
static
const
unsigned
int
drc_max_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
4
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
1200
,
600
,
0
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
1200
,
600
,
0
),
3
,
3
,
TLV_DB_SCALE_ITEM
(
3600
,
0
,
0
),
3
,
3
,
TLV_DB_SCALE_ITEM
(
3600
,
0
,
0
),
};
};
...
...
sound/soc/codecs/wm9090.c
View file @
1d9a91db
...
@@ -177,19 +177,19 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec)
...
@@ -177,19 +177,19 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec)
}
}
static
const
unsigned
int
in_tlv
[]
=
{
static
const
unsigned
int
in_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
6
),
TLV_DB_RANGE_HEAD
(
3
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
-
600
,
0
,
0
),
0
,
0
,
TLV_DB_SCALE_ITEM
(
-
600
,
0
,
0
),
1
,
3
,
TLV_DB_SCALE_ITEM
(
-
350
,
350
,
0
),
1
,
3
,
TLV_DB_SCALE_ITEM
(
-
350
,
350
,
0
),
4
,
6
,
TLV_DB_SCALE_ITEM
(
600
,
600
,
0
),
4
,
6
,
TLV_DB_SCALE_ITEM
(
600
,
600
,
0
),
};
};
static
const
unsigned
int
mix_tlv
[]
=
{
static
const
unsigned
int
mix_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
4
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
1200
,
300
,
0
),
0
,
2
,
TLV_DB_SCALE_ITEM
(
-
1200
,
300
,
0
),
3
,
3
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
3
,
3
,
TLV_DB_SCALE_ITEM
(
0
,
0
,
0
),
};
};
static
const
DECLARE_TLV_DB_SCALE
(
out_tlv
,
-
5700
,
100
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
out_tlv
,
-
5700
,
100
,
0
);
static
const
unsigned
int
spkboost_tlv
[]
=
{
static
const
unsigned
int
spkboost_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
7
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
0
),
};
};
...
...
sound/soc/codecs/wm_hubs.c
View file @
1d9a91db
...
@@ -40,7 +40,7 @@ static const DECLARE_TLV_DB_SCALE(outmix_tlv, -2100, 300, 0);
...
@@ -40,7 +40,7 @@ static const DECLARE_TLV_DB_SCALE(outmix_tlv, -2100, 300, 0);
static
const
DECLARE_TLV_DB_SCALE
(
spkmixout_tlv
,
-
1800
,
600
,
1
);
static
const
DECLARE_TLV_DB_SCALE
(
spkmixout_tlv
,
-
1800
,
600
,
1
);
static
const
DECLARE_TLV_DB_SCALE
(
outpga_tlv
,
-
5700
,
100
,
0
);
static
const
DECLARE_TLV_DB_SCALE
(
outpga_tlv
,
-
5700
,
100
,
0
);
static
const
unsigned
int
spkboost_tlv
[]
=
{
static
const
unsigned
int
spkboost_tlv
[]
=
{
TLV_DB_RANGE_HEAD
(
7
),
TLV_DB_RANGE_HEAD
(
2
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
0
,
6
,
TLV_DB_SCALE_ITEM
(
0
,
150
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
0
),
7
,
7
,
TLV_DB_SCALE_ITEM
(
1200
,
0
,
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