From: Guenter Roeck <linux@roeck-us.net>
To: netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 03/14] net: dsa: Report known silicon revisions for Marvell 88E6131
Date: Wed, 22 Oct 2014 21:03:11 -0700 [thread overview]
Message-ID: <1414037002-25528-4-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1414037002-25528-1-git-send-email-linux@roeck-us.net>
Report known silicon revisions when probing Marvell 88E6131 switches.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/net/dsa/mv88e6131.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index 244c735..1230f52 100644
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -21,6 +21,7 @@
#define ID_6085 0x04a0
#define ID_6095 0x0950
#define ID_6131 0x1060
+#define ID_6131_B2 0x1066
static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
{
@@ -32,12 +33,15 @@ static char *mv88e6131_probe(struct device *host_dev, int sw_addr)
ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03);
if (ret >= 0) {
- ret &= 0xfff0;
- if (ret == ID_6085)
+ int ret_masked = ret & 0xfff0;
+
+ if (ret_masked == ID_6085)
return "Marvell 88E6085";
- if (ret == ID_6095)
+ if (ret_masked == ID_6095)
return "Marvell 88E6095/88E6095F";
- if (ret == ID_6131)
+ if (ret == ID_6131_B2)
+ return "Marvell 88E6131 (B2)";
+ if (ret_masked == ID_6131)
return "Marvell 88E6131";
}
--
1.9.1
next prev parent reply other threads:[~2014-10-23 4:03 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-23 4:03 [PATCH 00/14] net: dsa: Fixes and enhancements Guenter Roeck
2014-10-23 4:03 ` [PATCH 01/14] net: dsa: Don't set skb->protocol on outgoing tagged packets Guenter Roeck
2014-10-23 4:03 ` [PATCH 02/14] net: dsa: Report known silicon revisions for Marvell 88E6060 Guenter Roeck
2014-10-23 12:51 ` Sergei Shtylyov
2014-10-23 13:20 ` Guenter Roeck
2014-10-23 16:00 ` Sergei Shtylyov
2014-10-23 4:03 ` Guenter Roeck [this message]
2014-10-23 4:03 ` [PATCH 04/14] net: dsa: Add support for Marvell 88E6352 Guenter Roeck
2014-10-23 4:03 ` [PATCH 05/14] net: dsa/mv88e6352: Add support for MV88E6176 Guenter Roeck
2014-10-23 4:03 ` [PATCH 06/14] net: dsa: Add support for hardware monitoring Guenter Roeck
2014-10-23 4:37 ` Florian Fainelli
2014-10-23 5:06 ` Guenter Roeck
2014-10-23 8:24 ` Richard Cochran
2014-10-23 13:27 ` Guenter Roeck
2014-10-23 13:47 ` Andrew Lunn
2014-10-23 16:27 ` Guenter Roeck
2014-10-23 16:54 ` Andrew Lunn
2014-10-23 17:38 ` Guenter Roeck
2014-10-23 18:03 ` Andrew Lunn
2014-10-23 18:43 ` Guenter Roeck
2014-10-23 19:55 ` Andrew Lunn
2014-10-24 13:53 ` Guenter Roeck
2014-10-24 16:19 ` Guenter Roeck
2014-10-25 14:01 ` Andrew Lunn
2014-10-25 17:23 ` Florian Fainelli
2014-10-25 18:00 ` Andrew Lunn
2014-10-26 15:57 ` Guenter Roeck
2014-10-25 17:26 ` Florian Fainelli
2014-10-25 19:44 ` Guenter Roeck
2014-10-24 5:03 ` David Miller
2014-10-24 5:40 ` Guenter Roeck
2014-10-24 6:10 ` David Miller
2014-10-24 12:52 ` Florian Fainelli
2014-10-24 6:09 ` Guenter Roeck
2014-10-23 4:03 ` [PATCH 07/14] net: dsa/mv88e6352: Report chip temperature Guenter Roeck
2014-10-23 4:03 ` [PATCH 08/14] net: dsa/mv88e6123_61_65: " Guenter Roeck
2014-10-23 4:03 ` [PATCH 09/14] net: dsa: Add support for switch EEPROM access Guenter Roeck
2014-10-23 4:03 ` [PATCH 10/14] net: dsa/mv88e6352: Implement EEPROM access functions Guenter Roeck
2014-10-23 13:54 ` Andrew Lunn
2014-10-23 16:40 ` Guenter Roeck
2014-10-23 18:41 ` [PATCH 10/14] net: dsa/mv88e6352: Implement EEPROM accessfunctions Chris Healy
2014-10-23 18:55 ` Florian Fainelli
2014-10-24 3:59 ` Guenter Roeck
2014-10-23 4:03 ` [PATCH 11/14] net: dsa: Add support for reading switch registers with ethtool Guenter Roeck
2014-10-23 4:40 ` Florian Fainelli
2014-10-23 5:21 ` Guenter Roeck
2014-10-23 4:03 ` [PATCH 12/14] net: dsa/mv88e6123_61_65: Add support for reading switch registers Guenter Roeck
2014-10-23 4:03 ` [PATCH 13/14] net: dsa/mv88e6352: " Guenter Roeck
2014-10-23 4:03 ` [PATCH 14/14] net: dsa: Provide additional RMON statistics Guenter Roeck
2014-10-23 4:45 ` [PATCH 00/14] net: dsa: Fixes and enhancements Florian Fainelli
2014-10-23 5:22 ` Guenter Roeck
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=1414037002-25528-4-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).