From patchwork Thu May 24 17:50:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 136765 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2528395lji; Thu, 24 May 2018 10:52:28 -0700 (PDT) X-Google-Smtp-Source: AB8JxZockPTrilOjXgSn+IZi44P0oCZhet3GNQQDDOEVZ+Y6BFMLgZYYbxiQL/uJs4P/t2M3vzAK X-Received: by 2002:a62:b03:: with SMTP id t3-v6mr8352788pfi.32.1527184348187; Thu, 24 May 2018 10:52:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527184348; cv=none; d=google.com; s=arc-20160816; b=NQJXcLmYetDBqopnphIZuq5gcRwwG8mwtX24PV8oWF9aGsyiNKNX+Rws9rDPwr8ZJa s4sm8Ki+q8C59w40mBtI+5A5ZAd2QRkvMzJcUJNW2vBZgyK+bP+/RkPOkxvlt+qMxzvc OSwRtJoXpCnqU/8kU7LS9gGA1qm/1kh6cmZ6pd8UOdI/PUMlbs1yYiNmSqSAGeeyB5pu og5HSBqNqSikKpBF9/7/QYXm1jJOWKcTgPtDiA26frxq6RjYhantEdFFK21TgRJyjbFd CLTUmuocakN92Df12PnbWHIjdeomJ1M2+CK27pC7xRPPox6R5ylrdLSVW+c1Dvw0UBXf 2B4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7YAVxxaB8HDX73lc1ub8E0b43LtMwYpddRc8+ydEaUw=; b=AhRzmAW3ZZZ/RM+xae6y3hpxqBxBNInFDdZl6AJgdpVjUTLQAfIVKQeFOQ6rzxq/IF A6WnR5z35E7NklJt8XMYIPdbawRi0y37OdYRZev3XhNLiUwrERh4b1PMjvH1ci3XRLfv goPKe8Eio+u1cv1hmJEiLMTRLXynawqCTHqutLi/w42rBfGj64hYkwBOSdyZm5LWdqzq ooi5HOOCPA1zBGK9Z+ypyyLgl6lERCihVb9gbIutS0T2bBNmy0HAu0DDH6Rca3qjI8w9 nOOO0MB3Z4xbODR0vRkiUBu+1XKR4A6SnLRmWy/L13ScCjRy9FgmzY2apbDGfpw1ZSNS u2xg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w4-v6si11141025plp.357.2018.05.24.10.52.27; Thu, 24 May 2018 10:52:28 -0700 (PDT) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032064AbeEXRwZ (ORCPT + 30 others); Thu, 24 May 2018 13:52:25 -0400 Received: from mail-yb0-f196.google.com ([209.85.213.196]:38181 "EHLO mail-yb0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031168AbeEXRul (ORCPT ); Thu, 24 May 2018 13:50:41 -0400 Received: by mail-yb0-f196.google.com with SMTP id w14-v6so900947ybm.5; Thu, 24 May 2018 10:50:40 -0700 (PDT) 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=7YAVxxaB8HDX73lc1ub8E0b43LtMwYpddRc8+ydEaUw=; b=ORPg76FbNHTqMTRU7fzlitXbCPiJ68kll1KZG2pvxsBqkpVwQupnVemBLJJzPMNexw Sz7upEzYuhj4qZpHqnkB22nqRHUeTEBpbXsULSjHzon4ZfV7H6/yW4uZJmJG9agzkxqo tHAootPzIiltcUTd8v62cFxRu6JkPz9glxDUaNRqya/6HqsBLJLaselP3VMprMqeAIcm kwaNMJJMDYryWHaa5hqpSkJW886Qsz51Ff4tcrw15FUdElu61Y9/GcJSQOQmkFoI0E31 kd7kR6O8IE25tcpzL0yEYrTXsNZZtmTIJCr+Vy6KZC7cW3z971l5XnrY4WouLmAioRNv U+wQ== X-Gm-Message-State: ALKqPwfdWhkd7ALBHE74+Dgi7Ndc02cJmn8VARU+d/XMPf0tq1vRo0Gr tRyp2GltW1XqCsR78ast6Q== X-Received: by 2002:a25:d342:: with SMTP id e63-v6mr4937941ybf.77.1527184240230; Thu, 24 May 2018 10:50:40 -0700 (PDT) Received: from localhost.localdomain (24-223-123-72.static.usa-companies.net. [24.223.123.72]) by smtp.googlemail.com with ESMTPSA id v73-v6sm9183814ywa.92.2018.05.24.10.50.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 10:50:39 -0700 (PDT) From: Rob Herring To: Greg Kroah-Hartman , Linus Walleij , Alexander Graf , Bjorn Andersson , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Joerg Roedel , Robin Murphy , Mark Brown , Frank Rowand Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, boot-architecture@lists.linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/8] pinctrl: optionally stop deferring probe at end of initcalls Date: Thu, 24 May 2018 12:50:21 -0500 Message-Id: <20180524175024.19874-6-robh@kernel.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524175024.19874-1-robh@kernel.org> References: <20180524175024.19874-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the pinctrl node in DT indicates that pin setup is optional and the defaults can be used with the 'pinctrl-use-default', then only defer probe until initcalls are done. This gives platforms the option to work without their pinctrl driver being enabled. Signed-off-by: Rob Herring --- drivers/pinctrl/devicetree.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -- 2.17.0 diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c index b601039d6c69..74a31074b406 100644 --- a/drivers/pinctrl/devicetree.c +++ b/drivers/pinctrl/devicetree.c @@ -110,17 +110,23 @@ static int dt_to_map_one_config(struct pinctrl *p, int ret; struct pinctrl_map *map; unsigned num_maps; + bool pctl_optional = false; /* Find the pin controller containing np_config */ np_pctldev = of_node_get(np_config); for (;;) { + if (!pctl_optional) + pctl_optional = of_property_read_bool(np_pctldev, "pinctrl-use-default"); + np_pctldev = of_get_next_parent(np_pctldev); if (!np_pctldev || of_node_is_root(np_pctldev)) { - dev_info(p->dev, "could not find pctldev for node %pOF, deferring probe\n", - np_config); of_node_put(np_pctldev); - /* OK let's just assume this will appear later then */ - return -EPROBE_DEFER; + ret = driver_deferred_probe_check_init_done(p->dev, pctl_optional); + if (ret == -EPROBE_DEFER) + /* OK let's just assume this will appear later then */ + dev_info(p->dev, "could not find pctldev for node %pOF, deferring probe\n", + np_config); + return ret; } /* If we're creating a hog we can use the passed pctldev */ if (pctldev && (np_pctldev == p->dev->of_node))