From: Phil Edworthy <phil.edworthy@renesas.com>
To: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
Phil Edworthy <phil.edworthy@renesas.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH 2/2] i2c: designware: Add support for a bus clock
Date: Mon, 16 Jul 2018 09:59:13 +0100 [thread overview]
Message-ID: <1531731553-22979-3-git-send-email-phil.edworthy@renesas.com> (raw)
In-Reply-To: <1531731553-22979-1-git-send-email-phil.edworthy@renesas.com>
The Synopsys I2C Controller has a bus clock, but typically SoCs hide this away.
However, on some SoCs you need to explicity enable the bus clock in order to
access the registers.
Therefore, enable an optional bus clock specified by DT.
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
---
drivers/i2c/busses/i2c-designware-common.c | 14 +++++++++++++-
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-platdrv.c | 2 ++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c
index 48914df..4fa67d6 100644
--- a/drivers/i2c/busses/i2c-designware-common.c
+++ b/drivers/i2c/busses/i2c-designware-common.c
@@ -186,13 +186,25 @@ unsigned long i2c_dw_clk_rate(struct dw_i2c_dev *dev)
int i2c_dw_prepare_clk(struct dw_i2c_dev *dev, bool prepare)
{
+ int ret;
+
if (IS_ERR(dev->clk))
return PTR_ERR(dev->clk);
- if (prepare)
+ if (prepare) {
+ /* Optional bus clock */
+ if (!IS_ERR(dev->busclk)) {
+ ret = clk_prepare_enable(dev->busclk);
+ if (ret)
+ return ret;
+ }
+
return clk_prepare_enable(dev->clk);
+ }
clk_disable_unprepare(dev->clk);
+ clk_disable_unprepare(dev->busclk);
+
return 0;
}
EXPORT_SYMBOL_GPL(i2c_dw_prepare_clk);
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index d690e64..10f905d 100644
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -239,6 +239,7 @@ struct dw_i2c_dev {
void __iomem *base;
struct completion cmd_complete;
struct clk *clk;
+ struct clk *busclk;
struct reset_control *rst;
struct i2c_client *slave;
u32 (*get_clk_rate_khz) (struct dw_i2c_dev *dev);
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 5660daf..64389fe 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -332,6 +332,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
else
i2c_dw_configure_master(dev);
+ /* Optional bus clock */
+ dev->busclk = devm_clk_get(&pdev->dev, "bus");
dev->clk = devm_clk_get(&pdev->dev, NULL);
if (!i2c_dw_prepare_clk(dev, true)) {
dev->get_clk_rate_khz = i2c_dw_get_clk_rate_khz;
--
2.7.4
next prev parent reply other threads:[~2018-07-16 8:59 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 8:59 [PATCH 0/2] i2c: designware: Add support for a bus clock Phil Edworthy
2018-07-16 8:59 ` Phil Edworthy
2018-07-16 8:59 ` [PATCH 1/2] dt: snps,designware-i2c: Add clock bindings documentation Phil Edworthy
2018-07-20 16:19 ` Rob Herring
2018-07-16 8:59 ` Phil Edworthy [this message]
2018-07-17 12:07 ` [PATCH 2/2] i2c: designware: Add support for a bus clock Simon Horman
2018-07-17 12:23 ` Andy Shevchenko
2018-07-17 12:42 ` Phil Edworthy
2018-07-17 12:42 ` Phil Edworthy
2018-07-17 13:01 ` Geert Uytterhoeven
2018-07-17 13:12 ` Phil Edworthy
2018-07-17 14:18 ` Andy Shevchenko
2018-07-17 14:18 ` Andy Shevchenko
2018-07-17 14:40 ` Phil Edworthy
2018-07-17 14:40 ` Phil Edworthy
2018-07-17 14:47 ` Andy Shevchenko
2018-07-17 14:47 ` Andy Shevchenko
2018-07-17 14:57 ` Phil Edworthy
2018-07-17 14:57 ` Phil Edworthy
2018-07-18 9:14 ` Simon Horman
2018-07-18 9:14 ` Simon Horman
2018-07-18 9:21 ` Phil Edworthy
2018-07-18 9:21 ` Phil Edworthy
2018-07-19 7:42 ` Simon Horman
2018-07-19 7:42 ` Simon Horman
2018-07-18 11:06 ` Geert Uytterhoeven
2018-07-18 12:52 ` Andy Shevchenko
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=1531731553-22979-3-git-send-email-phil.edworthy@renesas.com \
--to=phil.edworthy@renesas.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=geert@linux-m68k.org \
--cc=jarkko.nikula@linux.intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mika.westerberg@linux.intel.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 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.