From patchwork Wed May 10 19:02:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 92281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3887453vqo; Wed, 10 May 2023 13:05:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5IXgSDyZ6HJ1Wc8neieznsTyQrOKP0ZW/sOTugBBYwbY92/ax+TFiKzM+wfcBQ8zZOLMfT X-Received: by 2002:a17:902:e549:b0:1a6:bb04:a020 with SMTP id n9-20020a170902e54900b001a6bb04a020mr25779632plf.46.1683749143885; Wed, 10 May 2023 13:05:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683749143; cv=none; d=google.com; s=arc-20160816; b=LLrHxHUroi+bj8ZjOs/W05LgMdgKpZLppazkTZFPGJhnVkteMEwsJpo1cxNgdrFm0x g/IKkMyVyo2R7l9vOgRQdtYp2lDLwZ5w4ONrFVVxQN9+ZXAFwR/K2f9O+8Ayob1okx4C JKTVJh4ajke+W4vDHnIeSQSU+SgLcwpG2OiyYoO8TGo9hChEBJSLth1e9k9pqqaGD1nf LsFc01rWVhMc0Kc/RrCJYCpMEVk550Hl3z9uHlRHBos5b+PrKjVWQS4GucnF7b2nSWMM rUYfWptJ9Hip3laDhcwew5xRE2O0n/BgkFPDO/eXfe7ksFCPycPTnDMaBEbhSIGx8xIM tPHA== 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=10mXaOaXlCYER1lzxuMzicN9inDegAQLiMVXCQtAdgs=; b=f28yXPZSGTmcZuJBwfuivmfOVt1WJZF+95dwLtUTr6NRc7tQziA2Ev+Rvl+CYqCjT6 wDoA4wlzQv0H58zxOdMXG9y+nWSewIQ/pU5+w5ESwXV+bI2fCskbgAUsU0RJWY5pJ1j5 T5UHKj5mK4DR/o/MQHVSKdJXIh6377QYJkp332068qJQJE5bqt7mifIsr/7C6SqFyd1e QafQBGqmBqitIEDH6lolZ+xc+iiHvUC2CUG0uvBtYrDcy5E4opYiGfgGPwIT/1tnZmYP EGYJrLGyVbq97RTTXYb2e4EjbPa8hFEQxmseafrb6ktAbzICCLvRSum9xCeaKJrTnAW9 JIKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=mgPZkKUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m21-20020a170902bb9500b001a220a984f9si4520379pls.546.2023.05.10.13.05.28; Wed, 10 May 2023 13:05:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=mgPZkKUZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236179AbjEJTDK (ORCPT + 99 others); Wed, 10 May 2023 15:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235944AbjEJTDF (ORCPT ); Wed, 10 May 2023 15:03:05 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D453C4EFE for ; Wed, 10 May 2023 12:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=3taFMXyeiauZAm we2U0oqG8pmLpO1VOso9VSsKUPGo0=; b=mgPZkKUZM4+DWwZqRDxrLV8Jd05qwp V/aJ8aTB7RKW8v/xmadKYm9mj4danB06uWtFALH6S8uDjPBZZmOrEoDXAEkILk1K 5d+lBw8oKne7RiCQJ6jojQmyAcqezdsnGo7ST9m4/XPHxNKyUo/XtKcuzcqt43wx tq5+YFbkwCyOg= Received: (qmail 2541527 invoked from network); 10 May 2023 21:02:57 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 10 May 2023 21:02:57 +0200 X-UD-Smtp-Session: l3s3148p1@vIwThVv72O0ujnsI From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , 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 v2 2/2] PCI: rcar-host: add support for optional regulators Date: Wed, 10 May 2023 21:02:52 +0200 Message-Id: <20230510190252.19030-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230510190252.19030-1-wsa+renesas@sang-engineering.com> References: <20230510190252.19030-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765538942083198822?= X-GMAIL-MSGID: =?utf-8?q?1765538942083198822?= The KingFisher board has regulators. They just need to be en-/disabled, so we can leave the handling to devm. Order variables in reverse-xmas while we are here. Signed-off-by: Wolfram Sang --- Changes since v1: * use unsigned int for i * use reverse-xmas for variable declaration * really bail out now on error Thank you, Geert, for the review! drivers/pci/controller/pcie-rcar-host.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index e80e56b2a842..119c894a995c 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" @@ -974,14 +975,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) @@ -992,6 +999,15 @@ 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) { + dev_err_probe(dev, err, "error enabling regulator %s\n", + rcar_pcie_supplies[i]); + return err; + } + } + pm_runtime_enable(pcie->dev); err = pm_runtime_get_sync(pcie->dev); if (err < 0) {