Commit d8a5a922 authored Mar 18, 2023 by Andi Shyti Committed by Wolfram Sang Mar 29, 2023

i2c: mpc: Use i2c-scl-clk-low-timeout-us i2c property



"fsl,timeout" is marked as deprecated and replaced by the
"i2c-scl-clk-low-timeout-us" i2c property.

Use this latter and, in case it is missing, for back
compatibility, check whether we still have "fsl,timeout" defined.

Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

parent be40a3ae

drivers/i2c/busses/i2c-mpc.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -843,8 +843,18 @@ static int fsl_i2c_probe(struct platform_device *op)
		mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock);
		}

		/*
		* "fsl,timeout" has been marked as deprecated and, to maintain
		* backward compatibility, we will only look for it if
		* "i2c-scl-clk-low-timeout-us" is not present.
		*/
		result = of_property_read_u32(op->dev.of_node,
		"i2c-scl-clk-low-timeout-us",
		&mpc_ops.timeout);
		if (result == -EINVAL)
		result = of_property_read_u32(op->dev.of_node,
		"fsl,timeout", &mpc_ops.timeout);

		if (!result) {
		mpc_ops.timeout *= HZ / 1000000;
		if (mpc_ops.timeout < 5)