netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v3 02/15] net: dsa: Report known silicon revisions for Marvell 88E6060
Date: Wed, 29 Oct 2014 10:44:54 -0700	[thread overview]
Message-ID: <1414604707-22407-3-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1414604707-22407-1-git-send-email-linux@roeck-us.net>

Report known silicon revisions when probing Marvell 88E6060 switches.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v3:
- No change
v2:
- No change

 drivers/net/dsa/mv88e6060.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c
index 05b0ca3..c29aebe 100644
--- a/drivers/net/dsa/mv88e6060.c
+++ b/drivers/net/dsa/mv88e6060.c
@@ -69,8 +69,11 @@ static char *mv88e6060_probe(struct device *host_dev, int sw_addr)
 
 	ret = mdiobus_read(bus, sw_addr + REG_PORT(0), 0x03);
 	if (ret >= 0) {
-		ret &= 0xfff0;
 		if (ret == 0x0600)
+			return "Marvell 88E6060 (A0)";
+		if (ret == 0x0601 || ret == 0x0602)
+			return "Marvell 88E6060 (B0)";
+		if ((ret & 0xfff0) == 0x0600)
 			return "Marvell 88E6060";
 	}
 
-- 
1.9.1

  parent reply	other threads:[~2014-10-29 17:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-29 17:44 [PATCH v3 00/15] net: dsa: Fixes and enhancements Guenter Roeck
2014-10-29 17:44 ` [PATCH v3 01/15] net: dsa: Don't set skb->protocol on outgoing tagged packets Guenter Roeck
2014-10-29 17:44 ` Guenter Roeck [this message]
2014-10-29 17:44 ` [PATCH v3 03/15] net: dsa: Report known silicon revisions for Marvell 88E6131 Guenter Roeck
2014-10-29 17:44 ` [PATCH v3 04/15] net: dsa: Add support for Marvell 88E6352 Guenter Roeck
2014-10-29 17:44 ` [PATCH v3 05/15] net: dsa/mv88e6352: Add support for MV88E6176 Guenter Roeck
2014-10-29 17:44 ` [PATCH v3 06/15] net: dsa: Add support for reporting switch chip temperatures Guenter Roeck
2014-10-29 17:44 ` [PATCH v3 07/15] net: dsa/mv88e6352: Report chip temperature Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 08/15] net: dsa/mv88e6123_61_65: " Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 09/15] net: dsa: Add support for switch EEPROM access Guenter Roeck
2014-10-30 21:11   ` Andrew Lunn
2014-10-30 22:39     ` Guenter Roeck
2014-10-31  1:00       ` Guenter Roeck
2014-10-31  2:40         ` Andrew Lunn
2014-10-31  2:53           ` Guenter Roeck
2014-10-31  3:43             ` David Miller
2014-10-29 17:45 ` [PATCH v3 10/15] dsa: Add new optional devicetree property to describe EEPROM size Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 11/15] net: dsa/mv88e6352: Implement EEPROM access functions Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 12/15] net: dsa: Add support for reading switch registers with ethtool Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 13/15] net: dsa/mv88e6123_61_65: Add support for reading switch registers Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 14/15] net: dsa/mv88e6352: " Guenter Roeck
2014-10-29 17:45 ` [PATCH v3 15/15] net: dsa: Provide additional RMON statistics Guenter Roeck
2014-10-29 18:22 ` [PATCH v3 00/15] net: dsa: Fixes and enhancements Florian Fainelli
2014-10-29 21:39   ` Guenter Roeck
2014-10-30 18:54     ` David Miller

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=1414604707-22407-3-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).