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

Commit 0e1929de authored by Mike Looijmans's avatar Mike Looijmans Committed by Wolfram Sang
Browse files

i2c: i2c-cadence: Initialize configuration before probing devices 



The cadence I2C driver calls cdns_i2c_writereg(..) to setup a workaround
in the controller, but did so after calling i2c_add_adapter() which starts
probing devices on the bus. Change the order so that the configuration is
completely finished before using the adapter.

Signed-off-by: default avatarMike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 7a308bb3

drivers/i2c/busses/i2c-cadence.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -962,10 +962,6 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
		goto err_clk_dis;

		goto err_clk_dis;

	}

	}





	ret = i2c_add_adapter(&id->adap);

	if (ret < 0)

		goto err_clk_dis;



	/*

	/*

	 * Cadence I2C controller has a bug wherein it generates

	 * Cadence I2C controller has a bug wherein it generates

	 * invalid read transaction after HW timeout in master receiver mode.

	 * invalid read transaction after HW timeout in master receiver mode.
@@ -975,6 +971,10 @@ static int cdns_i2c_probe(struct platform_device *pdev) 
	 */

	 */

	cdns_i2c_writereg(CDNS_I2C_TIMEOUT_MAX, CDNS_I2C_TIME_OUT_OFFSET);

	cdns_i2c_writereg(CDNS_I2C_TIMEOUT_MAX, CDNS_I2C_TIME_OUT_OFFSET);





	ret = i2c_add_adapter(&id->adap);

	if (ret < 0)

		goto err_clk_dis;



	dev_info(&pdev->dev, "%u kHz mmio %08lx irq %d\n",

	dev_info(&pdev->dev, "%u kHz mmio %08lx irq %d\n",

		 id->i2c_clk / 1000, (unsigned long)r_mem->start, id->irq);

		 id->i2c_clk / 1000, (unsigned long)r_mem->start, id->irq);