From: Luis Oliveira <lolivei@xxxxxxxxxxxx>
Signed-off-by: Luis Oliveira <lolivei@xxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/i2c-designware.txt | 5 ++++-
drivers/i2c/busses/i2c-designware-platdrv.c | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
index fee26dc..d3d163c 100644
--- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
@@ -19,6 +19,8 @@ Optional properties :
- i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds.
This value which is by default 300ns is used to compute the tHIGH period.
+
+ - is-slave : indicates if the block is a I2C slave device.
Example :
@@ -30,7 +32,7 @@ Example :
interrupts = <11>;
clock-frequency = <400000>;
};
-
+
i2c@1120000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -42,4 +44,5 @@ Example :
i2c-sda-hold-time-ns = <300>;
i2c-sda-falling-time-ns = <300>;
i2c-scl-falling-time-ns = <300>;
+ is-slave;
};
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index b9076da..f29e657 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -238,7 +238,9 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
&dev->scl_falling_time);
device_property_read_u32(&pdev->dev, "clock-frequency",
&dev->clk_freq);
- is_slave = device_property_read_bool(&pdev->dev, "isslave");
+#ifndef CONFIG_ACPI
+ is_slave = device_property_read_bool(&pdev->dev, "is-slave");
+#endif
}
acpi_speed = i2c_acpi_find_bus_speed(&pdev->dev);
--
2.10.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
