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
2f23db13
Commit
2f23db13
authored
Feb 27, 2014
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'asoc/fix/da732x' and 'asoc/fix/sta32x' into asoc-linus
parents
f3cfc7d9
75306820
b3619b28
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
sound/soc/codecs/da732x.c
sound/soc/codecs/da732x.c
+12
-0
sound/soc/codecs/sta32x.c
sound/soc/codecs/sta32x.c
+1
-1
No files found.
sound/soc/codecs/da732x.c
View file @
2f23db13
...
@@ -1268,11 +1268,23 @@ static struct snd_soc_dai_driver da732x_dai[] = {
...
@@ -1268,11 +1268,23 @@ static struct snd_soc_dai_driver da732x_dai[] = {
},
},
};
};
static
bool
da732x_volatile
(
struct
device
*
dev
,
unsigned
int
reg
)
{
switch
(
reg
)
{
case
DA732X_REG_HPL_DAC_OFF_CNTL
:
case
DA732X_REG_HPR_DAC_OFF_CNTL
:
return
true
;
default:
return
false
;
}
}
static
const
struct
regmap_config
da732x_regmap
=
{
static
const
struct
regmap_config
da732x_regmap
=
{
.
reg_bits
=
8
,
.
reg_bits
=
8
,
.
val_bits
=
8
,
.
val_bits
=
8
,
.
max_register
=
DA732X_MAX_REG
,
.
max_register
=
DA732X_MAX_REG
,
.
volatile_reg
=
da732x_volatile
,
.
reg_defaults
=
da732x_reg_cache
,
.
reg_defaults
=
da732x_reg_cache
,
.
num_reg_defaults
=
ARRAY_SIZE
(
da732x_reg_cache
),
.
num_reg_defaults
=
ARRAY_SIZE
(
da732x_reg_cache
),
.
cache_type
=
REGCACHE_RBTREE
,
.
cache_type
=
REGCACHE_RBTREE
,
...
...
sound/soc/codecs/sta32x.c
View file @
2f23db13
...
@@ -434,7 +434,7 @@ SOC_SINGLE_TLV("Treble Tone Control", STA32X_TONE, STA32X_TONE_TTC_SHIFT, 15, 0,
...
@@ -434,7 +434,7 @@ SOC_SINGLE_TLV("Treble Tone Control", STA32X_TONE, STA32X_TONE_TTC_SHIFT, 15, 0,
SOC_ENUM
(
"Limiter1 Attack Rate (dB/ms)"
,
sta32x_limiter1_attack_rate_enum
),
SOC_ENUM
(
"Limiter1 Attack Rate (dB/ms)"
,
sta32x_limiter1_attack_rate_enum
),
SOC_ENUM
(
"Limiter2 Attack Rate (dB/ms)"
,
sta32x_limiter2_attack_rate_enum
),
SOC_ENUM
(
"Limiter2 Attack Rate (dB/ms)"
,
sta32x_limiter2_attack_rate_enum
),
SOC_ENUM
(
"Limiter1 Release Rate (dB/ms)"
,
sta32x_limiter1_release_rate_enum
),
SOC_ENUM
(
"Limiter1 Release Rate (dB/ms)"
,
sta32x_limiter1_release_rate_enum
),
SOC_ENUM
(
"Limiter2 Release Rate (dB/ms)"
,
sta32x_limiter
1
_release_rate_enum
),
SOC_ENUM
(
"Limiter2 Release Rate (dB/ms)"
,
sta32x_limiter
2
_release_rate_enum
),
/* depending on mode, the attack/release thresholds have
/* depending on mode, the attack/release thresholds have
* two different enum definitions; provide both
* two different enum definitions; provide both
...
...
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