From: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
To: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Shawn Guo <shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: Re: [PATCH] i2c: mxs: correctly setup speed for non devicetree
Date: Sat, 15 Sep 2012 20:09:44 +0200 [thread overview]
Message-ID: <201209152009.44320.marex@denx.de> (raw)
In-Reply-To: <1347118732-4896-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Dear Wolfram Sang,
> Commit cd4f2d4 (i2c: mxs: Set I2C timing registers for mxs-i2c) only
> covered the case for devicetree and made platform_data based boards
> bail out with -EINVAL. Correctly support the latter one, too.
MXS is now DT only, so this patch is pointless. Rather make it depend on
CONFIG_OF and be done with it, maybe remove the non-DT code.
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> ---
> drivers/i2c/busses/i2c-mxs.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
> index 088c5c1..51f05b8 100644
> --- a/drivers/i2c/busses/i2c-mxs.c
> +++ b/drivers/i2c/busses/i2c-mxs.c
> @@ -365,10 +365,6 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c)
> struct device_node *node = dev->of_node;
> int ret;
>
> - if (!node)
> - return -EINVAL;
> -
> - i2c->speed = &mxs_i2c_95kHz_config;
> ret = of_property_read_u32(node, "clock-frequency", &speed);
> if (ret)
> dev_warn(dev, "No I2C speed selected, using 100kHz\n");
> @@ -419,10 +415,13 @@ static int __devinit mxs_i2c_probe(struct
> platform_device *pdev) return err;
>
> i2c->dev = dev;
> + i2c->speed = &mxs_i2c_95kHz_config;
>
> - err = mxs_i2c_get_ofdata(i2c);
> - if (err)
> - return err;
> + if (dev->of_node) {
> + err = mxs_i2c_get_ofdata(i2c);
> + if (err)
> + return err;
> + }
>
> platform_set_drvdata(pdev, i2c);
Best regards,
Marek Vasut
next prev parent reply other threads:[~2012-09-15 18:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-08 15:38 [PATCH] i2c: mxs: correctly setup speed for non devicetree Wolfram Sang
[not found] ` <1347118732-4896-1-git-send-email-w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-09-15 18:09 ` Marek Vasut [this message]
[not found] ` <201209152009.44320.marex-ynQEQJNshbs@public.gmane.org>
2012-09-16 8:15 ` Wolfram Sang
[not found] ` <20120916081525.GA4367-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2012-09-16 10:05 ` Marek Vasut
[not found] ` <201209161205.42575.marex-ynQEQJNshbs@public.gmane.org>
2012-09-16 10:24 ` 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=201209152009.44320.marex@denx.de \
--to=marex-ynqeqjnshbs@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=shawn.guo-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@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.