Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1681954imu; Wed, 12 Dec 2018 02:24:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/X1p6kh6U6mIu07VnZvrmRNF+2K6J/f4Vop830RywSLt6jIAhBrsE4t6h/j8n1TzYKluvdj X-Received: by 2002:a17:902:6b49:: with SMTP id g9mr19008606plt.98.1544610286921; Wed, 12 Dec 2018 02:24:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544610286; cv=none; d=google.com; s=arc-20160816; b=GEJMcYH3WXOL7NTx1MrvTboDG6IFSSYZ06lahjCl6fwr2pfkQa0sh7BjtM6B+Q/COk Ot5cTH/9FeswJaGjHRkkR9612yn96q4yzaPPnQgOlsnCYZzWj/wsZYV4svLlCQKMmz4I w/EPEA5EdTBBKMyg6o3xHphpt3veR2Iuz3iaowf6+rs3vMml43ccYWWIhk0Wr4H9tvVV fwUoQEBSX1MaqHQtmKstX71jnAnmJp4KqpoP+fGzpIAkCHGSuJV3zQn/E6e/GEqGR7XG RsHS6ctZBIHKxPUy8BivByZadnkPJQuaUFOiureGmA6JVWM5nBu76weo1/G69Z5Y2BEB Txqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ob0/81MECDQEqxg8bCuxDdFNGXhDACsSa/3WGRl0TGk=; b=Bl7vfaztXoBNgVL+zJDASQ6jjUOkjEqJbqmeIntmLkttfcWLZZWRvYMX4IbIHDtagi On4UsC81Egd/TTTOa7Ra78N68P3chT9RbqTfjlPUIEmIsWED65ZwZ86CXJwOB+UfP/Rg pDNOg5WtXzrJdk2ZBtO67B26QAwY4VegQBHPTQnc1E+MDzTEXlnFthrsvwwmlGxeI/KC GgzK68sfgUV8Q0iD1fo7CWdNHsoVGx9jkkSPgDsORf18ZMdG3t3bFEa5tV0Gv29FblBk GsVYIuFb/Uxen65XqPBQ3I6hEkwjII2wu3Vejx5YKpY/shSjLtTo31mdiuXojKQqVcsV HyEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j22si14195022pgj.244.2018.12.12.02.24.31; Wed, 12 Dec 2018 02:24:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727120AbeLLKWA (ORCPT + 99 others); Wed, 12 Dec 2018 05:22:00 -0500 Received: from mail.bootlin.com ([62.4.15.54]:57462 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726877AbeLLKV5 (ORCPT ); Wed, 12 Dec 2018 05:21:57 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id 073A620734; Wed, 12 Dec 2018 11:21:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.2 Received: from localhost.localdomain (aaubervilliers-681-1-89-7.w90-88.abo.wanadoo.fr [90.88.30.7]) by mail.bootlin.com (Postfix) with ESMTPSA id 905FB2073D; Wed, 12 Dec 2018 11:21:44 +0100 (CET) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , Bjorn Helgaas Cc: , Rob Herring , Mark Rutland , Lorenzo Pieralisi , linux-pci@vger.kernel.org, , , Antoine Tenart , Maxime Chevallier , Nadav Haklai , Miquel Raynal Subject: [PATCH v2 02/12] PCI: aardvark: Add reset GPIO support Date: Wed, 12 Dec 2018 11:21:32 +0100 Message-Id: <20181212102142.16053-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181212102142.16053-1-miquel.raynal@bootlin.com> References: <20181212102142.16053-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The IP supports a reset GPIO. When S2RAM will be added, we must ensure the reset line (if any) is deasserted when resuming. Add support for it. Signed-off-by: Miquel Raynal --- drivers/pci/controller/pci-aardvark.c | 57 +++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index b95eb2aa00bb..1d31d74ddab7 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -9,6 +9,7 @@ */ #include +#include #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#include #include #include "../pci.h" @@ -201,6 +203,7 @@ struct advk_pcie { u16 msi_msg; int root_bus_nr; struct pci_bridge_emul bridge; + struct gpio_desc *reset_gpio; }; static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg) @@ -973,6 +976,55 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie) return err; } +static int advk_pcie_hard_reset(struct advk_pcie *pcie) +{ + if (!pcie->reset_gpio) + return -EINVAL; + + gpiod_set_value_cansleep(pcie->reset_gpio, 0); + msleep(1); + gpiod_set_value_cansleep(pcie->reset_gpio, 1); + + return 0; +} + +static int advk_pcie_setup_reset_gpio(struct advk_pcie *pcie) +{ + struct device *dev = &pcie->pdev->dev; + enum of_gpio_flags of_flags; + unsigned long gpio_flags; + int gpio_nb; + int ret; + + gpio_nb = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, + &of_flags); + if (gpio_nb == -EPROBE_DEFER) + return gpio_nb; + + /* Old bindings miss the reset GPIO handle */ + if (!gpio_is_valid(gpio_nb)) { + dev_warn(dev, "Reset GPIO unavailable\n"); + return 0; + } + + if (of_flags & OF_GPIO_ACTIVE_LOW) + gpio_flags = GPIOF_ACTIVE_LOW | + GPIOF_OUT_INIT_LOW; + else + gpio_flags = GPIOF_OUT_INIT_HIGH; + + ret = devm_gpio_request_one(dev, gpio_nb, gpio_flags, + "pcie-aardvark-reset"); + if (ret) { + dev_err(dev, "Failed to retrieve reset GPIO (%d)\n", ret); + return ret; + } + + pcie->reset_gpio = gpio_to_desc(gpio_nb); + + return 0; +} + static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1008,6 +1060,11 @@ static int advk_pcie_probe(struct platform_device *pdev) return ret; } + ret = advk_pcie_setup_reset_gpio(pcie); + if (ret) + return ret; + + advk_pcie_hard_reset(pcie); advk_pcie_setup_hw(pcie); advk_sw_pci_bridge_init(pcie); -- 2.19.1