All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] i2c: designware: deduce speed mode from device tree setting
@ 2014-08-19 20:18 ` atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx
  0 siblings, 0 replies; 31+ messages in thread
From: atull @ 2014-08-19 20:18 UTC (permalink / raw)
  To: wsa, baruch, mika.westerberg
  Cc: grant.likely, robh+dt, skuribay, Romain.Baeriswyl,
	rafael.j.wysocki, alan, linux-i2c, linux-kernel, devicetree,
	delicious.quinoa, dinguyen, yvanderv, Alan Tull

From: Alan Tull <atull@opensource.altera.com>

Use the documented, but unimplemented "clock-frequency"
Device Tree setting as a guide on whether to set the speed
mode bits in DW_IC_CON to standard or fast i2c mode.

Previously, the driver was hardwired to fast mode.  Default
to fast mode if the "clock-frequency" property is not present
for backwards compatiblity.

Signed-off-by: Alan Tull <atull@opensource.altera.com>
---
 drivers/i2c/busses/i2c-designware-platdrv.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index bc87733..18cd3d9 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -122,7 +122,8 @@ static int dw_i2c_probe(struct platform_device *pdev)
 	struct dw_i2c_dev *dev;
 	struct i2c_adapter *adap;
 	struct resource *mem;
-	int irq, r;
+	int irq, r, ret, speed = DW_IC_CON_SPEED_FAST;
+	u32 bus_rate;
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
@@ -167,6 +168,11 @@ static int dw_i2c_probe(struct platform_device *pdev)
 		of_property_read_u32(pdev->dev.of_node,
 				     "i2c-scl-falling-time-ns",
 				     &dev->scl_falling_time);
+
+		ret = of_property_read_u32(pdev->dev.of_node,
+					   "clock-frequency", &bus_rate);
+		if (!ret && (bus_rate <= 100000))
+			speed = DW_IC_CON_SPEED_STD;
 	}
 
 	dev->functionality =
@@ -177,7 +183,7 @@ static int dw_i2c_probe(struct platform_device *pdev)
 		I2C_FUNC_SMBUS_WORD_DATA |
 		I2C_FUNC_SMBUS_I2C_BLOCK;
 	dev->master_cfg =  DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |
-		DW_IC_CON_RESTART_EN | DW_IC_CON_SPEED_FAST;
+		DW_IC_CON_RESTART_EN | speed;
 
 	/* Try first if we can configure the device from ACPI */
 	r = dw_i2c_acpi_configure(pdev);
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2014-09-28  3:40 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-19 20:18 [PATCH] i2c: designware: deduce speed mode from device tree setting atull
2014-08-19 20:18 ` atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx
2014-08-20  7:52 ` Mika Westerberg
2014-08-20  7:52   ` Mika Westerberg
2014-08-20  9:22 ` Mark Rutland
2014-08-20  9:22   ` Mark Rutland
2014-08-20  9:49   ` Romain Baeriswyl
2014-08-20  9:49     ` Romain Baeriswyl
2014-08-20 12:07     ` Romain Baeriswyl
2014-08-20 12:32     ` Wolfram Sang
2014-08-20 12:32       ` Wolfram Sang
2014-08-20 14:24     ` atull
2014-08-20 14:24       ` atull
2014-08-20 14:38       ` Romain Baeriswyl
2014-08-20 14:38         ` Romain Baeriswyl
2014-08-20 15:12         ` atull
2014-08-20 15:12           ` atull
2014-08-20 12:36   ` Wolfram Sang
2014-08-20 12:42     ` Mark Rutland
2014-08-20 14:29       ` [PATCH] i2c designware add support of I2C standard mode Romain Baeriswyl
2014-08-20 14:29         ` Romain Baeriswyl
2014-08-20 14:32         ` atull
2014-08-20 14:32           ` atull
2014-08-20 15:25           ` atull
2014-08-20 15:25             ` atull
2014-09-18 15:52         ` atull
2014-09-18 15:52           ` atull
2014-09-20  9:24         ` Wolfram Sang
2014-09-20  9:24           ` Wolfram Sang
2014-09-28  3:40           ` atull
2014-09-28  3:40             ` atull

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.