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

Commit 13dd0c97 authored by Igor Grinberg's avatar Igor Grinberg Committed by Greg Kroah-Hartman
Browse files

USB: otg/ulpi: extend the generic ulpi driver. 



1) Introduce ulpi specific flags for control of the ulpi phy
2) Extend the generic ulpi driver with support for Function and
Interface control of upli phy
3) Update the platforms using the generic ulpi driver with new ulpi
flags
4) Remove the otg control flags not in use

Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 51a91a54

arch/arm/mach-mx3/mach-armadillo5x0.c

+2 −2
Original line number Diff line number Diff line
@@ -551,9 +551,9 @@ static void __init armadillo5x0_init(void) 
	/* USB */

#if defined(CONFIG_USB_ULPI)

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

			USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

			ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

			USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

			ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_otg_host, &usbotg_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

arch/arm/mach-mx3/mach-mx31lilly.c

+2 −2
Original line number Diff line number Diff line
@@ -245,9 +245,9 @@ static struct mxc_usbh_platform_data usbh2_pdata = { 
static void lilly1131_usb_init(void)

{

	usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh1, &usbh1_pdata);

	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

arch/arm/mach-mx3/mach-mx31lite.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static void __init mxc_board_init(void) 
#if defined(CONFIG_USB_ULPI)

	/* USB */

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

arch/arm/mach-mx3/mach-mx31moboard.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = { 
static int __init moboard_usbh2_init(void)

{

	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

			USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

			ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	return mxc_register_device(&mxc_usbh2, &usbh2_pdata);

}

arch/arm/mach-mx3/mach-pcm037.c

+2 −2
Original line number Diff line number Diff line
@@ -654,13 +654,13 @@ static void __init mxc_board_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}



	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif