From patchwork Thu Jul 18 21:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1133863 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="PXESiVdw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45qS9k0Mqbz9s4Y for ; Fri, 19 Jul 2019 07:35:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B8A1DC21FA4; Thu, 18 Jul 2019 21:34:52 +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 A8C32C21FE3; Thu, 18 Jul 2019 21:33:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0D858C21FCD; Thu, 18 Jul 2019 21:33:01 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 90594C21FCF for ; Thu, 18 Jul 2019 21:32:58 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id x1so15193669wrr.9 for ; Thu, 18 Jul 2019 14:32:58 -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=Jgaj/NF+9XJeyL+p2urtgC8JhXnmDBQ3wyouoc+aGKs=; b=PXESiVdwFHklZR9HowOCMvnpVuiTyb9o9qi0QBXI8z+ZDbzZhIOg3hRYzQrHjSyw6J O6SAd7DUwgoE8G0838AHiyvlW74hy7CAUNSokXUaPixEnFacXeSCUF8u/oGOZ50AmjyO PS0RB/1LihTPXj5gguza2iXBB0xShggfj6JC6aRtvuDzg9APZbo1qS0FhuxiVKobhOZJ Kj0s72UQXB9WOkO1ZlHQp8Jj7dztsES2Ucr3bhbminOE99GZq0lYYfvi40NawhUtd7JX Q5cYkTuay+EJleUlhVvD1wfdGCvLm+qmq7u2F6zIhM1RY64JCj+orTJ8BSJQhV7sjQGt s6HQ== 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=Jgaj/NF+9XJeyL+p2urtgC8JhXnmDBQ3wyouoc+aGKs=; b=lf00vODExQqlvqYEp6f8q79TiOVW+Xjoi8fXRdl1jSpvChZWbg1pZPRzeCcBvECO4Q U6g04uj1ciCGGBneM2FpRcdZAImkdWj+0kC83a6Y815LhRYAoqbWu7ueUn6KnsGzKi/T X1J5rS6Bhvvve2iTLpsE+xfErpv9vUfjHoxf1F7+/7D2ZI93Z004Az7JYVHqtpElO75U LNuA3HlLefd4ouz/COTs1q7CjTAGOP/J0CX3VhjcOsLfJOfoNTK5zqu2fQg2uUrqn3MN 0ahWLVZhhHfdKA3ZgPO50E1ed+udLOzNu8kHF+9icOfJiVgSpnL2CNa1E88xe0X4Nyyc +4dQ== X-Gm-Message-State: APjAAAXmcOxedhTgFd+q5P6f3q1lSPeApj6xrNFVVKBEx489vnPDXv+I BYUtzG/aQWtOgqAsH6khWAA= X-Google-Smtp-Source: APXvYqzGhy0ERu7RJAImlmnrGAvxxBeGsfIIe6xQYCTWR0UWMP+sUMHW4KjsM8rHmZxK74QxngAcYA== X-Received: by 2002:adf:e4cc:: with SMTP id v12mr51793598wrm.22.1563485578210; Thu, 18 Jul 2019 14:32:58 -0700 (PDT) Received: from localhost.localdomain ([86.126.26.85]) by smtp.gmail.com with ESMTPSA id f10sm19776404wrs.22.2019.07.18.14.32.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 14:32:57 -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:57 +0300 Message-Id: <20190718213001.24815-6-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 5/9] net: tsec: Common handling of MAC station address for DM_ETH 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" In tsec_init, the MAC address is retrieved from 2 different structures depending on whether DM_ETH is enabled or not. But since the field name is the same inside both structures, we can conditionally define the structure of the correct type and simplify the assignments. 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 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 1e20fe4cd246..f6278817330d 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -560,6 +560,8 @@ static int tsec_init(struct udevice *dev) struct tsec_private *priv = (struct tsec_private *)dev->priv; #ifdef CONFIG_DM_ETH struct eth_pdata *pdata = dev_get_platdata(dev); +#else + struct eth_device *pdata = dev; #endif struct tsec __iomem *regs = priv->regs; u32 tempval; @@ -580,21 +582,12 @@ static int tsec_init(struct udevice *dev) * order (BE), MACnADDR1 is set to 0xCDAB7856 and * MACnADDR2 is set to 0x34120000. */ -#ifndef CONFIG_DM_ETH - tempval = (dev->enetaddr[5] << 24) | (dev->enetaddr[4] << 16) | - (dev->enetaddr[3] << 8) | dev->enetaddr[2]; -#else tempval = (pdata->enetaddr[5] << 24) | (pdata->enetaddr[4] << 16) | (pdata->enetaddr[3] << 8) | pdata->enetaddr[2]; -#endif out_be32(®s->macstnaddr1, tempval); -#ifndef CONFIG_DM_ETH - tempval = (dev->enetaddr[1] << 24) | (dev->enetaddr[0] << 16); -#else tempval = (pdata->enetaddr[1] << 24) | (pdata->enetaddr[0] << 16); -#endif out_be32(®s->macstnaddr2, tempval);