From patchwork Tue Aug 16 09:49:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 659590 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sD71f24sBz9t1T for ; Tue, 16 Aug 2016 19:52:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ebxyvtmk; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A7D38A7558; Tue, 16 Aug 2016 11:52:01 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QCKs1gJYxN0U; Tue, 16 Aug 2016 11:52:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BDE17B3841; Tue, 16 Aug 2016 11:52:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8D4D7B3822 for ; Tue, 16 Aug 2016 11:51:54 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rxCHzESiTX3j for ; Tue, 16 Aug 2016 11:51:54 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by theia.denx.de (Postfix) with ESMTPS id 8D7B5A7544 for ; Tue, 16 Aug 2016 11:51:49 +0200 (CEST) Received: by mail-wm0-f66.google.com with SMTP id o80so15497293wme.0 for ; Tue, 16 Aug 2016 02:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tiLsBIDLGVRYIoet78xjuM4pixG0AOKAAZpXuEi8Cfs=; b=ebxyvtmkI/dVNMyC1nvhFpVau/VCNcXzdyks0RLJt7TB+FNxNanDqXQA914ZDl2O/q 6jBIwCQ/QD6DD1Iii3KwJ3CYkKTlPxjbS4zLjC0GQ3CGRjW7Q7zi5x39s1b5aTqaQV0X D7CuxAVDyawuQcRz4T/sDhb4msZlfxlswnB2djaYk6INCMQxEQBAcyrG79rNiQs7JvCI T60nN/nQB7JEYfth1zMxLgpkKdRgnoh34B3fImWmBbxeqgkMD+aXGvKiT4CYOurVgByB 38f0USifSv5SIqqnjL77/iWLbptRQ1BJlo1qC7CcI0o/BaBi3QoyJRCXIAtO+GfZFbUL JqVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tiLsBIDLGVRYIoet78xjuM4pixG0AOKAAZpXuEi8Cfs=; b=mb8f3S7Ayr+JVy7SZGIryDb5MNdLmGT+tNqhEzjW1RD/4Sejz41Ali1JnYDUefFzB1 u77n3bZ9/KE+f2b1b94uJfX5cy5bHxB9Z1sa787lRTxo1TtBMxRBsMRn+RIM9Kl5I3qc bZ+GNKrzTappzP6INvH3qirfNVTilwXdd7qaXsGpBk43FtisYtd+R8JKpjxXY/Pfb2US kkWYDk7CvtsAelWUp/etXlINvVJR5/iGHvhEamUkgY7FeiWgxaqeKlctHvgxmqUy237J BTRok79W69VtNuPiat9mXpNFZszYdIQ2tVQq/6jExgZo2dQ34Xj8seISIaRHGgatqJJI wCwA== X-Gm-Message-State: AEkooutMOfOulKsDvOxMtB/rpweLfWTN5aByAYyNAGFA7Z2l9Ove3bBfAhKL8yO3aHf1Ug== X-Received: by 10.194.238.42 with SMTP id vh10mr36849939wjc.111.1471341109574; Tue, 16 Aug 2016 02:51:49 -0700 (PDT) Received: from sark.fritz.box (host26-103-dynamic.31-79-r.retail.telecomitalia.it. [79.31.103.26]) by smtp.gmail.com with ESMTPSA id a2sm25812796wjg.46.2016.08.16.02.51.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 02:51:48 -0700 (PDT) From: Beniamino Galvani To: u-boot@lists.denx.de Date: Tue, 16 Aug 2016 11:49:47 +0200 Message-Id: <1471340990-16247-2-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471340990-16247-1-git-send-email-b.galvani@gmail.com> References: <1471340990-16247-1-git-send-email-b.galvani@gmail.com> Cc: Tom Rini , Joe Hershberger , linux-amlogic@lists.infradead.org Subject: [U-Boot] [PATCH 1/4] pinctrl: generic: scan for "pins" and "groups" properties in sub-nodes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In cases where the pins and groups definitions are in a sub-node, as: uart_a { mux { groups = "uart_tx_a", "uart_rx_a"; function = "uart_a"; }; }; pinctrl_generic_set_state_subnode() returns an error for the top-level node and pinctrl_generic_set_state() fails. Instead, return success so that the child nodes are tried. Signed-off-by: Beniamino Galvani Reviewed-by: Simon Glass Reviewed-by: Masahiro Yamada --- drivers/pinctrl/pinctrl-generic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c index e86b72a..baff40f 100644 --- a/drivers/pinctrl/pinctrl-generic.c +++ b/drivers/pinctrl/pinctrl-generic.c @@ -312,8 +312,10 @@ static int pinctrl_generic_set_state_subnode(struct udevice *dev, is_group = true; strings_count = fdt_count_strings(fdt, node, subnode_target_type); - if (strings_count < 0) - return -EINVAL; + if (strings_count < 0) { + /* skip this node; may contain config child nodes */ + return 0; + } } for (i = 0; i < strings_count; i++) {