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 2/2] i2c: designware: add speed mode device tree setting
Date: Tue, 19 Aug 2014 13:34:36 -0500 [thread overview]
Message-ID: <1408473276-10847-2-git-send-email-atull@opensource.altera.com> (raw)
In-Reply-To: <1408473276-10847-1-git-send-email-atull@opensource.altera.com>
From: Alan Tull <atull@opensource.altera.com>
Add "speed-mode" Device Tree property to select between
standard and fast i2c mode. Previously, driver was hardwired
as fast mode. Default to fast mode if property is not
present.
Signed-off-by: Alan Tull <atull@opensource.altera.com>
---
drivers/i2c/busses/i2c-designware-platdrv.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index bc87733..3fdc775 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -122,7 +122,7 @@ 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, speed_prop, ret, speed = DW_IC_CON_SPEED_FAST;
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
@@ -167,6 +167,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,
+ "speed-mode", &speed_prop);
+ if (!ret && (speed_prop == 0))
+ speed = DW_IC_CON_SPEED_STD;
}
dev->functionality =
@@ -177,7 +182,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 prev parent reply other threads:[~2014-08-19 18:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-19 18:34 [PATCH 1/2] i2c: designware: device tree bindings for i2c speed mode atull
2014-08-19 18:34 ` atull [this message]
2014-08-19 19:15 ` Wolfram Sang
2014-08-19 20:24 ` atull
2014-08-20 9:34 ` Mark Rutland
2014-08-20 9:36 ` Mark Rutland
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=1408473276-10847-2-git-send-email-atull@opensource.altera.com \
--to=atull@opensource.altera.com \
--cc=Romain.Baeriswyl@abilis.com \
--cc=alan@linux.intel.com \
--cc=baruch@tkos.co.il \
--cc=delicious.quinoa@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@opensource.altera.com \
--cc=grant.likely@linaro.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=robh+dt@kernel.org \
--cc=skuribay@pobox.com \
--cc=wsa@the-dreams.de \
--cc=yvanderv@opensource.altera.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome