On Thu, Dec 19, 2013 at 09:16:50AM -0600, Felipe Balbi wrote:
> Hi,
>
> On Thu, Dec 19, 2013 at 09:48:24AM +1100, Stephen Rothwell wrote:
> > On Wed, 18 Dec 2013 09:58:33 -0600 Felipe Balbi <balbi@xxxxxx> wrote:
> > >
> > > are you sure that patch is included ? I have just checked on
> > > greg/usb-linus that it's impossible to make CONFIG_USB=m and
> > > CONFIG_ISP1301_OMAP=y (same for the other phy driver from Freescale).
> > >
> > > I can also build omap1_defconfig with all possibilities for CONFIG_USB +
> > > CONFIG_ISP1301_OMAP, that is: N-N, M-M, Y-M.
> > >
> > > If you can still see the problem, then send me your .config and error
> > > messages. You could be seeing another problem.
> >
> > OK, I took Linus' tree of today, merged Greg's usb.current tree
> > (git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus)
> > and then your tree
> > (git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next) fixed
> > the merge conflict in drivers/usb/phy/Kconfig as per the email I sent
> > yesterday, added the merge fix patch I reported a few days ago (for the
> > usb_phy_gen_create_phy() API change). I then did an x86_64 allmodconfig
> > build and got:
> >
> > drivers/built-in.o: In function `otg_set_state':
> > drivers/usb/phy/phy-fsm-usb.c:170: undefined reference to `usb_bus_start_enum'
> >
> > .config attached.
> >
> > Greg's tree contains commit 7cd0c298f6e0 ("usb: phy: fix driver dependencies").
>
> found it, I need to fix it in next. Will do so now. Thanks
Actually, when I merged greg/usb-linus on top of my 'next', I got a
conflict which was enough to solve as below:
commit d86c94d1ddeb496cf53ace1a76274ebb1d935671
Merge: c139e14 fb5f183
Author: Felipe Balbi <balbi@xxxxxx>
Date: Thu Dec 19 09:20:49 2013 -0600
Merge remote-tracking branch 'greg/usb-linus' into merge
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
Conflicts:
drivers/usb/phy/Kconfig
diff --cc drivers/usb/phy/Kconfig
index 54bebba3,2b41c63..3ab63b5
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -6,14 -6,6 +6,15 @@@ menu "USB Physical Layer drivers
config USB_PHY
def_bool n
+config USB_OTG_FSM
- bool "USB 2.0 OTG FSM implementation"
++ tristate "USB 2.0 OTG FSM implementation"
+ select USB_OTG
+ select USB_PHY
++ depends on USB
+ help
+ Implements OTG Final State Machine as specified in On-The-Go
+ and Embedded Host Supplement to the USB Revision 2.0 Specification.
+
#
# USB Transceiver Drivers
#
This will make sure we have no bisection point where the build error
would still exist. I can merge Linus' -rc5 once it's out in my 'next'
branch and solve all problems at once.
cheers
--
balbi
Attachment:
signature.asc
Description: Digital signature
