From: Peter Ujfalusi Date: Tue, 1 Apr 2014 13:45:00 +0000 (+0300) Subject: mfd: twl6040: Move register patching earlier in probe X-Git-Tag: next-20140530~51^2~49 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=084ccd598384ddd26a411bd76c676e01ce82b2d3;p=karo-tx-linux.git 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 Signed-off-by: Lee Jones --- 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, mutex_init(&twl6040->mutex); init_completion(&twl6040->ready); + regmap_register_patch(twl6040->regmap, twl6040_patch, + ARRAY_SIZE(twl6040_patch)); + twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV); if (twl6040->rev < 0) { dev_err(&client->dev, "Failed to read revision register: %d\n", @@ -725,10 +728,6 @@ static int twl6040_probe(struct i2c_client *client, goto readyirq_err; } - /* dual-access registers controlled by I2C only */ - regmap_register_patch(twl6040->regmap, twl6040_patch, - ARRAY_SIZE(twl6040_patch)); - /* * The main functionality of twl6040 to provide audio on OMAP4+ systems. * We can add the ASoC codec child whenever this driver has been loaded.