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

Commit 5cdc5bd8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'musb-hw' of git://gitorious.org/usb/usb into musb 

* 'musb-hw' of git://gitorious.org/usb/usb: (43 commits)
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  arm: OMAP4430: musb: Configure musb to OTG mode
  usb: musb: Adding musb support for OMAP4430
  usb: otg: TWL6030: Add twl6030_usb file for compilation
  mfd: TWL6030: OMAP4: Registering the TWL6030-usb device
  usb: musb: TWL6030: Selecting TWL6030_USB transceiver
  usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver.
  usb: otg: Adding twl6030-usb transceiver driver for OMAP4430
  mfd: TWL6030: USBOTG VBUS event generation on
  usb: musb: add support for ux500 platform
  musb: am35x: fix compile error due to control apis
  arm: omap4: enable usb on 4430sdp
  usb: musb: drop board_set_vbus
  usb: musb: drop musb_platform_suspend/resume
  usb: musb: blackfin: usb dev_pm_ops structure
  usb: musb: am35x: usb dev_pm_ops structure
  usb: musb: omap2430: use dev_pm_ops structure
  usb: musb: omap2430: drop the nops
  usb: musb: mark musb_save/restore_context static
  ...
parents 6c34d288 e4a2b356

arch/arm/mach-davinci/usb.c

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static struct resource usb_resources[] = { 
static u64 usb_dmamask = DMA_BIT_MASK(32);



static struct platform_device usb_dev = {

	.name           = "musb_hdrc",

	.name           = "musb-davinci",

	.id             = -1,

	.dev = {

		.platform_data		= &usb_data,
@@ -112,6 +112,7 @@ static struct resource da8xx_usb20_resources[] = { 
	{

		.start		= IRQ_DA8XX_USB_INT,

		.flags		= IORESOURCE_IRQ,

		.name		= "mc",

	},

};
@@ -123,6 +124,7 @@ int __init da8xx_register_usb20(unsigned mA, unsigned potpgt) 


	usb_dev.resource = da8xx_usb20_resources;

	usb_dev.num_resources = ARRAY_SIZE(da8xx_usb20_resources);

	usb_dev.name = "musb-da8xx";



	return platform_device_register(&usb_dev);

}

arch/arm/mach-omap2/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -168,9 +168,11 @@ obj-$(CONFIG_MACH_IGEP0030) += board-igep0030.o \ 
obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)	+= board-omap3touchbook.o \

					   hsmmc.o

obj-$(CONFIG_MACH_OMAP_4430SDP)		+= board-4430sdp.o \

					   hsmmc.o

					   hsmmc.o \

					   omap_phy_internal.o

obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.o \

					   hsmmc.o

					   hsmmc.o \

					   omap_phy_internal.o



obj-$(CONFIG_MACH_OMAP3517EVM)		+= board-am3517evm.o

arch/arm/mach-omap2/board-4430sdp.c

+10 −7
Original line number Diff line number Diff line
@@ -238,10 +238,17 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { 


static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_UTMI,

	.mode			= MUSB_PERIPHERAL,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static struct twl4030_usb_data omap4_usbphy_data = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -461,6 +468,7 @@ static struct twl4030_platform_data sdp4430_twldata = { 
	.vaux1		= &sdp4430_vaux1,

	.vaux2		= &sdp4430_vaux2,

	.vaux3		= &sdp4430_vaux3,

	.usb		= &omap4_usbphy_data

};



static struct i2c_board_info __initdata sdp4430_i2c_boardinfo[] = {
@@ -533,11 +541,6 @@ static void __init omap_4430sdp_init(void) 
		gpio_direction_output(OMAP4SDP_MDM_PWR_EN_GPIO, 1);

	}

	usb_ehci_init(&ehci_pdata);



	/* OMAP4 SDP uses internal transceiver so register nop transceiver */

	usb_nop_xceiv_register();

	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */

	if (!cpu_is_omap44xx())

	usb_musb_init(&musb_board_data);



	status = omap_ethernet_init();

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

+2 −3
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ static struct device *mmc_device; 
#define TUSB6010_GPIO_ENABLE	0

#define TUSB6010_DMACHAN	0x3f



#if defined(CONFIG_USB_TUSB6010) || \

	defined(CONFIG_USB_TUSB6010_MODULE)

#ifdef CONFIG_USB_MUSB_TUSB6010

/*

 * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and

 * 1.5 V voltage regulators of PM companion chip. Companion chip will then
@@ -134,7 +133,7 @@ static void __init n8x0_usb_init(void) 


static void __init n8x0_usb_init(void) {}



#endif /*CONFIG_USB_TUSB6010 */

#endif /*CONFIG_USB_MUSB_TUSB6010 */





static struct omap2_mcspi_device_config p54spi_mcspi_config = {

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

+10 −4
Original line number Diff line number Diff line
@@ -133,10 +133,17 @@ static void __init omap4_ehci_init(void) 


static struct omap_musb_board_data musb_board_data = {

	.interface_type		= MUSB_INTERFACE_UTMI,

	.mode			= MUSB_PERIPHERAL,

	.mode			= MUSB_OTG,

	.power			= 100,

};



static struct twl4030_usb_data omap4_usbphy_data = {

	.phy_init	= omap4430_phy_init,

	.phy_exit	= omap4430_phy_exit,

	.phy_power	= omap4430_phy_power,

	.phy_set_clock	= omap4430_phy_set_clk,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -345,6 +352,7 @@ static struct twl4030_platform_data omap4_panda_twldata = { 
	.vaux1		= &omap4_panda_vaux1,

	.vaux2		= &omap4_panda_vaux2,

	.vaux3		= &omap4_panda_vaux3,

	.usb		= &omap4_usbphy_data,

};



static struct i2c_board_info __initdata omap4_panda_i2c_boardinfo[] = {
@@ -377,8 +385,6 @@ static void __init omap4_panda_init(void) 
	/* OMAP4 Panda uses internal transceiver so register nop transceiver */

	usb_nop_xceiv_register();

	omap4_ehci_init();

	/* FIXME: allow multi-omap to boot until musb is updated for omap4 */

	if (!cpu_is_omap44xx())

	usb_musb_init(&musb_board_data);

}