diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:43 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:43 +0000 |
commit | 3b8f4a70b840cff298010481d39404e9c39030d1 (patch) | |
tree | f066dbcf8a0d865f20afcf4585934bec2f8f7bf5 /sound/soc | |
parent | 2824ef9b81b0d440ed63e87f67f01f5cc942457f (diff) | |
parent | 148388f375394ac1afed543cb653c94be5faa810 (diff) | |
download | op-kernel-dev-3b8f4a70b840cff298010481d39404e9c39030d1.zip op-kernel-dev-3b8f4a70b840cff298010481d39404e9c39030d1.tar.gz |
Merge remote-tracking branch 'asoc/fix/sta32x' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/sta32x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 3a1343f..007a0e3 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -106,13 +106,11 @@ static const struct reg_default sta32x_regs[] = { }; static const struct regmap_range sta32x_write_regs_range[] = { - regmap_reg_range(STA32X_CONFA, STA32X_AUTO2), - regmap_reg_range(STA32X_C1CFG, STA32X_FDRC2), + regmap_reg_range(STA32X_CONFA, STA32X_FDRC2), }; static const struct regmap_range sta32x_read_regs_range[] = { - regmap_reg_range(STA32X_CONFA, STA32X_AUTO2), - regmap_reg_range(STA32X_C1CFG, STA32X_FDRC2), + regmap_reg_range(STA32X_CONFA, STA32X_FDRC2), }; static const struct regmap_range sta32x_volatile_regs_range[] = { |