Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8e2ff46 authored by Gupta, Ajay Kumar's avatar Gupta, Ajay Kumar Committed by Greg Kroah-Hartman
Browse files

USB: musb: fix the nop registration for OMAP3EVM 



OMAP3EVM uses ISP1504 phy which doesn't require any programming and
thus has to use NOP otg transceiver.

Cleanups being done:
	- Remove unwanted code in usb-musb.c file
	- Register NOP in OMAP3EVM board file using
	  usb_nop_xceiv_register().
	- Select NOP_USB_XCEIV for OMAP3EVM boards.
	- Don't enable TWL4030_USB in omap3_evm_defconfig

Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: default avatarEino-Ville Talvala <talvala@stanford.edu>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 18753ebc

arch/arm/configs/omap3_evm_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ CONFIG_USB_ZERO=m 
CONFIG_USB_OTG_UTILS=y

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_ISP1301_OMAP is not set

CONFIG_TWL4030_USB=y

# CONFIG_TWL4030_USB is not set

# CONFIG_NOP_USB_XCEIV is not set

CONFIG_MMC=y

# CONFIG_MMC_DEBUG is not set

arch/arm/mach-omap2/board-omap3evm.c

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl4030.h>

#include <linux/usb/otg.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -307,6 +308,10 @@ static void __init omap3_evm_init(void) 
				ARRAY_SIZE(omap3evm_spi_board_info));



	omap_serial_init();

#ifdef CONFIG_NOP_USB_XCEIV

	/* OMAP3EVM uses ISP1504 phy and so register nop transceiver */

	usb_nop_xceiv_register();

#endif

	usb_musb_init();

	ads7846_dev_init();

}

arch/arm/mach-omap2/usb-musb.c

+0 −21
Original line number Diff line number Diff line
@@ -155,20 +155,6 @@ static struct platform_device musb_device = { 
	.resource	= musb_resources,

};



#ifdef CONFIG_NOP_USB_XCEIV

static u64 nop_xceiv_dmamask = DMA_BIT_MASK(32);



static struct platform_device nop_xceiv_device = {

	.name		= "nop_usb_xceiv",

	.id		= -1,

	.dev = {

		.dma_mask		= &nop_xceiv_dmamask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

		.platform_data		= NULL,

	},

};

#endif



void __init usb_musb_init(void)

{

	if (cpu_is_omap243x())
@@ -183,13 +169,6 @@ void __init usb_musb_init(void) 
	 */

	musb_plat.clock = "ick";



#ifdef CONFIG_NOP_USB_XCEIV

	if (platform_device_register(&nop_xceiv_device) < 0) {

		printk(KERN_ERR "Unable to register NOP-XCEIV device\n");

		return;

	}

#endif



	if (platform_device_register(&musb_device) < 0) {

		printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");

		return;

drivers/usb/musb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config USB_MUSB_HDRC 
	depends on !SUPERH

	select NOP_USB_XCEIV if ARCH_DAVINCI

	select TWL4030_USB if MACH_OMAP_3430SDP

	select NOP_USB_XCEIV if MACH_OMAP3EVM

	select USB_OTG_UTILS

	tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'

	help