leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/fix/adau1701' and 'asoc/fix/tlv320aic32x4' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2014-01-16 14:02:52 +00:00
commit c6affc0dba
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/adau1701.c
View File

@ -71,7 +71,7 @@
#define ADAU1701_SEROCTL_WORD_LEN_24 0x0000 #define ADAU1701_SEROCTL_WORD_LEN_24 0x0000
#define ADAU1701_SEROCTL_WORD_LEN_20 0x0001 #define ADAU1701_SEROCTL_WORD_LEN_20 0x0001
#define ADAU1701_SEROCTL_WORD_LEN_16 0x0010 #define ADAU1701_SEROCTL_WORD_LEN_16 0x0002
#define ADAU1701_SEROCTL_WORD_LEN_MASK 0x0003 #define ADAU1701_SEROCTL_WORD_LEN_MASK 0x0003
#define ADAU1701_AUXNPOW_VBPD 0x40 #define ADAU1701_AUXNPOW_VBPD 0x40

4
sound/soc/codecs/tlv320aic32x4.c
View File

@ -267,8 +267,8 @@ static const struct regmap_range_cfg aic32x4_regmap_pages[] = {
.selector_mask = 0xff, .selector_mask = 0xff,
.window_start = 0, .window_start = 0,
.window_len = 128, .window_len = 128,
.range_min = AIC32X4_PAGE1, .range_min = 0,
.range_max = AIC32X4_PAGE1 + 127, .range_max = AIC32X4_RMICPGAVOL,
}, },
}; };