From patchwork Wed Jan 19 09:09:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 79436 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 A1D93B6F10 for ; Wed, 19 Jan 2011 20:10:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753836Ab1ASJJ4 (ORCPT ); Wed, 19 Jan 2011 04:09:56 -0500 Received: from smtp4-g21.free.fr ([212.27.42.4]:55356 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753746Ab1ASJJy (ORCPT ); Wed, 19 Jan 2011 04:09:54 -0500 Received: from bobafett.staff.proxad.net (unknown [213.228.1.121]) by smtp4-g21.free.fr (Postfix) with ESMTP id 96FFB4C8081; Wed, 19 Jan 2011 10:09:47 +0100 (CET) Received: from flexo.localnet (unknown [172.18.3.103]) by bobafett.staff.proxad.net (Postfix) with ESMTPS id 8A7EF1803E4; Wed, 19 Jan 2011 10:09:46 +0100 (CET) From: Florian Fainelli Organization: Freebox To: netdev@vger.kernel.org Subject: [PATCH] e1000: add support for Marvell Alaska M88E1118R PHY Date: Wed, 19 Jan 2011 10:09:44 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.35-24-server; KDE/4.5.1; x86_64; ; ) Cc: David Miller , Dirk Brandewie , Jeff Kirsher MIME-Version: 1.0 Message-Id: <201101191009.44707.ffainelli@freebox.fr> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli This patch adds support for Marvell Alask M88E188R PHY chips. Support for other M88* PHYs is already there, so there is nothing more to add than its PHY id. Signed-off-by: Florian Fainelli CC: Dirk Brandewie CC: Jeff Kirsher diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index aed223b..7501d97 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -124,6 +124,7 @@ static s32 e1000_set_phy_type(struct e1000_hw *hw) case M88E1000_I_PHY_ID: case M88E1011_I_PHY_ID: case M88E1111_I_PHY_ID: + case M88E1118_E_PHY_ID: hw->phy_type = e1000_phy_m88; break; case IGP01E1000_I_PHY_ID: @@ -3222,7 +3223,8 @@ static s32 e1000_detect_gig_phy(struct e1000_hw *hw) break; case e1000_ce4100: if ((hw->phy_id == RTL8211B_PHY_ID) || - (hw->phy_id == RTL8201N_PHY_ID)) + (hw->phy_id == RTL8201N_PHY_ID) || + (hw->phy_id == M88E1118_E_PHY_ID)) match = true; break; case e1000_82541: diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 196eeda..c70b23d 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h @@ -2917,6 +2917,7 @@ struct e1000_host_command_info { #define M88E1000_14_PHY_ID M88E1000_E_PHY_ID #define M88E1011_I_REV_4 0x04 #define M88E1111_I_PHY_ID 0x01410CC0 +#define M88E1118_E_PHY_ID 0x01410E40 #define L1LXT971A_PHY_ID 0x001378E0 #define RTL8211B_PHY_ID 0x001CC910