From: Kevin Hilman <khilman-l0cyMroinI0@public.gmane.org>
To: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>,
Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
santosh.shilimkar-l0cyMroinI0@public.gmane.org
Subject: Re: [PATCHv3] OMAP4: I2C: Enable the wakeup in I2C_WE
Date: Wed, 03 Aug 2011 11:26:26 -0700 [thread overview]
Message-ID: <87ty9y5p2l.fsf@ti.com> (raw)
In-Reply-To: <1312360088-3117-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org> (Shubhrajyoti D.'s message of "Wed, 3 Aug 2011 13:58:08 +0530")
[adding Ben Dooks, in the future, please be sure to put maintainers To/Cc]
Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> 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-l0cyMroinI0@public.gmane.org>
> Reported-by: Santosh Shilimkar <santosh.shilimkar-l0cyMroinI0@public.gmane.org>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> ---
> TODO:
> Currently all the wakeup sources are enabled.
> There is scope of optimising the same. Will revisit it.
> Rebased on for_3.1/i2c-andy
Thanks, adding to my for_3.1/i2c-fixes queue for v3.1-rc.
Ben, with your ack, I'm willing to queue these.
Kevin
prev parent reply other threads:[~2011-08-03 18:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-03 8:28 [PATCHv3] OMAP4: I2C: Enable the wakeup in I2C_WE Shubhrajyoti D
[not found] ` <1312360088-3117-1-git-send-email-shubhrajyoti-l0cyMroinI0@public.gmane.org>
2011-08-03 18:26 ` Kevin Hilman [this message]
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=87ty9y5p2l.fsf@ti.com \
--to=khilman-l0cymroini0@public.gmane.org \
--cc=ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=santosh.shilimkar-l0cyMroinI0@public.gmane.org \
--cc=shubhrajyoti-l0cyMroinI0@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