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

Commit 64ff1673 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'usbhost17-for-arm-soc' of git://github.com/rogerq/linux into omap-for-v3.9/usb

parents 836dc9e3 42973159

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

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void enable_board_wakeup_source(void) 
		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static const struct usbhs_omap_board_data usbhs_bdata __initconst = {

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void enable_board_wakeup_source(void) 
		OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);

}



static const struct usbhs_omap_board_data usbhs_bdata __initconst = {

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {



	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct omap_board_mux board_mux[] __initdata = { 
};

#endif



static struct usbhs_omap_board_data usbhs_bdata __initdata = {

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,

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

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static __init void am3517_evm_mcbsp1_init(void) 
	omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);

}



static const struct usbhs_omap_board_data usbhs_bdata __initconst = {

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \

		defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)

arch/arm/mach-omap2/board-cm-t35.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static struct omap2_hsmmc_info mmc[] = { 
	{}	/* Terminator */

};



static struct usbhs_omap_board_data usbhs_bdata __initdata = {

static struct usbhs_omap_platform_data usbhs_bdata __initdata = {

	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,

	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,