From patchwork Thu Feb 15 13:22:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 873802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="M9FyUIe6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhxpX1qdZz9t2f for ; Fri, 16 Feb 2018 00:25:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031726AbeBONYy (ORCPT ); Thu, 15 Feb 2018 08:24:54 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:38961 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031525AbeBONYw (ORCPT ); Thu, 15 Feb 2018 08:24:52 -0500 Received: by mail-wr0-f196.google.com with SMTP id w77so3350704wrc.6 for ; Thu, 15 Feb 2018 05:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=yqO2IYLiVzXl2LBHvImy7nFoXNpCOB/Lm5bF48RcS6o=; b=M9FyUIe6Z6mpZlcjQKDGXBhjGVQgcaTAm/H9KRMHmhR4dBPCel95dTyrxB4oP1If7/ 9011v5F0LRltRoBsboXHpbbgP4L1kHTBAq6ycArJ07/w4h+H44vNvxOPru+kXRnT5YiQ S7b1INPm7Gy4pWqeTnwDqsUipFS2sL6gACnlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yqO2IYLiVzXl2LBHvImy7nFoXNpCOB/Lm5bF48RcS6o=; b=sKPEldSsRZd+aARlWNaBmqnfWTSRw27YzPypHOqJ4hI7dZOvzicG7GOrkbrSLXHv29 BSezug7PzwJeAC3MwBsvs+hvVHOH7tmObuxovmmDg739FJE2PuEVR4bcMUFMQulHYKC7 CWgPOumgCv664zG0lJQKGb3YBom4RZ3GdIGWDqBRDY7gJkz/Ivoy73pBF3EiPAXa9FBN zqMSPL5WcLeQvc1xYENfw4IVfGGDvaRqts+ugOQ9JcjtpUSAC+ZVIq07GzMdtLceWGvn GWk1y0tc94caZfDGwAV2BprbznnTJsQU5Avth4EAa7re3B9yD9BqVjyf1nNtQI8q6QS9 wPFA== X-Gm-Message-State: APf1xPDn592uUXu9Xz9QlhoHPwRjKRZTeWyhCRkpUl+t//YhCw4hJagN kBfYzgIC9Iz34lC1al0FPDNOyA== X-Google-Smtp-Source: AH8x225MminUgkqjmBCmlgQiV5jH5dAywhb63ALvjWgo1NHbomesTKzY9A9HMLnRpUgJw5W7zJqbwA== X-Received: by 10.223.201.133 with SMTP id f5mr2334406wrh.99.1518701091432; Thu, 15 Feb 2018 05:24:51 -0800 (PST) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id 81sm13601390wmi.26.2018.02.15.05.24.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Feb 2018 05:24:50 -0800 (PST) From: srinivas.kandagatla@linaro.org To: stanimir.varbanov@linaro.org, svarbanov@mm-sol.com, linux-pci@vger.kernel.org, bhelgaas@google.com Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v3] PCI: qcom: add missing supplies required for msm8996 Date: Thu, 15 Feb 2018 13:22:48 +0000 Message-Id: <20180215132248.5572-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.15.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Srinivas Kandagatla This patch adds supplies that are required for msm8996. vdda is analog supply that go in to controller, and vddpe_3v3 is supply to PCIe endpoint. Without these supplies PCIe endpoints which require power supplies are not enumerated at all, as there is no one to power it up. Signed-off-by: Srinivas Kandagatla Acked-by: Stanimir Varbanov Reviewed-by: Rob Herring --- changes since v2: Add back empty line suggested by Stan use ARRAY_SIZE .../devicetree/bindings/pci/qcom,pcie.txt | 4 ++++ drivers/pci/dwc/pcie-qcom.c | 23 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt index 3c9d321b3d3b..1fd703bd73e0 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt @@ -189,6 +189,10 @@ Value type: Definition: A phandle to the analog power supply for IC which generates reference clock +- vddpe-3v3-supply: + Usage: optional + Value type: + Definition: A phandle to the PCIe endpoint power supply - phys: Usage: required for apq8084 diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c index 3e89909f8cb9..e3f20e09a18d 100644 --- a/drivers/pci/dwc/pcie-qcom.c +++ b/drivers/pci/dwc/pcie-qcom.c @@ -102,12 +102,14 @@ struct qcom_pcie_resources_1_0_0 { struct regulator *vdda; }; +#define QCOM_PCIE_2_3_2_MAX_SUPPLY 2 struct qcom_pcie_resources_2_3_2 { struct clk *aux_clk; struct clk *master_clk; struct clk *slave_clk; struct clk *cfg_clk; struct clk *pipe_clk; + struct regulator_bulk_data supplies[QCOM_PCIE_2_3_2_MAX_SUPPLY]; }; struct qcom_pcie_resources_2_4_0 { @@ -521,6 +523,14 @@ static int qcom_pcie_get_resources_2_3_2(struct qcom_pcie *pcie) struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2; struct dw_pcie *pci = pcie->pci; struct device *dev = pci->dev; + int ret; + + res->supplies[0].supply = "vdda"; + res->supplies[1].supply = "vddpe-3v3"; + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(res->supplies), + res->supplies); + if (ret) + return ret; res->aux_clk = devm_clk_get(dev, "aux"); if (IS_ERR(res->aux_clk)) @@ -550,6 +560,8 @@ static void qcom_pcie_deinit_2_3_2(struct qcom_pcie *pcie) clk_disable_unprepare(res->master_clk); clk_disable_unprepare(res->cfg_clk); clk_disable_unprepare(res->aux_clk); + + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); } static void qcom_pcie_post_deinit_2_3_2(struct qcom_pcie *pcie) @@ -567,10 +579,16 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie) u32 val; int ret; + ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies); + if (ret < 0) { + dev_err(dev, "cannot enable regulators\n"); + return ret; + } + ret = clk_prepare_enable(res->aux_clk); if (ret) { dev_err(dev, "cannot prepare/enable aux clock\n"); - return ret; + goto err_aux_clk; } ret = clk_prepare_enable(res->cfg_clk); @@ -621,6 +639,9 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie) err_cfg_clk: clk_disable_unprepare(res->aux_clk); +err_aux_clk: + regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies); + return ret; }