projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
adav80x.c
diff --git
a/sound/soc/codecs/adav80x.c
b/sound/soc/codecs/adav80x.c
index
36d8425
..
198c924
100644
(file)
--- a/
sound/soc/codecs/adav80x.c
+++ b/
sound/soc/codecs/adav80x.c
@@
-113,7
+113,7
@@
#define ADAV80X_PLL_OUTE_SYSCLKPD(x) BIT(2 - (x))
#define ADAV80X_PLL_OUTE_SYSCLKPD(x) BIT(2 - (x))
-static struct reg_default adav80x_reg_defaults[] = {
+static
const
struct reg_default adav80x_reg_defaults[] = {
{ ADAV80X_PLAYBACK_CTRL, 0x01 },
{ ADAV80X_AUX_IN_CTRL, 0x01 },
{ ADAV80X_REC_CTRL, 0x02 },
{ ADAV80X_PLAYBACK_CTRL, 0x01 },
{ ADAV80X_AUX_IN_CTRL, 0x01 },
{ ADAV80X_REC_CTRL, 0x02 },
@@
-865,7
+865,6
@@
const struct regmap_config adav80x_regmap_config = {
.val_bits = 8,
.pad_bits = 1,
.reg_bits = 7,
.val_bits = 8,
.pad_bits = 1,
.reg_bits = 7,
- .read_flag_mask = 0x01,
.max_register = ADAV80X_PLL_OUTE,
.max_register = ADAV80X_PLL_OUTE,