Patchwork [1/2] ARM: imx_v6_v7_defconfig: add CONFIG_USB_PHY

login
register
mail settings
Submitter Shawn Guo
Date March 24, 2013, 2:06 p.m.
Message ID <1364133966-22373-1-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/230457/
State New
Headers show

Comments

Shawn Guo - March 24, 2013, 2:06 p.m.
Commit edc7cb2 (usb: phy: make it a menuconfig) makes USB_MXS_PHY
be a sub-item of menuconfig symbol USB_PHY.  This change gets the
selection of CONFIG_USB_MXS_PHY in imx_v6_v7_defconfig lost.  Hence the
boot stops at the point below.

  ci_hdrc ci_hdrc.0: doesn't support gadget
  ci_hdrc ci_hdrc.0: EHCI Host Controller
  ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1

Add CONFIG_USB_PHY to have the CONFIG_USB_MXS_PHY selection back to
work.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/configs/imx_v6_v7_defconfig |    1 +
 1 file changed, 1 insertion(+)
Felipe Balbi - April 2, 2013, 8:07 a.m.
On Sun, Mar 24, 2013 at 10:06:04PM +0800, Shawn Guo wrote:
> Commit edc7cb2 (usb: phy: make it a menuconfig) makes USB_MXS_PHY
> be a sub-item of menuconfig symbol USB_PHY.  This change gets the
> selection of CONFIG_USB_MXS_PHY in imx_v6_v7_defconfig lost.  Hence the
> boot stops at the point below.
> 
>   ci_hdrc ci_hdrc.0: doesn't support gadget
>   ci_hdrc ci_hdrc.0: EHCI Host Controller
>   ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1
> 
> Add CONFIG_USB_PHY to have the CONFIG_USB_MXS_PHY selection back to
> work.
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

should I take this or will Russell queue it during -rc ?
Shawn Guo - April 2, 2013, 11:12 a.m.
On Tue, Apr 02, 2013 at 11:07:06AM +0300, Felipe Balbi wrote:
> On Sun, Mar 24, 2013 at 10:06:04PM +0800, Shawn Guo wrote:
> > Commit edc7cb2 (usb: phy: make it a menuconfig) makes USB_MXS_PHY
> > be a sub-item of menuconfig symbol USB_PHY.  This change gets the
> > selection of CONFIG_USB_MXS_PHY in imx_v6_v7_defconfig lost.  Hence the
> > boot stops at the point below.
> > 
> >   ci_hdrc ci_hdrc.0: doesn't support gadget
> >   ci_hdrc ci_hdrc.0: EHCI Host Controller
> >   ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1
> > 
> > Add CONFIG_USB_PHY to have the CONFIG_USB_MXS_PHY selection back to
> > work.
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> 
> should I take this or will Russell queue it during -rc ?

Though I can send it via arm-soc tree when your patches land on
mainline, I think the easier way is that you take both patches via
your tree.

Shawn
Felipe Balbi - April 2, 2013, 12:44 p.m.
Hi,

On Tue, Apr 02, 2013 at 07:12:47PM +0800, Shawn Guo wrote:
> On Tue, Apr 02, 2013 at 11:07:06AM +0300, Felipe Balbi wrote:
> > On Sun, Mar 24, 2013 at 10:06:04PM +0800, Shawn Guo wrote:
> > > Commit edc7cb2 (usb: phy: make it a menuconfig) makes USB_MXS_PHY
> > > be a sub-item of menuconfig symbol USB_PHY.  This change gets the
> > > selection of CONFIG_USB_MXS_PHY in imx_v6_v7_defconfig lost.  Hence the
> > > boot stops at the point below.
> > > 
> > >   ci_hdrc ci_hdrc.0: doesn't support gadget
> > >   ci_hdrc ci_hdrc.0: EHCI Host Controller
> > >   ci_hdrc ci_hdrc.0: new USB bus registered, assigned bus number 1
> > > 
> > > Add CONFIG_USB_PHY to have the CONFIG_USB_MXS_PHY selection back to
> > > work.
> > > 
> > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > 
> > should I take this or will Russell queue it during -rc ?
> 
> Though I can send it via arm-soc tree when your patches land on
> mainline, I think the easier way is that you take both patches via
> your tree.

alright, in that case can you rebase on next branch ? patch 2 didn't
apply.

thank you
Shawn Guo - April 2, 2013, 2:19 p.m.
On Tue, Apr 02, 2013 at 03:44:07PM +0300, Felipe Balbi wrote:
> alright, in that case can you rebase on next branch ? patch 2 didn't
> apply.

Have you tried "git am -3"?

Shawn
Fabio Estevam - April 12, 2013, 12:48 a.m.
Hi Felipe,

On Tue, Apr 2, 2013 at 11:19 AM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Tue, Apr 02, 2013 at 03:44:07PM +0300, Felipe Balbi wrote:
>> alright, in that case can you rebase on next branch ? patch 2 didn't
>> apply.
>
> Have you tried "git am -3"?

Please let us know if you still face issues applying this one.

Booting a linux-next kernel without this fix is hanging the system.

Thanks,

Fabio Estevam

Patch

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index e36b010..088d6c1 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -188,6 +188,7 @@  CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y