From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Nikula Subject: MUSB regression in 2.6.31-rc6 Date: Sat, 15 Aug 2009 17:43:52 +0300 Message-ID: <20090815174352.c2883585.jhnikula@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ew0-f214.google.com ([209.85.219.214]:62277 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662AbZHOOmY (ORCPT ); Sat, 15 Aug 2009 10:42:24 -0400 Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: ajay.gupta@ti.com Cc: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, Felipe Balbi Hi BeagleBoard stopped booting at 2.6.31-rc6 and it turned out that this commit broke it: commit e8e2ff462dd92693f29eb848f42d3eb720390d59 Author: Gupta, Ajay Kumar Date: Wed Jul 29 11:58:57 2009 +0530 USB: musb: fix the nop registration for OMAP3EVM While this is easy to fix for the Beagle with a patch below, I don't know how many other OMAP boards there are which should be fixed as well. Or would it be better to revert the patch itself for 2.6.31? -- Jarkko --- diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 991ac9c..2ca0d44 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -406,6 +407,10 @@ static void __init omap3_beagle_init(void) /* REVISIT leave DVI powered down until it's needed ... */ gpio_direction_output(170, true); +#ifdef CONFIG_NOP_USB_XCEIV + /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ + usb_nop_xceiv_register(); +#endif usb_musb_init(); omap3beagle_flash_init(); } diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 803adcb..e27ed96 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -13,6 +13,7 @@ config USB_MUSB_HDRC select NOP_USB_XCEIV if ARCH_DAVINCI select TWL4030_USB if MACH_OMAP_3430SDP select NOP_USB_XCEIV if MACH_OMAP3EVM + select NOP_USB_XCEIV if MACH_OMAP3_BEAGLE select USB_OTG_UTILS tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' help