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/da7210.c | |
| 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 'sound/soc/codecs/da7210.c')
| -rw-r--r-- | sound/soc/codecs/da7210.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index a44ead615b67..d4c0a324a03e 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -1182,7 +1182,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = { #if IS_ENABLED(CONFIG_I2C) -static const struct reg_default da7210_regmap_i2c_patch[] = { +static const struct reg_sequence da7210_regmap_i2c_patch[] = { /* System controller master disable */ { DA7210_STARTUP1, 0x00 }, @@ -1269,7 +1269,7 @@ static struct i2c_driver da7210_i2c_driver = { #if defined(CONFIG_SPI_MASTER) -static const struct reg_default da7210_regmap_spi_patch[] = { +static const struct reg_sequence da7210_regmap_spi_patch[] = { /* Dummy read to give two pulses over nCS for SPI */ { DA7210_AUX2, 0x00 }, { DA7210_AUX2, 0x00 }, |