From patchwork Mon Jun 30 17:29:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4453511 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 BE3709F37C for ; Mon, 30 Jun 2014 17:29:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F250E20379 for ; Mon, 30 Jun 2014 17:29:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 100A720375 for ; Mon, 30 Jun 2014 17:29:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756083AbaF3R3z (ORCPT ); Mon, 30 Jun 2014 13:29:55 -0400 Received: from mail-wg0-f50.google.com ([74.125.82.50]:59205 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754945AbaF3R3y (ORCPT ); Mon, 30 Jun 2014 13:29:54 -0400 Received: by mail-wg0-f50.google.com with SMTP id m15so8258837wgh.21 for ; Mon, 30 Jun 2014 10:29:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PLVQkJlCNn8ET/dhE6BQgUblk76zHL8lStNOaZbU3Yg=; b=E/nhft6/gbBRh0YgpEWS6Qxbo9TZsINOHQ3YmHLQVi3rUTwpBBwrr/vsOJ2es98D8t C26y6oZty7XsSPOW07HuZCS5UcEUwDuVasELWm0aAQbc3nOoxZF874OYdyMr2JT1DHcN Ds5FsXEMo7q2KUROcPuD6K+E27prI8gI4GAB5uyHYbUs07yvWVvlcmWtp2UOX9cNwh15 d3Wtw87O4nNNF5WHylo74NNyy27s/wB9X6KYTR+1uBvs7sxZ+FRsa7lLUHBMm/GrYaBY MQi0/isen9Md4g0k5Mm4jSfUu1ONVS8nWiasGvoMvp+0FhOJEurYvDWACodTZnSnh1hj vH5Q== X-Gm-Message-State: ALoCoQlbefxxYOjU0l3d4iVRgOsYHNuWYXr4mI4MKU7VRn9+MmXuGOWI1entIUnp24RC+DGkFDBI X-Received: by 10.180.76.134 with SMTP id k6mr2739119wiw.49.1404149393328; Mon, 30 Jun 2014 10:29:53 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-2-99-228-46.as13285.net. [2.99.228.46]) by mx.google.com with ESMTPSA id d4sm16033180wik.20.2014.06.30.10.29.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jun 2014 10:29:52 -0700 (PDT) From: Srinivas Kandagatla To: linux-usb@vger.kernel.org, Felipe Balbi Cc: gregkh@linuxfoundation.org, linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v1 2/3] usb: phy: msm: Make phy_reset clk and reset line optional. Date: Mon, 30 Jun 2014 18:29:49 +0100 Message-Id: <1404149389-11928-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404149311-11831-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1404149311-11831-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 This patch makes the phy reset clk and reset line optional as this clk is not available on boards like IFC6410 with APQ8064. Signed-off-by: Srinivas Kandagatla --- drivers/usb/phy/phy-msm-usb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index ced34f3..3bb559d 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -279,11 +279,11 @@ static int msm_otg_link_clk_reset(struct msm_otg *motg, bool assert) static int msm_otg_phy_clk_reset(struct msm_otg *motg) { - int ret; + int ret = 0; - if (motg->pdata->phy_clk_reset) + if (motg->pdata->phy_clk_reset && motg->phy_reset_clk) ret = motg->pdata->phy_clk_reset(motg->phy_reset_clk); - else + else if (motg->phy_rst) ret = reset_control_reset(motg->phy_rst); if (ret) @@ -1464,7 +1464,7 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) motg->phy_rst = devm_reset_control_get(&pdev->dev, "phy"); if (IS_ERR(motg->phy_rst)) - return PTR_ERR(motg->phy_rst); + motg->phy_rst = NULL; pdata->mode = of_usb_get_dr_mode(node); if (pdata->mode == USB_DR_MODE_UNKNOWN) @@ -1556,7 +1556,7 @@ static int msm_otg_probe(struct platform_device *pdev) np ? "phy" : "usb_phy_clk"); if (IS_ERR(motg->phy_reset_clk)) { dev_err(&pdev->dev, "failed to get usb_phy_clk\n"); - return PTR_ERR(motg->phy_reset_clk); + motg->phy_reset_clk = NULL; } motg->clk = devm_clk_get(&pdev->dev, np ? "core" : "usb_hs_clk");