From: Mark Brown <broonie@kernel.org>
Date: Fri, 17 Jul 2015 18:32:04 +0000 (+0100)
Subject: Merge tag 'regmap-seq-delay-api' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.3-rc1~77^2~7^2~8^3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=41a5fefeff21bb08438383c0a6b5a06045775969;p=karo-tx-linux.git

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
---

41a5fefeff21bb08438383c0a6b5a06045775969
diff --cc sound/soc/codecs/da7210.c
index a44ead615b67,bf0fb3d4df22..d4c0a324a03e
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@@ -1182,7 -1182,7 +1182,7 @@@ static struct snd_soc_codec_driver soc_
  
  #if IS_ENABLED(CONFIG_I2C)
  
- static const struct reg_default da7210_regmap_i2c_patch[] = {
 -static struct reg_sequence da7210_regmap_i2c_patch[] = {
++static const struct reg_sequence da7210_regmap_i2c_patch[] = {
  
  	/* System controller master disable */
  	{ DA7210_STARTUP1, 0x00 },
@@@ -1269,7 -1269,7 +1269,7 @@@ static struct i2c_driver da7210_i2c_dri
  
  #if defined(CONFIG_SPI_MASTER)
  
- static const struct reg_default da7210_regmap_spi_patch[] = {
 -static struct reg_sequence 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 },
diff --cc sound/soc/codecs/rt5651.c
index 3ee0574794db,db9b8667f136..383c3f065d30
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@@ -46,7 -46,7 +46,7 @@@ static const struct regmap_range_cfg rt
  	  .window_len = 0x1, },
  };
  
- static const struct reg_default init_list[] = {
 -static struct reg_sequence init_list[] = {
++static const struct reg_sequence init_list[] = {
  	{RT5651_PR_BASE + 0x3d,	0x3e00},
  };
  
diff --cc sound/soc/codecs/wm8993.c
index f2d5211a9a96,52ec64d8502d..06ff4943e7cc
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@@ -1595,7 -1595,7 +1595,7 @@@ static int wm8993_resume(struct snd_soc
  #endif
  
  /* Tune DC servo configuration */
- static const struct reg_default wm8993_regmap_patch[] = {
 -static struct reg_sequence wm8993_regmap_patch[] = {
++static const struct reg_sequence wm8993_regmap_patch[] = {
  	{ 0x44, 3 },
  	{ 0x56, 3 },
  	{ 0x44, 0 },