diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-02-29 11:58:12 +0100 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2024-03-04 23:36:30 +0100 |
| commit | 401a8e9e3d697b75c2e237b9b405bb0f388dd7ed (patch) | |
| tree | 0eb6f6d76aa67cd16b89e3f31e65dee7ceaae9e6 /drivers/i2c/busses | |
| parent | f9ccb4533bdcf31f1225a9a09805329b8020a4e3 (diff) | |
| download | lwn-401a8e9e3d697b75c2e237b9b405bb0f388dd7ed.tar.gz lwn-401a8e9e3d697b75c2e237b9b405bb0f388dd7ed.zip | |
i2c: mpc: use proper binding for transfer timeouts
"i2c-scl-clk-low-timeout-us" is wrongly used here because it describes
maximum clock stretching not maximum transfer time. Additionally, it is
deprecated because of issues. Move this driver to the correct binding.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index e4e4995ab224..0b4de9e569ba 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -844,16 +844,16 @@ 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. - */ + /* Sadly, we have to support two deprecated bindings here */ result = of_property_read_u32(op->dev.of_node, - "i2c-scl-clk-low-timeout-us", + "i2c-transfer-timeout-us", &mpc_ops.timeout); if (result == -EINVAL) 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) { |