From: Ramneek Mehresh <ramneek.mehresh@freescale.com>
To: <linux-kernel@vger.kernel.org>
CC: <balbi@ti.com>, <stern@rowland.harvard.edu>, <gregkh@linuxfoundation.org>,
        <linux-usb@vger.kernel.org>,
        Ramneek Mehresh <ramneek.mehresh@freescale.com>,
        Shengzhou Liu <Shengzhou.Liu@freescale.com>
Subject: [PATCH 2/8][v2]usb:fsl:otg: Add controller version based ULPI and UTMI phy
Date: Wed, 15 Jul 2015 17:32:46 +0530
Message-ID: <1436961772-11482-3-git-send-email-ramneek.mehresh@freescale.com>
In-Reply-To: <1436961772-11482-1-git-send-email-ramneek.mehresh@freescale.com>
References: <1436961772-11482-1-git-send-email-ramneek.mehresh@freescale.com>
MIME-Version: 1.0
Content-Type: text/plain
SN1PR0301MB1584: X-MS-Exchange-Organization-RulesExecuted
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 11:50:38.3644
 (UTC)
X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1584
X-Microsoft-Exchange-Diagnostics: 1;SN1PR0301MB1550;2:bW8FujSRBNqC3h0+dQqlYYHEhdM7aDMp4jZCRUFFaXoGh4tc9hgzsNr1qp7qteUV;3:BK1gakUIC9Osiv763JCs1ZBkG8tqHlS2mqI0KSm8UWIxjNHLtj0WpWaky5IowE2b45VNj7hOTKYpLj57yVyNMrebVYkOgNk6mb7vvYYpnMr2aB9pZy9hdGGKK9kfZExs1j1vUe637IxFnLza6Ao/1G8ksQRCXmfBo5uONgA7AMuakEtIMYhvGE78e0QPzIkwvULkByyQTfJEoif9vX8l7tSDuTNB/uAhM2b+v8ykM9A=;25:8wkp2FshoZALgZoNQIRHbJL9DnxF+0ugLqASUf7sq7ytX2uxiEGo3NhEzTCroZbxHwRXSgKqS7EF+xSZUE+GDjqW5xgqy57wnPK27Krc16vdjfDW8aDdv0A0Kg3GObZlsNxDlQBUiWG3CH4Obs03qzM11U0F+DXWpXzWl8+/ZIPXIiiyl0K3L90bY/zK6SHbx1L6qImHK+jsye9vHUVfuKrqR32Hmuh5eecK4J4Oq+XqaRp5omoRPQvXu/pSVd6/Zo00JpjkX8G6X1VTjlw57Q==;23:8Ar2HLRAUhl3Fjjyx7qsOHp/PMVa5XUN656+A+FgP7NWs4/1qOkrhKGjJSH09pbuVdWltm+ErgnV2pb1WpxzHXzTXGJhiNfdNdfARM+ZqvpCZD1x2/9R7UmNJ/lLTpuLBpPUGwT4PwKVRvzrJwx7mPWB8dNwueswGoWEJ88HS3tDFQTvxVtDEC3TOHrjql4uhJk9zyQmnGohY7lb5UXb681XQmGOC1mzp4pqsJzhLKx1sW4oFLWZDmW0Q60YY/aN
X-OriginatorOrg: freescale.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2657
Lines: 75

Add controller version based ULPI and UTMI phy
initialization for otg driver.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
---
 drivers/usb/phy/phy-fsl-usb.c | 20 ++++++++++++++++++++
 drivers/usb/phy/phy-fsl-usb.h |  7 +++++++
 2 files changed, 27 insertions(+)

diff --git a/drivers/usb/phy/phy-fsl-usb.c b/drivers/usb/phy/phy-fsl-usb.c
index 94eb292..4e58aee 100644
--- a/drivers/usb/phy/phy-fsl-usb.c
+++ b/drivers/usb/phy/phy-fsl-usb.c
@@ -923,12 +923,32 @@ int usb_otg_start(struct platform_device *pdev)
 	temp &= ~(PORTSC_PHY_TYPE_SEL | PORTSC_PTW);
 	switch (pdata->phy_mode) {
 	case FSL_USB2_PHY_ULPI:
+		if (pdata->controller_ver) {
+			/* controller version 1.6 or above */
+			setbits32(&p_otg->dr_mem_map->control,
+				USB_CTRL_ULPI_PHY_CLK_SEL);
+			/*
+			 * Due to controller issue of PHY_CLK_VALID in ULPI
+			 * mode, set USB_CTRL_USB_EN before checking
+			 * PHY_CLK_VALID, otherwise PHY_CLK_VALID doesn't work
+			 */
+			clrsetbits_be32(&p_otg->dr_mem_map->control,
+				USB_CTRL_UTMI_PHY_EN, USB_CTRL_IOENB);
+		}
 		temp |= PORTSC_PTS_ULPI;
 		break;
 	case FSL_USB2_PHY_UTMI_WIDE:
 		temp |= PORTSC_PTW_16BIT;
 		/* fall through */
 	case FSL_USB2_PHY_UTMI:
+		if (pdata->controller_ver) {
+			/* controller version 1.6 or above */
+			setbits32(&p_otg->dr_mem_map->control,
+				USB_CTRL_UTMI_PHY_EN);
+			/* Delay for UTMI PHY CLK to become stable - 10ms */
+			mdelay(FSL_UTMI_PHY_DLY);
+		}
+		setbits32(&p_otg->dr_mem_map->control, USB_CTRL_UTMI_PHY_EN);
 		temp |= PORTSC_PTS_UTMI;
 		/* fall through */
 	default:
diff --git a/drivers/usb/phy/phy-fsl-usb.h b/drivers/usb/phy/phy-fsl-usb.h
index 2314995..4a78fb3 100644
--- a/drivers/usb/phy/phy-fsl-usb.h
+++ b/drivers/usb/phy/phy-fsl-usb.h
@@ -199,6 +199,13 @@
 /* control Register Bit Masks */
 #define  USB_CTRL_IOENB			(0x1<<2)
 #define  USB_CTRL_ULPI_INT0EN		(0x1<<0)
+#define  USB_CTRL_WU_INT_EN		(0x1<<1)
+#define  USB_CTRL_LINE_STATE_FILTER__EN	(0x1<<3)
+#define  USB_CTRL_KEEP_OTG_ON		(0x1<<4)
+#define  USB_CTRL_OTG_PORT		(0x1<<5)
+#define  USB_CTRL_PLL_RESET		(0x1<<8)
+#define  USB_CTRL_UTMI_PHY_EN		(0x1<<9)
+#define  USB_CTRL_ULPI_PHY_CLK_SEL	(0x1<<10)
 
 /* BCSR5 */
 #define BCSR5_INT_USB			(0x02)
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/