From patchwork Thu Sep 21 13:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 143160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5311886vqi; Thu, 21 Sep 2023 21:14:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEp2ZwtpzJVGsqcoDib245tE1lyQY+ywJNNJzcEHDcNBkCHy5pparpZsJW2h4qihD+OVjLR X-Received: by 2002:a05:6902:18cd:b0:d81:97c:c01e with SMTP id ck13-20020a05690218cd00b00d81097cc01emr8890210ybb.5.1695356088711; Thu, 21 Sep 2023 21:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695356088; cv=none; d=google.com; s=arc-20160816; b=0SdkW4MP5GoK12mWsxIgDNA8RI1GQX8puPbX+jcDzSA3+PcloaoKCv8mnWly0sFhmI CKpdxVGecMStPZ1VDOjvjDpmxEIzJ1C1x7Q8Sua19F8JSIXndltoj0Gj0jD3c3lEqkCd OA7FeQ7t8AQlxqhID4uOG5PIn3fdNqNta3wwlnI4krNJRqdS93/zEXQRo1qh+WiG8ZIV 7tbWnt1xiKeRLBiNZIxJ13GaA3KwIJcFILf413l4Hj/w4pN4Vsz+QCEPs4/aZp5ypyTi 253F9/kA+uRwNXeNJziYf9IOHUAQKduRzqWkmiydSiHoYYHOjfvJEkb7grPH8ZjxGtQJ zDBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=j9pgIVNbVKA+mGdxd7ctowoNKe1CAHE+xat2Gout9gA=; fh=HPC7tj7R3h+9mw6XeYIHWlL8uGCBeIehrTDju/ENh68=; b=uArUxlAhIN535oJmYpKvaJrnqZF2o2wqmWCSjcFIzVGJYcECNXskEEgB9mcWDUHZ+u GTRg6iBu6Mgy3PcvMF+imOvnN7QgJf2kww9st8HK8jJvrUTD44fKOhIzLBRlTIhtFFHw ySLr92/+qU/LQs8GlXf16APRVUpqOn3SkifWvQpO+mWulkfl6QBwoFr07+3pwqX2KBg+ cuxfEEzjtkxGDv1PNjfyyytbTEZ77qGqD8Y9jDeZNxYoMYa01Lwen08hBpBpreiBtIsT FxQnTOt+wjdRu2T715X6vOGEDv7lLqxjPGEljWDkvz8/HZUcYTUazviBpgPS7U/wn1Jr tAyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=gSdA1rEs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id bg26-20020a056a02011a00b0057c3fb18aafsi1383567pgb.78.2023.09.21.21.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 21:14:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=gSdA1rEs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DF57A80732AC; Thu, 21 Sep 2023 10:52:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229974AbjIURwd (ORCPT + 29 others); Thu, 21 Sep 2023 13:52:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjIURwV (ORCPT ); Thu, 21 Sep 2023 13:52:21 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DF75566DC for ; Thu, 21 Sep 2023 10:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=j9pgIVNbVKA+mGdxd7ctowoNKe1CAHE+xat2Gout9gA=; b=gSdA1r EstdpL0CkLG5f9mmoTbY+BTvqrOAAKiE23+C0nENKngTAFUwFu2D+dOdFh0qG4oN aiVAPPXwwpFlzfus+ofDQjf2mGnanIO3XjBAyjOZ9fDxhJNHFoMvC8uzmFzMmt2j mTbcS/6OZq97fOvrzkc8cPZmRrdntjSWah1xEr2iQ9D/FIi1ru3gE9IL8DxUTpYf 3JcXhoPO4qZnRUPe0QuHvAMxU7nBVaqPg91VD/eqyH8uggEV6KMh87pvLBv/J/4s i5Psp0VCWcn5yFkMJ7nw0TDQzuCUTMqsD3DPpCG2lPpdt951atrObrh+XKdvuRgv 9VMOZBoj3X1Ul5Ww== Received: (qmail 962649 invoked from network); 21 Sep 2023 15:26:44 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 21 Sep 2023 15:26:44 +0200 X-UD-Smtp-Session: l3s3148p1@dlBmcd4FnXYuciJ+ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Manivannan Sadhasivam , Marek Vasut , Yoshihiro Shimoda , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 2/2] PCI: rcar-host: add support for optional regulators Date: Thu, 21 Sep 2023 15:26:24 +0200 Message-Id: <20230921132624.5664-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230921132624.5664-1-wsa+renesas@sang-engineering.com> References: <20230921132624.5664-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 21 Sep 2023 10:52:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777709705963750433 X-GMAIL-MSGID: 1777709705963750433 The KingFisher board has regulators for miniPCIe, so enable these optional regulators using devm. devm will automatically disable them when the driver releases the device. Order variables in reverse-xmas while we are here. Signed-off-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven Acked-by: Manivannan Sadhasivam --- drivers/pci/controller/pcie-rcar-host.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index 88975e40ee2f..7aecc114af4f 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "pcie-rcar.h" @@ -953,14 +954,20 @@ static const struct of_device_id rcar_pcie_of_match[] = { {}, }; +/* Design note 346 from Linear Technology says order is not important */ +static const char * const rcar_pcie_supplies[] = { + "vpcie12v", "vpcie3v3", "vpcie1v5" +}; + static int rcar_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct pci_host_bridge *bridge; struct rcar_pcie_host *host; struct rcar_pcie *pcie; + unsigned int i; u32 data; int err; - struct pci_host_bridge *bridge; bridge = devm_pci_alloc_host_bridge(dev, sizeof(*host)); if (!bridge) @@ -971,6 +978,13 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie->dev = dev; platform_set_drvdata(pdev, host); + for (i = 0; i < ARRAY_SIZE(rcar_pcie_supplies); i++) { + err = devm_regulator_get_enable_optional(dev, rcar_pcie_supplies[i]); + if (err < 0 && err != -ENODEV) + return dev_err_probe(dev, err, "can't enable regulator %s\n", + rcar_pcie_supplies[i]); + } + pm_runtime_enable(pcie->dev); err = pm_runtime_get_sync(pcie->dev); if (err < 0) {