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

Commit 76eb57ec authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Felipe Balbi
Browse files

arm: imx: Start using struct usb_otg 



Use struct usb_otg members with OTG specific functions instead
of usb_phy members.

Includes fixes from Sascha Hauer.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Tested-by: default avatarPhilippe Rétornaz <philippe.retornaz@epfl.ch>
Tested-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 298b083c

arch/arm/mach-imx/mx31moboard-devboard.c

+14 −8
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int devboard_isp1105_init(struct usb_phy *otg) 
}





static int devboard_isp1105_set_vbus(struct usb_phy *otg, bool on)

static int devboard_isp1105_set_vbus(struct usb_otg *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -194,18 +194,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init devboard_usbh1_init(void)

{

	struct usb_phy *otg;

	struct usb_phy *phy;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

	if (!otg)

	phy = kzalloc(sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	otg->label	= "ISP1105";

	otg->init	= devboard_isp1105_init;

	otg->set_vbus	= devboard_isp1105_set_vbus;

	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);

	if (!phy->otg) {

		kfree(phy);

		return -ENOMEM;

	}



	phy->label	= "ISP1105";

	phy->init	= devboard_isp1105_init;

	phy->otg->set_vbus	= devboard_isp1105_set_vbus;



	usbh1_pdata.otg = otg;

	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))

arch/arm/mach-imx/mx31moboard-marxbot.c

+14 −8
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static int marxbot_isp1105_init(struct usb_phy *otg) 
}





static int marxbot_isp1105_set_vbus(struct usb_phy *otg, bool on)

static int marxbot_isp1105_set_vbus(struct usb_otg *otg, bool on)

{

	if (on)

		gpio_set_value(USBH1_VBUSEN_B, 0);
@@ -308,18 +308,24 @@ static struct mxc_usbh_platform_data usbh1_pdata __initdata = { 


static int __init marxbot_usbh1_init(void)

{

	struct usb_phy *otg;

	struct usb_phy *phy;

	struct platform_device *pdev;



	otg = kzalloc(sizeof(*otg), GFP_KERNEL);

	if (!otg)

	phy = kzalloc(sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	otg->label	= "ISP1105";

	otg->init	= marxbot_isp1105_init;

	otg->set_vbus	= marxbot_isp1105_set_vbus;

	phy->otg = kzalloc(sizeof(struct usb_otg), GFP_KERNEL);

	if (!phy->otg) {

		kfree(phy);

		return -ENOMEM;

	}



	phy->label	= "ISP1105";

	phy->init	= marxbot_isp1105_init;

	phy->otg->set_vbus	= marxbot_isp1105_set_vbus;



	usbh1_pdata.otg = otg;

	usbh1_pdata.otg = phy;



	pdev = imx31_add_mxc_ehci_hs(1, &usbh1_pdata);

	if (IS_ERR(pdev))