From patchwork Wed Feb 1 16:55:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9550313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D59DF60415 for ; Wed, 1 Feb 2017 17:23:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C701B28435 for ; Wed, 1 Feb 2017 17:23:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBCD528458; Wed, 1 Feb 2017 17:23:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 50B3028435 for ; Wed, 1 Feb 2017 17:23:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cYycZ-0008Kg-Ik; Wed, 01 Feb 2017 17:23:03 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cYyRN-0000LU-CB for linux-arm-kernel@bombadil.infradead.org; Wed, 01 Feb 2017 17:11:29 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cYyE3-00071b-3b for linux-arm-kernel@lists.infradead.org; Wed, 01 Feb 2017 16:57:44 +0000 Received: by mail-pg0-x242.google.com with SMTP id 204so34639764pge.2 for ; Wed, 01 Feb 2017 08:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9qnKMyqswXHgVfLsI0jD7ohVkfGR1OzNGc910FAWB7I=; b=pXVt5A3vXEvAdQl5rbOBV8DwzdNaV9uQ0ClDpC42V/6iz4EqgoCBBSuU5tGtG1R4Gz 59yMU78hxbZiitTbUroTuK1jnV65tVLm5eu9G0fWt59xUrTUlK2eHNRvSMOqXXTD7sCd lppboht/BWCvpfdZer/FLL+o7M3Sj56w7U6O2KgcsNbW+dukKAaNkatFaLlsfkseZkfn pricKmGjnI9/tbfn/nYPJpWnH4rLk2L4vx0jz/llorwb1slJXBLemJfBJZT/n0WHfZsH gwBlONTFvmxMO4QXVMraBRTwQTpqIOz/ExvjOVa/X62Nl8OCyR5b8hzJwl4YuIaUKwVf 5zXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9qnKMyqswXHgVfLsI0jD7ohVkfGR1OzNGc910FAWB7I=; b=FYFesTrZ0bPFMgdbtqaUTf2UReXGHJyc3rAwCd+DP9V5KGd9V3moFaYYeGcZgRTeR8 0x1gzR/jhtlRqJcrvT62OZdzlcjB5hKJSdGVNleqKuzB3t1bTGwkwLPsam3w9snPTutt P25cd1lcC2rbtmiZrKWqN2FGEGm3bfrhURx102qNhy5t0VQVhmSmysaU3YAglTT4T+sl 3wVXR7WedE/K9SvrAwnXGOtaX6+8s2WDvZN06a78GBmRe1zOK+M0/LE29ZXvP2/riRf8 DR6q6h4gCsrLoYugkTLb73MLKIo3OjSLxVPThd24468W+rnzj4xtpa2sRBRe4K6AQ3NT zhhw== X-Gm-Message-State: AIkVDXKwfPMTJ+vuoMfhCv87G7X+2VPJJlssOvdQJlqnUfORXF3QGOQ/t3c4buXxQ7muhA== X-Received: by 10.84.199.194 with SMTP id d2mr5899022plh.134.1485968180601; Wed, 01 Feb 2017 08:56:20 -0800 (PST) Received: from localhost.localdomain (c-73-19-0-61.hsd1.wa.comcast.net. [73.19.0.61]) by smtp.gmail.com with ESMTPSA id w25sm51364053pge.9.2017.02.01.08.56.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Feb 2017 08:56:19 -0800 (PST) From: Andrey Smirnov To: linux-pci@vger.kernel.org Subject: [PATCH v2 2/3] PCI: imx6: Allow probe deferal by reset GPIO Date: Wed, 1 Feb 2017 08:55:58 -0800 Message-Id: <20170201165559.22436-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170201165559.22436-1-andrew.smirnov@gmail.com> References: <20170201165559.22436-1-andrew.smirnov@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170201_165743_313373_D330CBED X-CRM114-Status: GOOD ( 15.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , linux-kernel@vger.kernel.org, Bjorn Helgaas , yurovsky@gmail.com, linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some designs implement reset GPIO via a GPIO expander connected to a peripheral bus. One such example would be i.MX7 Sabre board where said GPIO is provided by SPI shift register connected to a bitbanged SPI bus. In order to support such designs allow reset GPIO request to defer probing of the driver. Cc: yurovsky@gmail.com Cc: Lucas Stach Cc: Bjorn Helgaas Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Andrey Smirnov Reviewed-by: Lucas Stach --- drivers/pci/host/pci-imx6.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 50a1291..3ef8093 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -611,7 +611,7 @@ static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, return 0; } -static int __init imx6_pcie_probe(struct platform_device *pdev) +static int imx6_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct imx6_pcie *imx6_pcie; @@ -653,6 +653,8 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) dev_err(dev, "unable to get reset gpio\n"); return ret; } + } else if (imx6_pcie->reset_gpio == -EPROBE_DEFER) { + return imx6_pcie->reset_gpio; } /* Fetch clocks */ @@ -746,11 +748,12 @@ static struct platform_driver imx6_pcie_driver = { .name = "imx6q-pcie", .of_match_table = imx6_pcie_of_match, }, + .probe = imx6_pcie_probe, .shutdown = imx6_pcie_shutdown, }; static int __init imx6_pcie_init(void) { - return platform_driver_probe(&imx6_pcie_driver, imx6_pcie_probe); + return platform_driver_register(&imx6_pcie_driver); } device_initcall(imx6_pcie_init);