From: <atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org>
To: wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org,
baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org,
mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
skuribay-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org,
Romain.Baeriswyl-ux6zf3SgZrrQT0dZR+AlfA@public.gmane.org,
rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
dinguyen-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org,
yvanderv-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org,
Alan Tull
<atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org>
Subject: [PATCH] i2c: designware: deduce speed mode from device tree setting
Date: Tue, 19 Aug 2014 15:18:49 -0500 [thread overview]
Message-ID: <1408479529-24249-1-git-send-email-atull@opensource.altera.com> (raw)
From: Alan Tull <atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org>
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-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org>
---
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
WARNING: multiple messages have this Message-ID (diff)
From: <atull@opensource.altera.com>
To: <wsa@the-dreams.de>, <baruch@tkos.co.il>,
<mika.westerberg@linux.intel.com>
Cc: <grant.likely@linaro.org>, <robh+dt@kernel.org>,
<skuribay@pobox.com>, <Romain.Baeriswyl@abilis.com>,
<rafael.j.wysocki@intel.com>, <alan@linux.intel.com>,
<linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<devicetree@vger.kernel.org>, <delicious.quinoa@gmail.com>,
<dinguyen@opensource.altera.com>,
<yvanderv@opensource.altera.com>,
Alan Tull <atull@opensource.altera.com>
Subject: [PATCH] i2c: designware: deduce speed mode from device tree setting
Date: Tue, 19 Aug 2014 15:18:49 -0500 [thread overview]
Message-ID: <1408479529-24249-1-git-send-email-atull@opensource.altera.com> (raw)
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
next reply other threads:[~2014-08-19 20:18 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 20:18 atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx [this message]
2014-08-19 20:18 ` [PATCH] i2c: designware: deduce speed mode from device tree setting atull
[not found] ` <1408479529-24249-1-git-send-email-atull-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org>
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
[not found] ` <944257148.1724.1408528177642.JavaMail.root-ux6zf3SgZrrQT0dZR+AlfA@public.gmane.org>
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
[not found] ` <1791089693.2989.1408545513401.JavaMail.root-ux6zf3SgZrrQT0dZR+AlfA@public.gmane.org>
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
[not found] ` <1408544948-22339-1-git-send-email-romainba-ux6zf3SgZrrQT0dZR+AlfA@public.gmane.org>
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-20 9:24 ` Wolfram Sang
2014-09-20 9:24 ` Wolfram Sang
2014-09-28 3:40 ` atull
2014-09-28 3:40 ` atull
2014-09-18 15:52 ` atull
2014-09-18 15:52 ` atull
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408479529-24249-1-git-send-email-atull@opensource.altera.com \
--to=atull-yzvpicuk2abmcg4ihk0kfoh6mc4mb0vx@public.gmane.org \
--cc=Romain.Baeriswyl-ux6zf3SgZrrQT0dZR+AlfA@public.gmane.org \
--cc=alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org \
--cc=delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dinguyen-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org \
--cc=grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \
--cc=rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=skuribay-e+AXbWqSrlAAvxtiuMwx3w@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org \
--cc=yvanderv-yzvPICuk2ABMcg4IHK0kFoH6Mc4MB0Vx@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.