diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-17 19:32:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-17 19:32:04 +0100 |
| commit | 41a5fefeff21bb08438383c0a6b5a06045775969 (patch) | |
| tree | 6517730821e2fe9727b8485e7e12474948c51c58 /sound/soc/codecs/wm8993.c | |
| parent | c418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff) | |
| parent | 8019ff6cfc0440415fcfb6352c58c3951e6ab053 (diff) | |
| download | op-kernel-dev-41a5fefeff21bb08438383c0a6b5a06045775969.zip op-kernel-dev-41a5fefeff21bb08438383c0a6b5a06045775969.tar.gz | |
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/wm8993.c')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index f2d5211..06ff494 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c @@ -1595,7 +1595,7 @@ static int wm8993_resume(struct snd_soc_codec *codec) #endif /* Tune DC servo configuration */ -static const struct reg_default wm8993_regmap_patch[] = { +static const struct reg_sequence wm8993_regmap_patch[] = { { 0x44, 3 }, { 0x56, 3 }, { 0x44, 0 }, |
