diff mbox series

[v5,3/3] i2c: mpc: Use i2c-scl-clk-low-timeout-us i2c property

Message ID 20230314221614.24205-1-andi.shyti@kernel.org
State Superseded
Headers show
Series None | expand

Commit Message

Andi Shyti March 14, 2023, 10:16 p.m. UTC 
"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>
---
Hi,

this should be the only patch where I forgot an 'ms'.
It should be fixed now.

Thanks, Chris.

V4 -> v5
 - replace /ms/us/ in the commit subject and in the comment.

 drivers/i2c/busses/i2c-mpc.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Krzysztof Kozlowski March 17, 2023, 9:26 a.m. UTC | #1 
On 14/03/2023 23:16, Andi Shyti wrote:
> "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>
> ---
> Hi,
> 
> this should be the only patch where I forgot an 'ms'.
> It should be fixed now.
> 
> Thanks, Chris.
> 
> V4 -> v5
>  - replace /ms/us/ in the commit subject and in the comment.
> 

Please send entire new v5, because this messes with our
threading/reviewing and our tools.


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof
Andi Shyti March 17, 2023, 2 p.m. UTC | #2 
Hi Krzysztof,

On Fri, Mar 17, 2023 at 10:26:21AM +0100, Krzysztof Kozlowski wrote:
> On 14/03/2023 23:16, Andi Shyti wrote:
> > "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>
> > ---
> > Hi,
> > 
> > this should be the only patch where I forgot an 'ms'.
> > It should be fixed now.
> > 
> > Thanks, Chris.
> > 
> > V4 -> v5
> >  - replace /ms/us/ in the commit subject and in the comment.
> > 
> 
> Please send entire new v5, because this messes with our
> threading/reviewing and our tools.

ah... tools!

Sure... will do!

> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Thanks!

Andi
diff mbox series

Patch

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 87e5c1725750f..aec3ac387c579 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -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,
-				      "fsl,timeout", &mpc_ops.timeout);
+				      "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)