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 /drivers/gpu/drm | |
parent | c418a84a8c8f98b1a0f30cd68d0cdf40d77aed01 (diff) | |
parent | 8019ff6cfc0440415fcfb6352c58c3951e6ab053 (diff) |
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 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i2c/adv7511.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c index 2aaa3c88999e..00416f23b5cb 100644 --- a/drivers/gpu/drm/i2c/adv7511.c +++ b/drivers/gpu/drm/i2c/adv7511.c @@ -54,7 +54,7 @@ static struct adv7511 *encoder_to_adv7511(struct drm_encoder *encoder) } /* ADI recommended values for proper operation. */ -static const struct reg_default adv7511_fixed_registers[] = { +static const struct reg_sequence adv7511_fixed_registers[] = { { 0x98, 0x03 }, { 0x9a, 0xe0 }, { 0x9c, 0x30 }, |