summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm8962.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-17 21:32:04 +0300
committerMark Brown <broonie@kernel.org>2015-07-17 21:32:04 +0300
commit41a5fefeff21bb08438383c0a6b5a06045775969 (patch)
tree6517730821e2fe9727b8485e7e12474948c51c58 /sound/soc/codecs/wm8962.c
parentc418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff)
parent8019ff6cfc0440415fcfb6352c58c3951e6ab053 (diff)
downloadlinux-41a5fefeff21bb08438383c0a6b5a06045775969.tar.xz
Merge tag 'regmap-seq-delay-api' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-reg-default
regmap: Create a new struct reg_sequence for register sequences In order to allow us to start adding extra annotations for sequences without bloating register default tables duplicate the structure under the new name reg_sequence and update the APIs to use that instead of reg_default. Conflicts: sound/soc/codecs/da7210.c sound/soc/codecs/rt5651.c sound/soc/codecs/wm8993.c
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-rw-r--r--sound/soc/codecs/wm8962.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 8edc6d203404..dc770d488ec6 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3495,7 +3495,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8962 = {
};
/* Improve power consumption for IN4 DC measurement mode */
-static const struct reg_default wm8962_dc_measure[] = {
+static const struct reg_sequence wm8962_dc_measure[] = {
{ 0xfd, 0x1 },
{ 0xcc, 0x40 },
{ 0xfd, 0 },