i2c: octeon: Increase retry default and use fixed timeout value (a035d71b) · Commits · 戴 / test

Convert the adapter timeout to 2 ms independently of depending on CONFIG_HZ. CONFIG_HZ is 100 for MIPS Cavium-Octeon so the timeout value is not changed. Also set retries to 5 to improve robustness. Signed-off-by:

Jan Glauber <jglauber@cavium.com> Signed-off-by:

Wolfram Sang <wsa@the-dreams.de>

drivers/i2c/busses/i2c-octeon.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -426,7 +426,6 @@ static struct i2c_adapter octeon_i2c_ops = {
		.owner = THIS_MODULE,
		.name = "OCTEON adapter",
		.algo = &octeon_i2c_algo,
		.timeout = HZ / 50,
		};

		/* calculate and set clock divisors */
		@@ -553,6 +552,8 @@ static int octeon_i2c_probe(struct platform_device *pdev)
		octeon_i2c_set_clock(i2c);

		i2c->adap = octeon_i2c_ops;
		i2c->adap.timeout = msecs_to_jiffies(2);
		i2c->adap.retries = 5;
		i2c->adap.dev.parent = &pdev->dev;
		i2c->adap.dev.of_node = node;
		i2c_set_adapdata(&i2c->adap, i2c);

Admin message