From: Kevin Hilman <khilman@ti.com>
To: Shubhrajyoti D <shubhrajyoti@ti.com>
Cc: linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org,
santosh.shilimkar@ti.com
Subject: Re: [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE
Date: Tue, 02 Aug 2011 16:16:02 -0700 [thread overview]
Message-ID: <877h6v8kwd.fsf@ti.com> (raw)
In-Reply-To: <1311953092-12506-1-git-send-email-shubhrajyoti@ti.com> (Shubhrajyoti D.'s message of "Fri, 29 Jul 2011 20:54:52 +0530")
Shubhrajyoti D <shubhrajyoti@ti.com> writes:
> Currently for OMAP4 the I2C_WE is not programmed.
> This patch enables the programming for OMAP4.
>
> This patch fixes a bad conflict resolution.
> This effectively restores the following commit
>
> Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup]
>
> which got changed by
>
> Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming]
>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
> Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
> TODO:
> Currently all the wakeup sources are enabled.
> There is scope of optimising the same. Will revisit it.
> Rebased on Kevin's wip/i2c branch
Actually, this is based on top of your I2C reset series.
Please rebase this onto my for_3.1/i2c-andy branch, and I'll queue it as
a fix for v3.1.
Thanks,
Kevin
next prev parent reply other threads:[~2011-08-02 23:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-29 15:24 [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE Shubhrajyoti D
[not found] ` <1311953092-12506-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2011-08-02 23:05 ` Kevin Hilman
2011-08-02 23:16 ` Kevin Hilman [this message]
2011-08-03 6:09 ` Shubhrajyoti
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=877h6v8kwd.fsf@ti.com \
--to=khilman@ti.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=shubhrajyoti@ti.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.