summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl6040.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-07-17 19:57:41 +0200
committerMark Brown <broonie@kernel.org>2015-07-17 19:57:41 +0200
commitda7b33739ebefca48259e4741376b9c77015d9d0 (patch)
tree43af87fadb48bfaf23e3e09378cfb90edb585f19 /drivers/mfd/twl6040.c
parentASoC: wm5110: Add special DRE on/off handling for the headphone path (diff)
parentregmap: Use reg_sequence for multi_reg_write / register_patch (diff)
downloadlinux-da7b33739ebefca48259e4741376b9c77015d9d0.tar.xz
linux-da7b33739ebefca48259e4741376b9c77015d9d0.zip
Merge tag 'regmap-seq-delay-api' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm5110
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.
Diffstat (limited to 'drivers/mfd/twl6040.c')
-rw-r--r--drivers/mfd/twl6040.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index c5265c1262c5..583dc33432f3 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -86,7 +86,7 @@ static const struct reg_default twl6040_defaults[] = {
{ 0x2E, 0x00 }, /* REG_STATUS (ro) */
};
-static struct reg_default twl6040_patch[] = {
+static struct reg_sequence twl6040_patch[] = {
/*
* Select I2C bus access to dual access registers
* Interrupt register is cleared on read