From: Marcin Wojtas <mw@xxxxxxxxxxxx>
This commit enables obtaining timeout value in miliseconds using the
timeout-ms property. If it doesn't succeed, the default value of
1000ms is set.
The Device Tree binding documentation is updated accordingly.
[gregory.clement@xxxxxxxxxxxxxxxxxx: convert commit log to mainline
style]
Signed-off-by: Marcin Wojtas <mw@xxxxxxxxxxxx>
Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 5 +++++
drivers/i2c/busses/i2c-mv64xxx.c | 9 ++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
index 5c30026921ae..d7fa740b68f1 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
@@ -25,12 +25,16 @@ default frequency is 100kHz
whenever you're using the "allwinner,sun6i-a31-i2c"
compatible.
+ - timeout-ms : timeout value in miliseconds. If not set the default
+ timeout is 1000ms
+
Examples:
i2c@11000 {
compatible = "marvell,mv64xxx-i2c";
reg = <0x11000 0x20>;
interrupts = <29>;
+ timeout-ms = <1000>;
clock-frequency = <100000>;
};
@@ -40,5 +44,6 @@ For the Armada XP:
compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
reg = <0x11000 0x100>;
interrupts = <29>;
+ timeout-ms = <1000>;
clock-frequency = <100000>;
};
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 30059c1df2a3..a379a17c5c21 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -803,7 +803,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
#else
const struct of_device_id *device;
struct device_node *np = dev->of_node;
- u32 bus_freq, tclk;
+ u32 bus_freq, tclk, timeout;
int rc = 0;
if (IS_ERR(drv_data->clk)) {
@@ -832,10 +832,9 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
reset_control_deassert(drv_data->rstc);
}
- /* Its not yet defined how timeouts will be specified in device tree.
- * So hard code the value to 1 second.
- */
- drv_data->adapter.timeout = HZ;
+ if (of_property_read_u32(np, "timeout-ms", &timeout))
+ timeout = 1000; /* 1000ms by default */
+ drv_data->adapter.timeout = msecs_to_jiffies(timeout);
device = of_match_device(mv64xxx_i2c_of_match_table, dev);
if (!device)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
