From patchwork Wed Apr 9 14:00:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 3955761 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5BF30BFF02 for ; Wed, 9 Apr 2014 14:00:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8080C20523 for ; Wed, 9 Apr 2014 14:00:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CB6B20520 for ; Wed, 9 Apr 2014 14:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933601AbaDIOAA (ORCPT ); Wed, 9 Apr 2014 10:00:00 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:63740 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933401AbaDIN75 (ORCPT ); Wed, 9 Apr 2014 09:59:57 -0400 Received: by mail-la0-f50.google.com with SMTP id pv20so1177782lab.37 for ; Wed, 09 Apr 2014 06:59:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:cc:from:organization:date :mime-version:content-type:content-transfer-encoding:message-id; bh=BsE12j8uhMMrI0+HJsCmceIxZSDbJMqDXQNIJTbiTxQ=; b=a894bAXvx5M/rHR/hzNo2fNZfEra91FCiyiefBHviU7fVx46v6C4bxu9A9v82zXNy8 YWw2qJGBlaNKMEoD5UGU5UpqMwEiGhcQY7GvTRnXqJiAiCHbJTKNMJC5kj9/EaOGvpeH pU3Mvk3QLYe+Jyb5G7CIhgtMb5nifMOkcKdetsW5UCfbE/TRhl+EhKRHQZOJsruerZZt M9eA8sjsm521EOVCP25dkjE5Beb4Mtwcz9dJccDIbxwUwiXLG/cKZtsFG73IvnhESOZB QS3lY2jAgybroi129R5SEcJ1/CB2XCBNTxqqAnoj8TcGbJFjz0coet1s1jdSVqJ6Z5FO 6Mbw== X-Gm-Message-State: ALoCoQmrpJLxtfqu3HN0OgXjCWAjB4j5kVVMZztk5uHOkQShvn3OH8WSCSXKnj7L3r1rZ5pSLIDL X-Received: by 10.152.234.130 with SMTP id ue2mr7734602lac.0.1397051996531; Wed, 09 Apr 2014 06:59:56 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp85-140-129-142.pppoe.mtu-net.ru. [85.140.129.142]) by mx.google.com with ESMTPSA id lc3sm917940lbb.21.2014.04.09.06.59.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Apr 2014 06:59:55 -0700 (PDT) To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org Subject: [PATCH 2/2] usb: hcd: add generic PHY support Cc: linux-sh@vger.kernel.org, magnus.damm@gmail.com From: Sergei Shtylyov Organization: Cogent Embedded Date: Wed, 9 Apr 2014 18:00:02 +0400 MIME-Version: 1.0 Message-Id: <201404091800.03215.sergei.shtylyov@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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=ham 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 the generic PHY support, analogous to the USB PHY support. Intended it to be used with the PCI EHCI/OHCI drivers and the xHCI platform driver. Signed-off-by: Sergei Shtylyov --- This patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo. drivers/usb/core/hcd.c | 42 ++++++++++++++++++++++++++++++++++++++++-- include/linux/usb/hcd.h | 1 + 2 files changed, 41 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: usb/drivers/usb/core/hcd.c =================================================================== --- usb.orig/drivers/usb/core/hcd.c +++ usb/drivers/usb/core/hcd.c @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -2623,6 +2624,29 @@ int usb_add_hcd(struct usb_hcd *hcd, } } + if (IS_ENABLED(CONFIG_GENERIC_PHY)) { + struct phy *phy = phy_get(hcd->self.controller, "usb"); + + if (IS_ERR(phy)) { + retval = PTR_ERR(phy); + if (retval == -EPROBE_DEFER) + goto err_phy; + } else { + retval = phy_init(phy); + if (retval) { + phy_put(phy); + goto err_phy; + } + retval = phy_power_on(phy); + if (retval) { + phy_exit(phy); + phy_put(phy); + goto err_phy; + } + hcd->phy = phy; + } + } + dev_info(hcd->self.controller, "%s\n", hcd->product_desc); /* Keep old behaviour if authorized_default is not in [0, 1]. */ @@ -2638,7 +2662,7 @@ int usb_add_hcd(struct usb_hcd *hcd, */ if ((retval = hcd_buffer_create(hcd)) != 0) { dev_dbg(hcd->self.controller, "pool alloc failed\n"); - goto err_remove_phy; + goto err_create_buf; } if ((retval = usb_register_bus(&hcd->self)) < 0) @@ -2763,7 +2787,14 @@ err_allocate_root_hub: usb_deregister_bus(&hcd->self); err_register_bus: hcd_buffer_destroy(hcd); -err_remove_phy: +err_create_buf: + if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->phy) { + phy_power_off(hcd->phy); + phy_exit(hcd->phy); + phy_put(hcd->phy); + hcd->phy = NULL; + } +err_phy: if (hcd->remove_phy && hcd->transceiver) { usb_phy_shutdown(hcd->transceiver); usb_put_phy(hcd->transceiver); @@ -2841,6 +2872,13 @@ void usb_remove_hcd(struct usb_hcd *hcd) usb_put_dev(hcd->self.root_hub); usb_deregister_bus(&hcd->self); hcd_buffer_destroy(hcd); + + if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->phy) { + phy_power_off(hcd->phy); + phy_exit(hcd->phy); + phy_put(hcd->phy); + hcd->phy = NULL; + } if (hcd->remove_phy && hcd->transceiver) { usb_phy_shutdown(hcd->transceiver); usb_put_phy(hcd->transceiver); Index: usb/include/linux/usb/hcd.h =================================================================== --- usb.orig/include/linux/usb/hcd.h +++ usb/include/linux/usb/hcd.h @@ -107,6 +107,7 @@ struct usb_hcd { * other external PHYs should be software-transparent */ struct usb_phy *transceiver; + struct phy *phy; /* Flags that need to be manipulated atomically because they can * change while the host controller is running. Always use