From: valentin.longchamp@epfl.ch (Valentin Longchamp)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] mx31moboard: Fix usb PHY reset
Date: Tue, 11 May 2010 10:52:11 +0200 [thread overview]
Message-ID: <4BE91ABB.40000@epfl.ch> (raw)
In-Reply-To: <1273513795-28247-2-git-send-email-philippe.retornaz@epfl.ch>
On 05/10/2010 07:49 PM, Philippe R?tornaz wrote:
> Setup the pad with correct pull-up/down before doing the reset.
> Assert the PHY enable signal so the reset is really done.
For Sascha and other people involved in mx31 support: as I am ending my
thesis and I will leave the lab afterwards, Philippe is replacing me for
the Linux support of the mx31moboard. We still discuss the patches
together, but he now is the one that writes and pushes them.
Acked-by: Valentin Longchamp<valentin.longchamp@epfl.ch>
>
> Signed-off-by: Philippe R?tornaz<philippe.retornaz@epfl.ch>
> ---
> arch/arm/mach-mx3/mach-mx31moboard.c | 98 +++++++++++++---------------------
> 1 files changed, 37 insertions(+), 61 deletions(-)
>
> diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
> index fccb920..5c44489 100644
> --- a/arch/arm/mach-mx3/mach-mx31moboard.c
> +++ b/arch/arm/mach-mx3/mach-mx31moboard.c
> @@ -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();
>
--
Valentin Longchamp, PhD Student, EPFL-STI-LSRO1
valentin.longchamp at epfl.ch, Phone: +41216937827
http://people.epfl.ch/valentin.longchamp
MEB3494, Station 9, CH-1015 Lausanne
next prev parent reply other threads:[~2010-05-11 8:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 17:49 [PATCH 0/3] mx31moboard OTG host support Philippe Rétornaz
2010-05-10 17:49 ` [PATCH 1/3] mx31moboard: Fix usb PHY reset Philippe Rétornaz
2010-05-10 17:49 ` [PATCH 2/3] mx31moboard: Move usb OTG device registration Philippe Rétornaz
2010-05-10 17:49 ` [PATCH 3/3] mx31moboard: OTG host support for smartbot board Philippe Rétornaz
2010-05-11 8:47 ` Valentin Longchamp
2010-05-11 8:53 ` [PATCH 2/3] mx31moboard: Move usb OTG device registration Valentin Longchamp
2010-05-11 8:52 ` Valentin Longchamp [this message]
2010-05-11 15:44 ` [PATCH 1/3] mx31moboard: Fix usb PHY reset s.hauer at pengutronix.de
-- strict thread matches above, loose matches on Subject: below --
2010-05-11 14:57 [PATCH 0/3 v2] mx31moboard: OTG host support Philippe Rétornaz
2010-05-11 14:57 ` [PATCH 1/3] mx31moboard: Fix usb PHY reset Philippe Rétornaz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4BE91ABB.40000@epfl.ch \
--to=valentin.longchamp@epfl.ch \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).