From patchwork Sun Nov 5 09:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 161622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2039116vqu; Sun, 5 Nov 2023 01:29:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmqW3ApIqH3RR0mUh+SMctqOJPF1oW1nH8R1z2l4Nlk4OBENed+hMYZgJS51YbmWs3nBgq X-Received: by 2002:a05:6871:60d:b0:1ef:cedd:5c32 with SMTP id w13-20020a056871060d00b001efcedd5c32mr22818165oan.3.1699176572286; Sun, 05 Nov 2023 01:29:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699176572; cv=none; d=google.com; s=arc-20160816; b=ehAA2ytHi48eLcgOFqpdQ6LM0zKSlrADHyfzo6b5TVmL8jeIv1t6xVCCB8+E6A/f9F ecALFjCHQeuYfw18yAqvimfq3z4/BP1rzHowMJIo+F4gex0+/V4t2g109adwPAafsdEJ Ze9p/bN8H/WkfOInSLJeXlMfA0agXbjo9ZrxCQiNGeQ8YaxePh+CDLtLUSjrkvP+sfH/ 42C6KjIBBM2dz/85OQ0ypsSr39mP6Ve4esMgfR5c4WSlBR1BObQgvDgJWobzPUMiKkts zRY/t5t5vD/8pJMVIQ8HBXi70U29xFN0W/rMmwggIKBefFIwf+BuIFtSDSoyfnODaII6 AhrA== 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=km1S8zZEcbuRQRFhnQ+j9vTvoJEJFWsqJkELKGUX9fM=; fh=42+PF1cuLGWu4MHV3Qy8ZuT4VQs0dS7B2Oh38rM/fpc=; b=UfbZahe98NsZfGa3nK3r03ZQbh+7jMIKaf/6INo1b882yP9jmpd9Rzfdj+XMtLfQRB TvMDZRUNKOwjM1t3H7qn+uLFuu9INWXkanM4CNdfE6AjncyASUorSHtH/jRmB9hLKhVg t6KKc2oWtEMpoNHl2Q8KigZ8yBNooqGzSHV25qXdB6NXGOWJKn7qwXfTKW4v4fbQwkrf KYtUXXNT0xJWIOM4MXHtqFN6WHPfz7IYTAaquSnN+LLXIIbx/dXJzZt247w2wlWIQWh5 geF2+biF/+FFk/ryH6OFg8YjcZaOwdrlWYnK7pJlj2tfieOTqaMvzwLq53rV9Rg5tiZ2 7Cgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=kSpmB+Wj; 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 r20-20020a6560d4000000b005859e8c7c22si5519936pgv.658.2023.11.05.01.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 01:29:32 -0800 (PST) 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=kSpmB+Wj; 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 1D727804E710; Sun, 5 Nov 2023 01:29:31 -0800 (PST) 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 S229884AbjKEJ3X (ORCPT + 35 others); Sun, 5 Nov 2023 04:29:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjKEJ3V (ORCPT ); Sun, 5 Nov 2023 04:29:21 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D5A4123 for ; Sun, 5 Nov 2023 01:29:18 -0800 (PST) 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=km1S8zZEcbuRQRFhnQ+j9vTvoJEJFWsqJkELKGUX9fM=; b=kSpmB+ WjJUUQlaH8pW9NUeMMQm6llUyaZnex187z5aCpAz8XimaWIUo3ezDAUzZYY7u/4I wrvw9LUQs00afzc79wJHC6TH23rbkScdZermgZa0/xlvbBVXCPuVXFtGY2gB9SoD Ov86eaL1/VbOkqUyZtqF1khqFowpv9fKBZuj5qhHZt3ziIC5NEn7G2Bi1g4nI9fC bIlWrtggx407/p5tW4vCVuTzC1kUoccYJB7lUPnl6CtdROUNeKpfspcTZYHb0Of2 i7YOn1ve5jrpJ8qdbQxxCUvcLUx3tZIWfsJfWXwo1QBV1fv0PZVomKUlVAbKo0e/ dnzkzutH9f0s/veQ== Received: (qmail 1670102 invoked from network); 5 Nov 2023 10:29:16 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 5 Nov 2023 10:29:16 +0100 X-UD-Smtp-Session: l3s3148p1@wFMDX2QJasQgAQnoAFPQANY41GnTzLIh From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Krzysztof Kozlowski , Marek Vasut , Yoshihiro Shimoda , Bjorn Helgaas , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 RESEND 1/2] dt-bindings: PCI: rcar-pci-host: add optional regulators Date: Sun, 5 Nov 2023 10:29:07 +0100 Message-Id: <20231105092908.3792-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231105092908.3792-1-wsa+renesas@sang-engineering.com> References: <20231105092908.3792-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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]); Sun, 05 Nov 2023 01:29:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781715773456622482 X-GMAIL-MSGID: 1781715773456622482 Support regulators found on the KingFisher board for miniPCIe (1.5 and 3.3v). For completeness, describe a 12v regulator while we are here. Signed-off-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven Acked-by: Krzysztof Kozlowski --- .../devicetree/bindings/pci/rcar-pci-host.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml index 8fdfbc763d70..b6a7cb32f61e 100644 --- a/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml +++ b/Documentation/devicetree/bindings/pci/rcar-pci-host.yaml @@ -68,6 +68,15 @@ properties: phy-names: const: pcie + vpcie1v5-supply: + description: The 1.5v regulator to use for PCIe. + + vpcie3v3-supply: + description: The 3.3v regulator to use for PCIe. + + vpcie12v-supply: + description: The 12v regulator to use for PCIe. + required: - compatible - reg @@ -121,5 +130,7 @@ examples: clock-names = "pcie", "pcie_bus"; power-domains = <&sysc R8A7791_PD_ALWAYS_ON>; resets = <&cpg 319>; + vpcie3v3-supply = <&pcie_3v3>; + vpcie12v-supply = <&pcie_12v>; }; }; From patchwork Sun Nov 5 09:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 161623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2039124vqu; Sun, 5 Nov 2023 01:29:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwgVpMH6Z5iBH0Q8Yjb+pmgMLfQ0pMuQOPoaI1m2w1OL31QqU3lIMXyJXzLWYHgIA7nmDt X-Received: by 2002:a17:90b:255:b0:27d:dc9:c67d with SMTP id fz21-20020a17090b025500b0027d0dc9c67dmr20262490pjb.36.1699176576145; Sun, 05 Nov 2023 01:29:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699176576; cv=none; d=google.com; s=arc-20160816; b=xX3ofVifxp7nb4O5w9BlRrg6BqL3A/06YU8KLoJbx/5DY7dmz1ozDYnBIdMMV30gq/ cKn7JakTo1KNTCdBSddxq9K1gF6g+zNpuGKHTlbwre6G9gz1MwGMAlQCgsqX3cToBv/Q tRuAnrqsTeWHCR0cICmAf6perpv2mC+Q8OUqum4z/HSC4PiwGG69L4f4o4W0fgLK3Z3D Jro15sa9TRD9ZOFp1XgynmjVLmFAv4BQUFqCEj7fyH69Fz5RmJZG8w5DPoGMy/kPuHnn xV0Yept3M2/FtAgs7ezmzf8oZig6VHsCqlUip3NVTsV66xz95AZmwZOiqUxvOgTSMer8 ssUw== 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=UocSQzLkyvfiWvdhZ7ANGJKxXmiRhTwpYfrcrxHm4iQ+AX8D86WBwD5g6wYjy/fZka DzpBWjOKcDmOrdN/ySWXl8WNxBniue8aVopwoE0Z/tPlDGMjw/oZwy63kf9HO6SCehum U2RW8CQGr0NoydqX9WNjbI1DjFbU0fM1hTCpCY57cVc1iKQ8UtzpQpWByY3FUIEVJRNQ L0ZxWCQ23RKuaakAarHtriH3EZ/H40KxR3U0BlmOwI7CPJGQrEDBprxp4qjOENOQEklk OZUs2V4IOTKobi9pOFzUzUeghEehPgtju2RlhoUl/UNZehDWOT2MyMXN9tGsb5d93oKT yIQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=Z8beJdki; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ca13-20020a17090af30d00b00280216d7e28si5363633pjb.45.2023.11.05.01.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 01:29:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@sang-engineering.com header.s=k1 header.b=Z8beJdki; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 0C773804E71D; Sun, 5 Nov 2023 01:29:35 -0800 (PST) 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 S230003AbjKEJ32 (ORCPT + 35 others); Sun, 5 Nov 2023 04:29:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbjKEJ3X (ORCPT ); Sun, 5 Nov 2023 04:29:23 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3E9AB7 for ; Sun, 5 Nov 2023 01:29:20 -0800 (PST) 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=Z8beJd kiUy9gUiOFHiKWuKMJF/8H8Oq8Le+4B66B//M3p52MSBXBnSyR6Z0uG4YVCgcMJq /MPG+DRczETc/O0hTc9dngbjyq37fVg1XZLQ/0ZRNiNKrv1kpMMjexUs5eybrhql LXcTC2NhNktn7RI9vzPw/r9xvdTonOpG29fMORmKB+qjLT9wLb3WmjiKNx8IWpyj 1Nu5OemHBe9clbuY7ysQJ0pSzUY8Fvd3kjjzH7rPl9C05vXMNfHFjZDexdb2LoIM gwDMZhGnLcL7phoa7duUe8qEa0lYIkKwGw8bQfOHIDc89/yPaukLZJSwO45TqTZN H6QaxbRaVwGkbpQQ== Received: (qmail 1670156 invoked from network); 5 Nov 2023 10:29:16 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 5 Nov 2023 10:29:16 +0100 X-UD-Smtp-Session: l3s3148p1@B0oPX2QJdsQgAQnoAFPQANY41GnTzLIh 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 RESEND 2/2] PCI: rcar-host: add support for optional regulators Date: Sun, 5 Nov 2023 10:29:08 +0100 Message-Id: <20231105092908.3792-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231105092908.3792-1-wsa+renesas@sang-engineering.com> References: <20231105092908.3792-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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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]); Sun, 05 Nov 2023 01:29:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781715777700074610 X-GMAIL-MSGID: 1781715777700074610 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) {