From: Felipe Balbi <balbi@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Felipe Balbi <balbi@ti.com>,
Kishon Vijay Abraham I <kishon@ti.com>, <rob.herring@calxeda.com>,
<rob@landley.net>, <b-cousson@ti.com>,
<linux-usb@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-doc@vger.kernel.org>,
<devicetree-discuss@lists.ozlabs.org>,
<grant.likely@secretlab.ca>, <linux@arm.linux.org.uk>,
<gregkh@linuxfoundation.org>
Subject: Re: [PATCH v4 4/4] drivers: usb: start using the control module driver
Date: Mon, 4 Feb 2013 17:53:00 +0200 [thread overview]
Message-ID: <20130204155300.GC18237@arwen.pp.htv.fi> (raw)
In-Reply-To: <20130201191424.GQ22517@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]
Hi,
On Fri, Feb 01, 2013 at 11:14:24AM -0800, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [130125 02:30]:
> > Hi,
> >
> > On Fri, Jan 25, 2013 at 03:54:00PM +0530, Kishon Vijay Abraham I wrote:
> > > Start using the control module driver for powering on the PHY and for
> > > writing to the mailbox instead of writing to the control module
> > > registers on their own.
> > >
> > > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> > > ---
> > > Documentation/devicetree/bindings/usb/omap-usb.txt | 4 ++
> > > Documentation/devicetree/bindings/usb/usb-phy.txt | 7 +-
> > > arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 ----
> >
> > I'm taking this patch but I'm leaving out the omap_hwmod_44xx_data.c
> > change just to kill dependency. Can you send that single change as a
> > separate patch which Tony can queue ?
>
> For the USB patches, please also leave out patches touching
> arch/arm/mach-omap2/devices.c. Those are almost guaranteed to
> cause pointless merge conflicts with other branches.
>
> I suggest you set up few immutable branches:
>
> 1. Minimal platform_data changes for all your USB changes
>
> This should contain include/linux/platform_data changes and
> changes to arch/arm/*omap* so me and Paul can merge it in too
> to avoid merge conflicts.
>
> 2. The rest of the driver/usb changes
>
> This can then be based on #1 branch above.
>
> 3. Changes for the .dts files for Benoit
>
> These can be queued separately from #1 and #2 above.
I'm done with all USB stuff for this merge window. The patches which I
didn't take have no dependencies on any drivers/ part. You can easily
queue this through your tree.
cheers
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-02-04 15:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 10:23 [PATCH v4 0/4] usb: musb/dwc3: add driver for control module Kishon Vijay Abraham I
2013-01-25 10:23 ` [PATCH v4 1/4] drivers: usb: phy: add a new driver for usb part of " Kishon Vijay Abraham I
2013-01-25 11:01 ` Mark Rutland
2013-01-25 11:11 ` Felipe Balbi
2013-01-25 12:29 ` Mark Rutland
2013-01-25 14:59 ` Felipe Balbi
2013-01-25 16:14 ` Mark Rutland
2013-01-25 16:23 ` Felipe Balbi
2013-01-25 17:08 ` Mark Rutland
2013-01-25 10:23 ` [PATCH v4 2/4] ARM: OMAP: devices: create device " Kishon Vijay Abraham I
2013-01-25 10:23 ` [PATCH v4 3/4] ARM: OMAP2: MUSB: Specify omap4 has mailbox Kishon Vijay Abraham I
2013-01-25 10:24 ` [PATCH v4 4/4] drivers: usb: start using the control module driver Kishon Vijay Abraham I
2013-01-25 10:27 ` Felipe Balbi
2013-01-25 11:45 ` kishon
2013-02-01 19:14 ` Tony Lindgren
2013-02-04 15:53 ` Felipe Balbi [this message]
2013-02-04 17:22 ` Tony Lindgren
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=20130204155300.GC18237@arwen.pp.htv.fi \
--to=balbi@ti.com \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=tony@atomide.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®