From patchwork Wed Jun 18 17:01:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4378121 Return-Path: X-Original-To: patchwork-linux-arm-msm@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 F37C0BEEAA for ; Wed, 18 Jun 2014 17:01:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 27CAA201DD for ; Wed, 18 Jun 2014 17:01:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 797FD201D3 for ; Wed, 18 Jun 2014 17:01:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753615AbaFRRBH (ORCPT ); Wed, 18 Jun 2014 13:01:07 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:58858 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557AbaFRRBF (ORCPT ); Wed, 18 Jun 2014 13:01:05 -0400 Received: by mail-wg0-f48.google.com with SMTP id n12so1161467wgh.7 for ; Wed, 18 Jun 2014 10:01:04 -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=EQMO95FWgxJ97+vllcYE0RUOSvupoytw/LKds+N9nEs2aK+tHLrL3S1W9jMP6knHZF MmmlAdpJz4wsOeoFoClBIR9hjvDD0iR4DfN6KO1kJgKf6QR7DF6POlpxpfZHKmJfBTy0 qimmI5NOK6UWqikdBx0dKJsjoTNb9jlcV6UP3X6cMLAb6DH75mGxQX1ApITrxwLf8hNA HBn92qZHagyYMJf0CypkqrNyXIXLOGj3cDRhJ0D0X8ex7HLPJxGqR6T2JMNPAWMK3FJ1 tP4DC7yMMWjpTAXv/ow145Br5l8H9G/2opHSppSYFkIGIsRIeRiGcEO71EFGlyRufCAJ 4F0g== X-Gm-Message-State: ALoCoQmKRwXvcgMVv8nsje/8OIZxvoXUMBo6+5sspniCgRSiPlBCZZtGEQLZbwpW7pqJ3aJCVeFk X-Received: by 10.180.38.107 with SMTP id f11mr6860785wik.59.1403110864445; Wed, 18 Jun 2014 10:01:04 -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 hs8sm26600681wib.10.2014.06.18.10.01.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jun 2014 10:01:03 -0700 (PDT) From: Srinivas Kandagatla To: linux-usb@vger.kernel.org Cc: Felipe Balbi , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, Srinivas Kandagatla Subject: [RFC PATCH 2/3] usb: phy: msm: Make phy_reset clk and reset line optional. Date: Wed, 18 Jun 2014 18:01:00 +0100 Message-Id: <1403110860-3883-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1403110801-3790-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1403110801-3790-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");