From patchwork Mon Jul 8 10:43:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Cherian X-Patchwork-Id: 2824794 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA48B9FA1A for ; Mon, 8 Jul 2013 10:44:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC60220114 for ; Mon, 8 Jul 2013 10:44:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4584200E7 for ; Mon, 8 Jul 2013 10:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555Ab3GHKoo (ORCPT ); Mon, 8 Jul 2013 06:44:44 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49536 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752103Ab3GHKnu (ORCPT ); Mon, 8 Jul 2013 06:43:50 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r68Ahgs3004942; Mon, 8 Jul 2013 05:43:42 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r68AhgHO009158; Mon, 8 Jul 2013 05:43:42 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Mon, 8 Jul 2013 05:43:41 -0500 Received: from psplinux064.india.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r68AhWm5013177; Mon, 8 Jul 2013 05:43:39 -0500 From: George Cherian To: CC: , , , , , , George Cherian Subject: [PATCH 2/5] usb: phy: phy-omap-control: Add API to power on/off USB PHY for AM335X Date: Mon, 8 Jul 2013 16:13:18 +0530 Message-ID: <1373280201-31785-3-git-send-email-george.cherian@ti.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1373280201-31785-1-git-send-email-george.cherian@ti.com> References: <1373280201-31785-1-git-send-email-george.cherian@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add API to power on/off USB PHY for AM335X. This API will be called from phy-amxxxx-usb driver. Signed-off-by: George Cherian --- drivers/usb/phy/phy-omap-control.c | 32 ++++++++++++++++++++++++++++++++ include/linux/usb/omap_control_usb.h | 11 +++++++++++ 2 files changed, 43 insertions(+) diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c index 1419ced..0c1822d 100644 --- a/drivers/usb/phy/phy-omap-control.c +++ b/drivers/usb/phy/phy-omap-control.c @@ -46,6 +46,38 @@ struct device *omap_get_control_dev(void) EXPORT_SYMBOL_GPL(omap_get_control_dev); /** + * omap_control_am335x_phy_power - power on/off the serializer using control + * module + * @dev: the control module device + * @on: 0 to off and 1 to on based on powering on or off the PHY + * @id: phy id 0 or 1 for phy instance 0 and 1 repectively + * + * AMXXXX PHY driver should call this API to power on or off the PHY. + */ +void omap_control_am335x_phy_power(struct device *dev, bool on, u8 id) +{ + u32 val; + struct omap_control_usb *control_usb = dev_get_drvdata(dev); + + if (control_usb->type != OMAP_CTRL_DEV_TYPE3) + return; + + val = readl(control_usb->dev_conf + (id * 2)); + + if (on) { + val &= ~(AM335X_USBPHY_CM_PWRDN | AM335X_USBPHY_OTG_PWRDN); + val |= AM335X_USBPHY_OTGVDET_EN | + AM335X_USBPHY_OTGSESSEND_EN; + } else + val |= AM335X_USBPHY_CM_PWRDN | AM335X_USBPHY_OTG_PWRDN; + + + writel(val, (control_usb->dev_conf + (id * 2))); +} +EXPORT_SYMBOL_GPL(omap_control_am335x_phy_power); + + +/** * omap_control_usb3_phy_power - power on/off the serializer using control * module * @dev: the control module device diff --git a/include/linux/usb/omap_control_usb.h b/include/linux/usb/omap_control_usb.h index 27b5b8c..11d7a34 100644 --- a/include/linux/usb/omap_control_usb.h +++ b/include/linux/usb/omap_control_usb.h @@ -45,6 +45,7 @@ enum omap_control_usb_mode { /* To differentiate ctrl module IP having either mailbox or USB3 PHY power */ #define OMAP_CTRL_DEV_TYPE1 0x1 #define OMAP_CTRL_DEV_TYPE2 0x2 +#define OMAP_CTRL_DEV_TYPE3 0x3 #define OMAP_CTRL_DEV_PHY_PD BIT(0) @@ -63,10 +64,20 @@ enum omap_control_usb_mode { #define OMAP_CTRL_USB3_PHY_TX_RX_POWERON 0x3 #define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF 0x0 +#define AM335X_USBPHY_CM_PWRDN (1 << 0) +#define AM335X_USBPHY_OTG_PWRDN (1 << 1) +#define AM335X_USBPHY_OTGVDET_EN (1 << 19) +#define AM335X_USBPHY_OTGSESSEND_EN (1 << 20) +#define AM335X_USB0_WKUP_CTRL_ENABLE (1 << 0) +#define AM335X_USB1_WKUP_CTRL_ENABLE (1 << 8) + + + #if IS_ENABLED(CONFIG_OMAP_CONTROL_USB) extern struct device *omap_get_control_dev(void); extern void omap_control_usb_phy_power(struct device *dev, int on); extern void omap_control_usb3_phy_power(struct device *dev, bool on); +extern void omap_control_am335x_phy_power(struct device *dev, bool on, u8 id); extern void omap_control_usb_set_mode(struct device *dev, enum omap_control_usb_mode mode); #else