From patchwork Mon Mar 11 08:50:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Palacios X-Patchwork-Id: 226501 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 89B152C02A9 for ; Mon, 11 Mar 2013 19:57:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753330Ab3CKI4o (ORCPT ); Mon, 11 Mar 2013 04:56:44 -0400 Received: from mail1.bemta7.messagelabs.com ([216.82.254.109]:24847 "EHLO mail1.bemta7.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752679Ab3CKI4n (ORCPT ); Mon, 11 Mar 2013 04:56:43 -0400 X-Greylist: delayed 381 seconds by postgrey-1.27 at vger.kernel.org; Mon, 11 Mar 2013 04:56:43 EDT Received: from [216.82.254.211:7600] by server-13.bemta-7.messagelabs.com id 3C/0A-22723-BCA9D315; Mon, 11 Mar 2013 08:50:19 +0000 X-Env-Sender: Hector.Palacios@digi.com X-Msg-Ref: server-5.tower-201.messagelabs.com!1362991819!9298531!1 X-Originating-IP: [66.77.174.13] X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23502 invoked from network); 11 Mar 2013 08:50:19 -0000 Received: from mail.mx1.digi.com (HELO mcl-sms-ns1.digi.com) (66.77.174.13) by server-5.tower-201.messagelabs.com with RC4-SHA encrypted SMTP; 11 Mar 2013 08:50:19 -0000 Received: from mcl-sms-exch01.digi.com (10.5.8.50) by mail.mx1.digi.com (172.16.1.13) with Microsoft SMTP Server (TLS) id 8.3.297.1; Mon, 11 Mar 2013 03:50:23 -0500 Received: from dor-sms-exch01.digi.com (10.49.8.100) by mcl-sms-exch01.digi.com (10.5.8.50) with Microsoft SMTP Server (TLS) id 8.3.297.1; Mon, 11 Mar 2013 03:50:17 -0500 Received: from log-cln-hecpal3.digi.com (10.101.1.177) by dor-sms-exch01.digi.com (10.49.8.100) with Microsoft SMTP Server id 8.3.297.1; Mon, 11 Mar 2013 09:50:15 +0100 From: Hector Palacios To: CC: , , , Hector Palacios Subject: [PATCH 1/2] phy/micrel: Add support for KSZ8031 Date: Mon, 11 Mar 2013 09:50:02 +0100 Message-ID: <1362991803-4610-1-git-send-email-hector.palacios@digi.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Micrel PHY KSZ8031 is similar to KSZ8021 and also requires the special initialization of "Operation Mode Strap Override" in reg 0x16 introduced in 212ea99 (phy/micrel: Implement support for KSZ8021). Signed-off-by: Hector Palacios Reviewed-by: Marek Vasut --- drivers/net/phy/micrel.c | 14 ++++++++++++++ include/linux/micrel_phy.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index b983596..1ab6743 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -187,6 +187,19 @@ static struct phy_driver ksphy_driver[] = { .config_intr = kszphy_config_intr, .driver = { .owner = THIS_MODULE,}, }, { + .phy_id = PHY_ID_KSZ8031, + .phy_id_mask = 0x00ffffff, + .name = "Micrel KSZ8031", + .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause | + SUPPORTED_Asym_Pause), + .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, + .config_init = ksz8021_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + .ack_interrupt = kszphy_ack_interrupt, + .config_intr = kszphy_config_intr, + .driver = { .owner = THIS_MODULE,}, +}, { .phy_id = PHY_ID_KSZ8041, .phy_id_mask = 0x00fffff0, .name = "Micrel KSZ8041", @@ -273,6 +286,7 @@ static struct mdio_device_id __maybe_unused micrel_tbl[] = { { PHY_ID_KSZ8001, 0x00ffffff }, { PHY_ID_KS8737, 0x00fffff0 }, { PHY_ID_KSZ8021, 0x00ffffff }, + { PHY_ID_KSZ8031, 0x00ffffff }, { PHY_ID_KSZ8041, 0x00fffff0 }, { PHY_ID_KSZ8051, 0x00fffff0 }, { PHY_ID_KSZ8873MLL, 0x00fffff0 }, diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h index adfe8c0..b1ffaa4 100644 --- a/include/linux/micrel_phy.h +++ b/include/linux/micrel_phy.h @@ -19,6 +19,7 @@ #define PHY_ID_KSZ9021 0x00221610 #define PHY_ID_KS8737 0x00221720 #define PHY_ID_KSZ8021 0x00221555 +#define PHY_ID_KSZ8031 0x00221556 #define PHY_ID_KSZ8041 0x00221510 #define PHY_ID_KSZ8051 0x00221550 /* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */