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

c6affc0d · Mark Brown · 7e22e911 · e20970ad · e8e08c52 · c6affc0d
Commit c6affc0d authored Jan 16, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sound/soc/codecs/adau1701.c sound/soc/codecs/adau1701.c +1 -1

sound/soc/codecs/tlv320aic32x4.c sound/soc/codecs/tlv320aic32x4.c +2 -2

No files found.
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
@@ -71,7 +71,7 @@
 #define ADAU1701_SEROCTL_WORD_LEN_24	0x0000
 #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_AUXNPOW_VBPD		0x40

--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -267,8 +267,8 @@ static const struct regmap_range_cfg aic32x4_regmap_pages[] = {
 		.selector_mask  = 0xff,
 		.window_start = 0,
 		.window_len = 128,
-		.range_min = AIC32X4_PAGE1,
+		.range_min = 0,
-		.range_max = AIC32X4_PAGE1 + 127,
+		.range_max = AIC32X4_RMICPGAVOL,
 	},
 };