From: Jan Weitzel <J.Weitzel@phytec.de>
To: barebox@lists.infradead.org
Subject: Re: [PATCH v2] i2c: omap: fix fclk_rate for ti,omap4-i2c
Date: Mon, 5 Jan 2015 13:22:04 +0100 [thread overview]
Message-ID: <20150105122203.GA5603@lws-weitzel2@phytec.de> (raw)
In-Reply-To: <1418291279-3610-1-git-send-email-j.weitzel@phytec.de>
On Thu, Dec 11, 2014 at 10:47:59AM +0100, Jan Weitzel wrote:
> The compatible "ti,omap4-i2c" don't help to get fclk_rate. So set it acording to
> cpu compatible: "ti,am33xx" and "ti,omap4"
>
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> ---
> v2: set i2c_data directly
>-9.0.1.i586.deb
ping
Jan
> drivers/i2c/busses/i2c-omap.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index 094f591..96c3c2b 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -271,11 +271,6 @@ static struct omap_i2c_driver_data am33xx_data = {
> .fclk_rate = 48000,
> };
>
> -static struct omap_i2c_driver_data omap4_of_data = {
> - .flags = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
> - .fclk_rate = 0,
> -};
> -
> static inline void omap_i2c_write_reg(struct omap_i2c_struct *i2c_omap,
> int reg, u16 val)
> {
> @@ -1011,6 +1006,11 @@ i2c_omap_probe(struct device_d *pdev)
> if (r)
> return r;
>
> + if (of_machine_is_compatible("ti,am33xx"))
> + i2c_data = &am33xx_data;
> + if (of_machine_is_compatible("ti,omap4"))
> + i2c_data = &omap4_data;
> +
> i2c_omap->data = i2c_data;
> i2c_omap->reg_shift = (i2c_data->flags >>
> OMAP_I2C_FLAG_BUS_SHIFT__SHIFT) & 3;
> @@ -1140,7 +1140,6 @@ static __maybe_unused struct of_device_id omap_i2c_dt_ids[] = {
> .data = (unsigned long)&omap3_data,
> }, {
> .compatible = "ti,omap4-i2c",
> - .data = (unsigned long)&omap4_of_data,
> }, {
> /* sentinel */
> }
> --
> 1.9.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-01-05 12:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 6:49 [PATCH] i2c: omap: fix fclk_rate for ti,omap4-i2c Jan Weitzel
2014-12-11 7:59 ` Sascha Hauer
2014-12-11 9:47 ` [PATCH v2] " Jan Weitzel
2015-01-05 12:22 ` Jan Weitzel [this message]
2015-01-06 13:47 ` Sascha Hauer
2015-01-07 11:00 ` Jan Weitzel
2014-12-17 13:59 ` [PATCH] " Jan Weitzel
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=20150105122203.GA5603@lws-weitzel2@phytec.de \
--to=j.weitzel@phytec.de \
--cc=barebox@lists.infradead.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.