From patchwork Thu Jul 18 21:29:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1133858 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mGdR9BCi"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qS741LwNz9s3l for ; Fri, 19 Jul 2019 07:33:36 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BD981C21FCD; Thu, 18 Jul 2019 21:33:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1063DC21F3F; Thu, 18 Jul 2019 21:32:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 931A8C21E0D; Thu, 18 Jul 2019 21:32:55 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 4EC2DC21C8B for ; Thu, 18 Jul 2019 21:32:55 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id p13so30158965wru.10 for ; Thu, 18 Jul 2019 14:32:55 -0700 (PDT) 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=d8LASEdAnudguVo3V588+zErvZ+ne93W1O/hg4ln++c=; b=mGdR9BCirOSd8tdbguJq1LjGzVsOU9oVsrU0GwoN5DVjgtBfkjW3vtojy5Ft+I2XHv YF1HHmG8cm5uujCjCqwaunU0m6AQDCQ/sPwho8yzwexTVr1YZUYoFtzHIjhW419hDIXP WC6dq9Mc987iLsCLI3J7KkffuYV0MNDXSb9eT5/RMRs3GwvIoftq9ZYjT/KwxRPQ+idt oJs0yoc6brqbpxPGNUM+aJg2mmHtv2ydRi/BhIx9iQbYbyuLE82rakhQwwgeUtqoTeef ss18sb4RhHqGwXBO6oLBbBWKzkCByaT6f7pAL1/vr78kIR6KBSQjyEDjSSouYhgcdGyo BHkw== 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=d8LASEdAnudguVo3V588+zErvZ+ne93W1O/hg4ln++c=; b=g8BcD8sde3TMyapcvxLN9NFMT1zwv3vbC4rbwjTWOX4qdXT2Bk+aylgrecMvH9FM9U 5vhO6J+zLZHdZ+5wP9VfqPBEa9tTLqhmxORxN/8xiMWXYZOuR+6EvdWxGl05RHmnMoPM FDPE+OulL9Xd4P5OzWNGOtFI2736xb8HGURtk3hEb2ZhjDOvBmM2j3NJCLqUR6x1fR35 yd3VsSCZ/XW5w9xyLDotXrkOZtJaBKDthG0/c/s/1HMtxh6Q9ygPiJVUvL2SE6wYcBAD 42qp9e2mY9kkNApTiHFn5ecbIpK0XfpwO682WMqSM5OTZ76z5nPhyi1SWlk5seBfkBlk x4Vw== X-Gm-Message-State: APjAAAW2T0N/V4U/JRQ0TVnZ3pptfq98X55XeJeCsCklGr8cEyvkZdMj z5o0Kbfj1jQZ/KJTS6VAELQlGRSq X-Google-Smtp-Source: APXvYqwkENYiB0pYE1EviODo6uH4rDblZEbnMNzRJT7SG4acti4NGF3tHmw0KgDo5OEUtpCZpQ9iWg== X-Received: by 2002:a5d:4d81:: with SMTP id b1mr54602377wru.27.1563485574745; Thu, 18 Jul 2019 14:32:54 -0700 (PDT) Received: from localhost.localdomain ([86.126.26.85]) by smtp.gmail.com with ESMTPSA id f10sm19776404wrs.22.2019.07.18.14.32.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 14:32:54 -0700 (PDT) From: Vladimir Oltean To: joe.hershberger@ni.com, prabhakar.kushwaha@nxp.com, bmeng.cn@gmail.com, u-boot@lists.denx.de Date: Fri, 19 Jul 2019 00:29:53 +0300 Message-Id: <20190718213001.24815-2-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718213001.24815-1-olteanv@gmail.com> References: <20190718213001.24815-1-olteanv@gmail.com> Subject: [U-Boot] [PATCH v3 1/9] net: tsec: Refactor the readout of the tbi-handle property X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The point of this patch is to eliminate the use of the locally-defined "reg" variable (which interferes with next patch) and simplify the fallback to the default CONFIG_SYS_TBIPA_VALUE in case "tbi-handle" is missing. Signed-off-by: Vladimir Oltean Acked-by: Joe Hershberger Reviewed-by: Bin Meng --- Changes from v2: None. Changes from v1: None. drivers/net/tsec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 06a9b4fb03ce..53eb5470f4c8 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -798,6 +798,7 @@ int tsec_probe(struct udevice *dev) struct eth_pdata *pdata = dev_get_platdata(dev); struct fsl_pq_mdio_info mdio_info; struct ofnode_phandle_args phandle_args; + u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE; ofnode parent; const char *phy_mode; int ret; @@ -825,14 +826,12 @@ int tsec_probe(struct udevice *dev) return -ENOENT; } - if (dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0, - &phandle_args)) { - priv->tbiaddr = CONFIG_SYS_TBIPA_VALUE; - } else { - int reg = ofnode_read_u32_default(phandle_args.node, "reg", - CONFIG_SYS_TBIPA_VALUE); - priv->tbiaddr = reg; - } + ret = dev_read_phandle_with_args(dev, "tbi-handle", NULL, 0, 0, + &phandle_args); + if (ret == 0) + ofnode_read_u32(phandle_args.node, "reg", &tbiaddr); + + priv->tbiaddr = tbiaddr; phy_mode = dev_read_prop(dev, "phy-connection-type", NULL); if (phy_mode)