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

Commit 25783602 authored by Philippe Rétornaz's avatar Philippe Rétornaz Committed by Sascha Hauer
Browse files

mx31moboard: Fix usb PHY reset 



Setup the pad with correct pull-up/down before doing the reset.
Assert the PHY enable signal so the reset is really done.

Signed-off-by: default avatarPhilippe Rétornaz <philippe.retornaz@epfl.ch>
Acked-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 2ba5a2c0

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

+37 −61
Original line number Diff line number Diff line
@@ -306,37 +306,51 @@ static struct imxmmc_platform_data sdhc1_pdata = { 
 * this pin is dedicated for all mx31moboard systems, so we do it here

 */

#define USB_RESET_B	IOMUX_TO_GPIO(MX31_PIN_GPIO1_0)



static void usb_xcvr_reset(void)

{

	gpio_request(USB_RESET_B, "usb-reset");

	gpio_direction_output(USB_RESET_B, 0);

	mdelay(1);

	gpio_set_value(USB_RESET_B, 1);

}



#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \

			PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)

		      PAD_CTL_ODE_CMOS)



#define OTG_EN_B IOMUX_TO_GPIO(MX31_PIN_USB_OC)

#define USBH2_EN_B IOMUX_TO_GPIO(MX31_PIN_SCK6)



static void moboard_usbotg_init(void)

static void usb_xcvr_reset(void)

{

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, USB_PAD_CFG | PAD_CTL_100K_PU);



	mxc_iomux_set_gpr(MUX_PGP_UH2, true);

	mxc_iomux_set_pad(MX31_PIN_USBH2_CLK, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DIR, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBH2_NXT, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBH2_STP, USB_PAD_CFG | PAD_CTL_100K_PU);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DATA0, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DATA1, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_SRXD6, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_STXD6, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_SFS3, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_SCK3, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_SRXD3, USB_PAD_CFG | PAD_CTL_100K_PD);

	mxc_iomux_set_pad(MX31_PIN_STXD3, USB_PAD_CFG | PAD_CTL_100K_PD);



	gpio_request(OTG_EN_B, "usb-udc-en");

	gpio_direction_output(OTG_EN_B, 0);

	gpio_request(USBH2_EN_B, "usbh2-en");

	gpio_direction_output(USBH2_EN_B, 0);



	gpio_request(USB_RESET_B, "usb-reset");

	gpio_direction_output(USB_RESET_B, 0);

	mdelay(1);

	gpio_set_value(USB_RESET_B, 1);

	mdelay(1);

}



static struct fsl_usb2_platform_data usb_pdata = {
@@ -346,44 +360,7 @@ static struct fsl_usb2_platform_data usb_pdata = { 


#if defined(CONFIG_USB_ULPI)



#define USBH2_EN_B IOMUX_TO_GPIO(MX31_PIN_SCK6)



static int moboard_usbh2_hw_init(struct platform_device *pdev)

{

	int ret;



	mxc_iomux_set_gpr(MUX_PGP_UH2, true);



	mxc_iomux_set_pad(MX31_PIN_USBH2_CLK, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DIR, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBH2_NXT, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBH2_STP, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DATA0, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBH2_DATA1, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_SRXD6, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_STXD6, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_SFS3, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_SCK3, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_SRXD3, USB_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_STXD3, USB_PAD_CFG);



	ret = gpio_request(USBH2_EN_B, "usbh2-en");

	if (ret)

		return ret;

	gpio_direction_output(USBH2_EN_B, 0);



	return 0;

}



static int moboard_usbh2_hw_exit(struct platform_device *pdev)

{

	gpio_free(USBH2_EN_B);

	return 0;

}



static struct mxc_usbh_platform_data usbh2_pdata = {

	.init	= moboard_usbh2_hw_init,

	.exit	= moboard_usbh2_hw_exit,

	.portsc	= MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT,

	.flags	= MXC_EHCI_POWER_PINS_ENABLED,

};
@@ -508,7 +485,6 @@ static void __init mxc_board_init(void) 


	usb_xcvr_reset();



	moboard_usbotg_init();

	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);

	moboard_usbh2_init();