Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3229593imu; Sat, 24 Nov 2018 00:36:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/WC5+I4hFjTFnLW0e5+ep4sv20fWiIjIPMabOIctVHKeSMQBoRLlYA9iuXoULGZE7rE2sUN X-Received: by 2002:a17:902:a710:: with SMTP id w16mr18792035plq.95.1543048613554; Sat, 24 Nov 2018 00:36:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543048613; cv=none; d=google.com; s=arc-20160816; b=SEWiy+W+ZE7kpZGteHkXLVXLeqK5gFTqOek/vh65Da1AxXHJ10UVFRFbVbLDFlHAyY iFwkRiFqeUwbFFgfYzNFk1acKlxvtXY/pCls+fWR5YlpPV4I99r1rWULdVNe0tgmHoxT UlOTQyPv4qU5qwVbQ1qsg6M3mpYPDnSY6ubCDEl3p8KFMOwRE/p/JF6eQW4seC9kDyhS CwlQSyZ1K/DcCChrMoZPRypJ2g3nNZX1qbSXyHrKrBmNerQngLK+2C9uvpgEZg2k8V42 nel+R9wlG1XjLK0Oztc9ZNRYdQmKUAmfu1tmRpyz7k5P3qoLvwfJnMSh/7rssrJVx9pK eOJA== 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=XQbTB1pJaZqqbYVoQBzB1yxUEOvB90BRAdPTYoJU6LCVE5kWXR7qreBedIYik3PhyC aB2HCkhrDqckq3PBaW26xZi2MiziobbQXpCoJ1Ns4XGWhiAoeekyZotUYaSGcpaCitQl YUHvCA2YnT0UsZy6P9L/FflPAG+Srg0WMzPN1guLQEzmK2I2ztCzaNQhpvx61nVbiuNc zeM/zrnE6igU0dQRY+UEia6pp4El+ZaRTZRcYCQjFvfZ/bWTdweeZsy6bK1nYy48hfE+ 5OOSHQtifhueukL22ScPSBC5CKqkg6CVjhrMkSf2zZTaUTaC9Ottu+MCPGWM+vriCdHz RRkA== 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 g187si31381040pfc.43.2018.11.24.00.36.39; Sat, 24 Nov 2018 00:36:53 -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 S2439872AbeKXBDB (ORCPT + 99 others); Fri, 23 Nov 2018 20:03:01 -0500 Received: from mail.bootlin.com ([62.4.15.54]:33929 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388551AbeKXBC7 (ORCPT ); Fri, 23 Nov 2018 20:02:59 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id 4590120D29; Fri, 23 Nov 2018 15:18:35 +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-94-205.w90-88.abo.wanadoo.fr [90.88.35.205]) by mail.bootlin.com (Postfix) with ESMTPSA id D371C20741; Fri, 23 Nov 2018 15:18:34 +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 02/12] PCI: aardvark: add reset GPIO support Date: Fri, 23 Nov 2018 15:18:21 +0100 Message-Id: <20181123141831.8214-3-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123141831.8214-1-miquel.raynal@bootlin.com> References: <20181123141831.8214-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