From patchwork Mon Mar 2 18:00:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eilon Greenstein X-Patchwork-Id: 23952 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 7AA35DDF80 for ; Tue, 3 Mar 2009 05:01:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756659AbZCBSBX (ORCPT ); Mon, 2 Mar 2009 13:01:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756385AbZCBSBW (ORCPT ); Mon, 2 Mar 2009 13:01:22 -0500 Received: from mms3.broadcom.com ([216.31.210.19]:4409 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755853AbZCBSBV (ORCPT ); Mon, 2 Mar 2009 13:01:21 -0500 Received: from [10.11.16.99] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 02 Mar 2009 10:01:10 -0800 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Received: by mail-irva-10.broadcom.com (Postfix, from userid 47) id 369AE2C1; Mon, 2 Mar 2009 10:01:10 -0800 (PST) Received: from mail-irva-8.broadcom.com (mail-irva-8 [10.11.18.52]) by mail-irva-10.broadcom.com (Postfix) with ESMTP id 1C9CD2B0; Mon, 2 Mar 2009 10:01:10 -0800 (PST) Received: from mail-irva-13.broadcom.com (mail-irva-13.broadcom.com [10.11.16.103]) by mail-irva-8.broadcom.com (MOS 3.7.5a-GA) with ESMTP id HNG17905; Mon, 2 Mar 2009 10:00:45 -0800 (PST) Received: from [10.185.6.119] (lb-tlvb-eliezer.il.broadcom.com [10.185.6.119]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 0CDD074D04; Mon, 2 Mar 2009 10:00:41 -0800 (PST) Subject: [PATCH 12/18] bnx2x: BCM8705 has no microcode From: "Eilon Greenstein" To: "David Miller" cc: netdev@vger.kernel.org, "Yaniv Rosner" , "Ben Hutchings" Organization: Broadcom Date: Mon, 02 Mar 2009 20:00:10 +0200 Message-ID: <1236016810.7723.83.camel@lb-tlvb-eliezer> MIME-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-WSS-ID: 65B2C16C4A44899157-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Subject: [PATCH 12/18] bnx2x: BCM8705 has no microcode Signed-off-by: Yaniv Rosner Signed-off-by: Eilon Greenstein --- drivers/net/bnx2x_link.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x_link.c b/drivers/net/bnx2x_link.c index 280f008..c72a964 100644 --- a/drivers/net/bnx2x_link.c +++ b/drivers/net/bnx2x_link.c @@ -3033,10 +3033,9 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars) MDIO_WIS_DEVAD, MDIO_WIS_REG_LASI_CNTL, 0x1); - bnx2x_save_bcm_spirom_ver(bp, params->port, - ext_phy_type, - ext_phy_addr, - params->shmem_base); + /* BCM8705 doesn't have microcode, hence the 0 */ + bnx2x_save_spirom_version(bp, params->port, + params->shmem_base, 0); break; case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8706: