aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl6040.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2014-04-01 09:45:00 -0400
committerLee Jones <lee.jones@linaro.org>2014-06-03 03:11:21 -0400
commit006cea3aeced7f3d67fe2849da7724683853d87d (patch)
tree768df692c0abbc516cd4f1cfa37c166d3dae1b10 /drivers/mfd/twl6040.c
parent68bab8662f49b9e158f1d32f11becd4e48c04079 (diff)
mfd: twl6040: Move register patching earlier in probe
Make sure that we patch the ACCCTL register as the first thing when the driver loads, thus configuring I2C fast mode and i2c access for dual access registers. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/twl6040.c')
-rw-r--r--drivers/mfd/twl6040.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 574774d7f826..12b314ea48dc 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -675,6 +675,9 @@ static int twl6040_probe(struct i2c_client *client,
675 mutex_init(&twl6040->mutex); 675 mutex_init(&twl6040->mutex);
676 init_completion(&twl6040->ready); 676 init_completion(&twl6040->ready);
677 677
678 regmap_register_patch(twl6040->regmap, twl6040_patch,
679 ARRAY_SIZE(twl6040_patch));
680
678 twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV); 681 twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);
679 if (twl6040->rev < 0) { 682 if (twl6040->rev < 0) {
680 dev_err(&client->dev, "Failed to read revision register: %d\n", 683 dev_err(&client->dev, "Failed to read revision register: %d\n",
@@ -725,10 +728,6 @@ static int twl6040_probe(struct i2c_client *client,
725 goto readyirq_err; 728 goto readyirq_err;
726 } 729 }
727 730
728 /* dual-access registers controlled by I2C only */
729 regmap_register_patch(twl6040->regmap, twl6040_patch,
730 ARRAY_SIZE(twl6040_patch));
731
732 /* 731 /*
733 * The main functionality of twl6040 to provide audio on OMAP4+ systems. 732 * The main functionality of twl6040 to provide audio on OMAP4+ systems.
734 * We can add the ASoC codec child whenever this driver has been loaded. 733 * We can add the ASoC codec child whenever this driver has been loaded.