From patchwork Mon Jan 23 07:20:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Healy X-Patchwork-Id: 137276 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 141EF1007D1 for ; Mon, 23 Jan 2012 18:22:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751954Ab2AWHWC (ORCPT ); Mon, 23 Jan 2012 02:22:02 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:45580 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751469Ab2AWHWA (ORCPT ); Mon, 23 Jan 2012 02:22:00 -0500 Received: by iacb35 with SMTP id b35so3326204iac.19 for ; Sun, 22 Jan 2012 23:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=nlNbpS4qPwX3vqNNiYwYSIwwbwBgSZ53P7N65m3rrys=; b=usx2rT2ntEqVTvny5A+F0aahnBhmR8T17Eo9bnIncgEY2eAMy5JAzqS81H1Ffou8lt LEOGkRuQaUSw4Ldxuzyk+tywxjZulRy0BZI+vfkf43jb8mJrGvqDWwmtns/IqGwc3zy3 2Fb8qCUWiA+yphToq6Zvei8JmP2trnEiKiJRU= Received: by 10.42.168.133 with SMTP id w5mr6867422icy.38.1327303319954; Sun, 22 Jan 2012 23:21:59 -0800 (PST) Received: from localhost.localdomain (99-73-211-50.lightspeed.irvnca.sbcglobal.net. [99.73.211.50]) by mx.google.com with ESMTPS id f8sm43977811ibl.6.2012.01.22.23.21.57 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jan 2012 23:21:59 -0800 (PST) From: Chris Healy To: "David S. Miller" , Ben Hutchings , Lennert Buytenhek , netdev@vger.kernel.org Cc: Chris Healy Subject: [PATCH 1/1] dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 switches. Date: Sun, 22 Jan 2012 23:20:54 -0800 Message-Id: <1327303254-28573-1-git-send-email-cphealy@gmail.com> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add reporting of silicon revision during the probe function for Marvell 88E6123/88E6161/88E6165 switches. Signed-off-by: Chris Healy --- drivers/net/dsa/mv88e6123_61_65.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/mv88e6123_61_65.c b/drivers/net/dsa/mv88e6123_61_65.c index c0a458f..6f23c95 100644 --- a/drivers/net/dsa/mv88e6123_61_65.c +++ b/drivers/net/dsa/mv88e6123_61_65.c @@ -20,12 +20,25 @@ static char *mv88e6123_61_65_probe(struct mii_bus *bus, int sw_addr) ret = __mv88e6xxx_reg_read(bus, sw_addr, REG_PORT(0), 0x03); if (ret >= 0) { - ret &= 0xfff0; - if (ret == 0x1210) + if (ret == 0x1212) + return "Marvell 88E6123 (A1)"; + if (ret == 0x1213) + return "Marvell 88E6123 (A2)"; + if ((ret & 0xfff0) == 0x1210) return "Marvell 88E6123"; - if (ret == 0x1610) + + if (ret == 0x1612) + return "Marvell 88E6161 (A1)"; + if (ret == 0x1613) + return "Marvell 88E6161 (A2)"; + if ((ret & 0xfff0) == 0x1610) return "Marvell 88E6161"; - if (ret == 0x1650) + + if (ret == 0x1652) + return "Marvell 88E6165 (A1)"; + if (ret == 0x1653) + return "Marvell 88e6165 (A2)"; + if ((ret & 0xfff0) == 0x1650) return "Marvell 88E6165"; }