From: Anand Gadiyar <gadiyar@ti.com>
To: Ming Lei <tom.leiming@gmail.com>, Benoit Cousson <b-cousson@ti.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Paul Walmsley <paul@pwsan.com>, Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Felipe Balbi <balbi@ti.com>, Tony Lindgren <tony@atomide.com>,
linux-omap@vger.kernel.org
Subject: RE: linux-next: manual merge of the usb tree with the omap tree
Date: Thu, 6 Jan 2011 20:37:59 +0530 [thread overview]
Message-ID: <4ce0f816f951f24ca3de9c84d9f70842@mail.gmail.com> (raw)
In-Reply-To: <AANLkTi=pTNg2iWN+=uEv=CyZHHCoddF51pmmCMjPeMUF@mail.gmail.com>
Ming Lei wrote:
> Hi,
>
> 2010/12/24 Cousson, Benoit <b-cousson@ti.com>:
> > + Paul "the omap clock guru".
> >
> > At first glance, that seems almost good.
> > Except for a couple of nodes that seems to lose their 3630 support.
> >
> > I'm just wondering why the original usb clock node is
> > kept after the introduction of the "ehci-omap.0" clock
> > node. But this is anyway harmless.
> >
> > What commits are generating this conflict?
> >
> > On 12/23/2010 7:18 AM, Stephen Rothwell wrote:
> >> Hi Greg,
> >>
> >> Today's linux-next merge of the usb tree got a conflict in
> >> arch/arm/mach-omap2/clock3xxx_data.c and
> >> arch/arm/mach-omap2/clock44xx_data.c between various commits from the
omap
> >> tree and various commits from the usb tree.
> >>
> >> I did a quick fix (which may be completely wrong - see below).
> >
<snip>
> > I'm not sure these 3 nodes should be removed. AFAIR, they
> were just slightly moved in lo branch.
>
> Even with the fixes above, ehci on my beagle xM/Panda still
> doesn't work
> with 2.6.37-next-20110106+, follows the failure messages:
>
> [ 57.918182] bus: 'platform': really_probe: probing driver
ehci-omapwith device ehci-omap.0
> [ 57.918243] ehci-omap ehci-omap.0: failed to get ehci port0 regulator
> [ 57.918273] ehci-omap ehci-omap.0: failed to get ehci port1 regulator
> [ 57.918304] ehci-omap ehci-omap.0: starting TI EHCI USB Controller
> [ 57.918457] ehci-omap ehci-omap.0: OMAP UHH_REVISION 0x10
> [ 57.918487] ehci-omap ehci-omap.0: TLL RESET DONE
> [ 57.918487] ehci-omap ehci-omap.0: OMAP3 ES version > ES2.1
> [ 57.918518] ehci-omap ehci-omap.0: UHH setup done, uhh_hostconfig=31c
> [ 58.922302] ehci-omap ehci-omap.0: phy reset operation timed out
> [ 59.930114] ehci-omap ehci-omap.0: phy reset operation timed out
> [ 59.930145] ehci-omap ehci-omap.0: reset hcs_params 0x1313 dbg=0 cc=1
pcc=3 ordered ports=3
> [ 59.930175] ehci-omap ehci-omap.0: reset hcc_params 0016 thresh 1
uframes 256/512/1024 park
> [ 59.930206] ehci-omap ehci-omap.0: OMAP-EHCI Host Controller
> [ 59.936218] drivers/usb/core/inode.c: creating file 'devices'
> [ 59.936279] drivers/usb/core/inode.c: creating file '001'
>
> Any ideas?
>
I'll take a look in a short while. I don't have an XM to
test, so you'll have to help me out here.
- Anand
next prev parent reply other threads:[~2011-01-06 15:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-23 6:18 linux-next: manual merge of the usb tree with the omap tree Stephen Rothwell
2010-12-23 6:18 ` Stephen Rothwell
2010-12-23 8:36 ` Felipe Balbi
2010-12-23 18:29 ` Cousson, Benoit
2011-01-06 15:02 ` Ming Lei
2011-01-06 15:07 ` Anand Gadiyar [this message]
2011-01-06 15:25 ` Ming Lei
2011-01-06 15:50 ` Ming Lei
2011-01-07 14:07 ` Anand Gadiyar
2011-01-07 14:15 ` Ming Lei
2011-01-07 14:39 ` Anand Gadiyar
2011-01-07 15:20 ` Anand Gadiyar
2011-01-07 18:54 ` Gadiyar, Anand
2011-01-07 19:24 ` Felipe Balbi
2011-01-10 13:53 ` Ming Lei
2011-01-10 14:09 ` Anand Gadiyar
2011-01-06 15:43 ` Brad Parker
2011-01-06 16:59 ` Koen Kooi
2011-01-06 17:57 ` Nishanth Menon
2011-01-06 18:15 ` Kevin Hilman
2011-01-06 18:21 ` Nishanth Menon
2011-01-06 18:38 ` Kevin Hilman
2011-01-06 20:24 ` Nishanth Menon
2011-01-06 21:29 ` Kevin Hilman
2011-01-06 18:27 ` Paul Walmsley
-- strict thread matches above, loose matches on Subject: below --
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 ` Stephen Rothwell
2011-03-02 5:58 Stephen Rothwell
2011-03-02 5:58 ` Stephen Rothwell
2011-03-02 5:57 Stephen Rothwell
2011-03-02 5:57 ` Stephen Rothwell
2011-03-03 8:48 ` Felipe Balbi
2011-03-03 16:02 ` Greg KH
2011-03-03 17:39 ` Felipe Balbi
2011-03-02 5:57 Stephen Rothwell
2011-03-02 5:57 ` Stephen Rothwell
2011-03-02 8:23 ` Felipe Balbi
2011-03-02 14:23 ` Greg KH
2011-03-03 8:18 ` Felipe Balbi
2009-11-11 8:30 Stephen Rothwell
2009-11-11 8:30 ` Stephen Rothwell
2009-11-11 19:12 ` Tony Lindgren
2009-11-11 19:20 ` Tony Lindgren
2009-11-11 21:52 ` Stephen Rothwell
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=4ce0f816f951f24ca3de9c84d9f70842@mail.gmail.com \
--to=gadiyar@ti.com \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=sfr@canb.auug.org.au \
--cc=tom.leiming@gmail.com \
--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 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.