From patchwork Fri Jul 19 12:34:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Cherian X-Patchwork-Id: 2830471 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 EA7B59F4D5 for ; Fri, 19 Jul 2013 12:36:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E37E1201DC for ; Fri, 19 Jul 2013 12:36:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C6633201CE for ; Fri, 19 Jul 2013 12:36:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965517Ab3GSMe5 (ORCPT ); Fri, 19 Jul 2013 08:34:57 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:48934 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760254Ab3GSMe4 (ORCPT ); Fri, 19 Jul 2013 08:34:56 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r6JCYo7E029009; Fri, 19 Jul 2013 07:34:50 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r6JCYoK5012602; Fri, 19 Jul 2013 07:34:50 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Fri, 19 Jul 2013 07:34:49 -0500 Received: from localhost.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r6JCYdO6025577; Fri, 19 Jul 2013 07:34:44 -0500 From: George Cherian To: CC: , , , , , , George Cherian Subject: [PATCH v2 1/4] usb: phy: phy-omap-control: Add API to power and wakeup Date: Fri, 19 Jul 2013 18:04:34 +0530 Message-ID: <1374237277-17769-2-git-send-email-george.cherian@ti.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1374237277-17769-1-git-send-email-george.cherian@ti.com> References: <1374237277-17769-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.3 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 on/off USB PHY for AM335X Add APIs to -power on/off USB PHY for AM335X -enable/disable PHY wakeup. This API will be called from phy-amxxxx-usb driver. Signed-off-by: George Cherian --- drivers/usb/phy/phy-omap-control.c | 67 ++++++++++++++++++++++++++++++++++++ include/linux/usb/omap_control_usb.h | 24 +++++++++++++ 2 files changed, 91 insertions(+) diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c index 1419ced..4f2502c 100644 --- a/drivers/usb/phy/phy-omap-control.c +++ b/drivers/usb/phy/phy-omap-control.c @@ -46,6 +46,73 @@ struct device *omap_get_control_dev(void) EXPORT_SYMBOL_GPL(omap_get_control_dev); /** + * omap_control_am335x_phy_wkup - PHY wakeup on/off using control + * module + * @dev: the control module device + * @on: 0 to off and 1 to on PHY wakeup feature + * @id: phy id 0 or 1 for phy instance 0 and 1 repectively + * + * AMXXXX PHY driver should call this API to enable or disable PHY wakeup. + */ +void omap_control_am335x_phy_wkup(struct device *dev, bool on, u8 id) +{ + u32 val; + u32 *phy_wkup_reg; + struct omap_control_usb *control_usb = dev_get_drvdata(dev); + + if (control_usb->type != OMAP_CTRL_DEV_TYPE3 || id < 0 || id > 1) + return; + + phy_wkup_reg = control_usb->dev_conf + AM335X_USB_WKUP_OFFSET; + val = readl(phy_wkup_reg); + + if (on) + val |= id ? AM335X_USB1_WKUP_CTRL_ENABLE : + AM335X_USB0_WKUP_CTRL_ENABLE; + else + val &= id ? ~AM335X_USB1_WKUP_CTRL_ENABLE : + ~AM335X_USB0_WKUP_CTRL_ENABLE; + + + writel(val, phy_wkup_reg); +} +EXPORT_SYMBOL_GPL(omap_control_am335x_phy_wkup); + +/** + * 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; + u32 *phy_pwr_reg; + struct omap_control_usb *control_usb = dev_get_drvdata(dev); + + if (control_usb->type != OMAP_CTRL_DEV_TYPE3 || id < 0 || id > 1) + return; + + phy_pwr_reg = GET_PHY_POWER_REG(control_usb->dev_conf, id); + val = readl(phy_pwr_reg); + + 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, phy_pwr_reg); +} +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..a92b417 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,23 @@ enum omap_control_usb_mode { #define OMAP_CTRL_USB3_PHY_TX_RX_POWERON 0x3 #define OMAP_CTRL_USB3_PHY_TX_RX_POWEROFF 0x0 +#define GET_PHY_POWER_REG(base, id) ((u32 *)base + (id * 2)) +#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_USB_WKUP_OFFSET 0xA +#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_am335x_phy_wkup(struct device *dev, bool on, u8 id); extern void omap_control_usb_set_mode(struct device *dev, enum omap_control_usb_mode mode); #else @@ -87,6 +101,16 @@ static inline void omap_control_usb_set_mode(struct device *dev, enum omap_control_usb_mode mode) { } + +static inline void omap_control_am335x_phy_power(struct device *dev, + bool on, u8 id) +{ +} + +static inline void omap_control_am335x_phy_wkup(struct device *dev, + bool on, u8 id) +{ +} #endif #endif /* __OMAP_CONTROL_USB_H__ */