From: Vladimir Oltean <olteanv@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 5/9] net: tsec: Common handling of MAC station address for DM_ETH
Date: Fri, 19 Jul 2019 00:29:57 +0300 [thread overview]
Message-ID: <20190718213001.24815-6-olteanv@gmail.com> (raw)
In-Reply-To: <20190718213001.24815-1-olteanv@gmail.com>
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 <olteanv@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
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);
--
2.17.1
next prev parent reply other threads:[~2019-07-18 21:29 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 21:29 [U-Boot] [PATCH v3 0/9] NXP LS1021A-TSN Board Vladimir Oltean
2019-07-18 21:29 ` [U-Boot] [PATCH v3 1/9] net: tsec: Refactor the readout of the tbi-handle property Vladimir Oltean
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:29 ` [U-Boot] [PATCH v3 2/9] net: tsec: Fix offset of MDIO registers for DM_ETH Vladimir Oltean
2019-07-23 6:23 ` Bin Meng
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:29 ` [U-Boot] [PATCH v3 3/9] net: tsec: Reverse Christmas tree notation Vladimir Oltean
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:29 ` [U-Boot] [PATCH v3 4/9] net: tsec: Make errors visible Vladimir Oltean
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:29 ` Vladimir Oltean [this message]
2019-07-25 18:42 ` [U-Boot] net: tsec: Common handling of MAC station address for DM_ETH Joe Hershberger
2019-07-18 21:29 ` [U-Boot] [PATCH v3 6/9] net: tsec: Change compatible strings to match Linux Vladimir Oltean
2019-07-23 3:30 ` Joe Hershberger
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:29 ` [U-Boot] [PATCH v3 7/9] arm: ls1021atwr: Convert to use driver model TSEC driver Vladimir Oltean
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:30 ` [U-Boot] [PATCH v3 8/9] configs: ls1021atwr: Fix distro_bootcmd for QSPI boot Vladimir Oltean
2019-07-23 3:31 ` Joe Hershberger
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-18 21:30 ` [U-Boot] [PATCH v3 9/9] Add support for the NXP LS1021A-TSN board Vladimir Oltean
2019-07-23 3:35 ` Joe Hershberger
2019-07-23 6:25 ` Bin Meng
2019-07-25 18:42 ` [U-Boot] " Joe Hershberger
2019-07-25 20:30 ` Vladimir Oltean
2019-07-23 0:15 ` [U-Boot] [PATCH v3 0/9] NXP LS1021A-TSN Board Joe Hershberger
2019-07-23 6:07 ` Vladimir Oltean
2019-07-23 7:37 ` Joe Hershberger
2019-07-24 15:37 ` Vladimir Oltean
2019-07-24 18:56 ` Joe Hershberger
2019-07-24 20:54 ` Vladimir Oltean
2019-08-14 9:37 ` Prabhakar Kushwaha
2019-08-14 9:52 ` Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190718213001.24815-6-olteanv@gmail.com \
--to=olteanv@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox