From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from VA3EHSOBE004.bigfish.com (va3ehsobe004.messaging.microsoft.com [216.32.180.14]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Cybertrust SureServer Standard Validation CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 16CE1B6F4E for ; Sat, 23 Apr 2011 22:33:50 +1000 (EST) Received: from mail85-va3 (localhost.localdomain [127.0.0.1]) by mail85-va3-R.bigfish.com (Postfix) with ESMTP id C5E95E980BB for ; Sat, 23 Apr 2011 12:33:44 +0000 (UTC) Received: from VA3EHSMHS016.bigfish.com (unknown [10.7.14.236]) by mail85-va3.bigfish.com (Postfix) with ESMTP id 636B2117004E for ; Sat, 23 Apr 2011 12:33:44 +0000 (UTC) From: Ramneek Mehresh To: Subject: [PATCH] powerpc/85xx: ULPI PHY support for P101x platforms Date: Sat, 23 Apr 2011 18:03:39 +0530 Message-ID: <1303562019-22150-1-git-send-email-ramneek.mehresh@freescale.com> MIME-Version: 1.0 Content-Type: text/plain Cc: Ramneek Mehresh List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Add support for USB ULPI (external) PHY for P101x platforms - for both USB Host and Peripheral modes Signed-off-by: Ramneek Mehresh --- Applies on git://git.am.freescale.net/mirrors/linux-2.6.git (branch master) drivers/usb/gadget/fsl_udc_core.c | 6 ++++++ drivers/usb/gadget/fsl_usb2_udc.h | 1 + drivers/usb/host/ehci-fsl.c | 5 +++++ drivers/usb/host/ehci-fsl.h | 1 + 4 files changed, 13 insertions(+), 0 deletions(-) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index c669600..4f7578a 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -189,6 +189,12 @@ static int dr_controller_setup(struct fsl_udc *udc) portctrl &= ~(PORTSCX_PHY_TYPE_SEL | PORTSCX_PORT_WIDTH); switch (udc->phy_mode) { case FSL_USB2_PHY_ULPI: +#ifdef CONFIG_PPC_85xx + ctrl = __raw_readl(&usb_sys_regs->control); + ctrl &= ~USB_CTRL_UTMI_PHY_EN; + ctrl |= USB_CTRL_ULPI_PHY_CLK_SEL; + __raw_writel(ctrl, &usb_sys_regs->control); +#endif portctrl |= PORTSCX_PTS_ULPI; break; case FSL_USB2_PHY_UTMI_WIDE: diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/fsl_usb2_udc.h index d489c62..031c256 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.h +++ b/drivers/usb/gadget/fsl_usb2_udc.h @@ -365,6 +365,7 @@ struct usb_sys_interface { #define USB_CTRL_ULPI_INT0EN 0x00000001 #define USB_CTRL_UTMI_PHY_EN 0x00000200 #define USB_CTRL_USB_EN 0x00000004 +#define USB_CTRL_ULPI_PHY_CLK_SEL 0x00000400 /* Endpoint Queue Head data struct * Rem: all the variables of qh are LittleEndian Mode diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 55f4ab5..a755b9d 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -190,6 +190,11 @@ static void ehci_fsl_setup_phy(struct ehci_hcd *ehci, portsc &= ~(PORT_PTS_MSK | PORT_PTS_PTW); switch (phy_mode) { case FSL_USB2_PHY_ULPI: +#ifdef CONFIG_PPC_85xx + temp = in_be32(non_ehci + FSL_SOC_USB_CTRL); + out_be32(non_ehci + FSL_SOC_USB_CTRL, temp | USB_CTRL_USB_EN | + ULPI_PHY_CLK_SEL); +#endif portsc |= PORT_PTS_ULPI; break; case FSL_USB2_PHY_SERIAL: diff --git a/drivers/usb/host/ehci-fsl.h b/drivers/usb/host/ehci-fsl.h index 06a94e9..6ed589c 100644 --- a/drivers/usb/host/ehci-fsl.h +++ b/drivers/usb/host/ehci-fsl.h @@ -52,4 +52,5 @@ #define OTG_PORT (1<<5) #define PLL_RESET (1<<8) #define UTMI_PHY_EN (1<<9) +#define ULPI_PHY_CLK_SEL (1<<10) #endif /* _EHCI_FSL_H */ -- 1.6.1