From: Wolfram Sang <wsa@the-dreams.de>
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>,
linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Geert Uytterhoeven
<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>,
Wolfram Sang
<wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>
Subject: [PATCH v2 03/10] i2c: sh_mobile: honor DT bus speed settings
Date: Fri, 02 May 2014 19:15:09 +0000 [thread overview]
Message-ID: <1399058116-7721-4-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1399058116-7721-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/i2c/busses/i2c-sh_mobile.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index d2fa222df3d1..2e481abd50ce 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -657,6 +657,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
struct resource *res;
int size;
int ret;
+ u32 bus_speed;
pd = kzalloc(sizeof(struct sh_mobile_i2c_data), GFP_KERNEL);
if (pd = NULL) {
@@ -697,7 +698,9 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
}
/* Use platform data bus speed or STANDARD_MODE */
- pd->bus_speed = STANDARD_MODE;
+ ret = of_property_read_u32(dev->dev.of_node, "clock-frequency", &bus_speed);
+ pd->bus_speed = ret ? STANDARD_MODE : bus_speed;
+
if (pdata && pdata->bus_speed)
pd->bus_speed = pdata->bus_speed;
pd->clks_per_count = 1;
--
1.9.2
next prev parent reply other threads:[~2014-05-02 19:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-02 19:15 [PATCH v2 00/10] i2c: sh_mobile: cleanups & bugfixes Wolfram Sang
[not found] ` <1399058116-7721-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
2014-05-02 19:15 ` [PATCH v2 01/10] i2c: sh_mobile: replace magic hex values with constants Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 02/10] i2c: sh_mobile: improve error handling Wolfram Sang
2014-05-02 19:15 ` Wolfram Sang [this message]
2014-05-02 19:15 ` [PATCH v2 05/10] i2c: sh_mobile: devm conversion, low hanging fruits Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 08/10] i2c: sh_mobile: bail out on errors when initializing Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 09/10] i2c: sh_mobile: check timing parameters for valid range Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 04/10] i2c: sh_mobile: add devicetree documentation Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 06/10] i2c: sh_mobile: devm conversion, irq setup Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 07/10] i2c: sh_mobile: remove superfluous offset parameter Wolfram Sang
2014-05-02 19:15 ` [PATCH v2 10/10] i2c: sh_mobile: fix clock calculation for newer SoCs Wolfram Sang
2014-05-21 10:44 ` [PATCH v2 00/10] i2c: sh_mobile: cleanups & bugfixes Wolfram Sang
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=1399058116-7721-4-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).