Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006cea3a authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Lee Jones
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 68bab866

drivers/mfd/twl6040.c

+3 −4
Original line number Diff line number Diff line
@@ -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.