From patchwork Thu Aug 14 23:52:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 380047 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 70E6414008C for ; Fri, 15 Aug 2014 09:53:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751727AbaHNXxR (ORCPT ); Thu, 14 Aug 2014 19:53:17 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:56859 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbaHNXxQ (ORCPT ); Thu, 14 Aug 2014 19:53:16 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so2414279pdj.21 for ; Thu, 14 Aug 2014 16:53:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7rBQMqIQZ1r+5UNH3QEX3tyU53+s4x2Utk9Ps8VwlO8=; b=T4ifSDJDoKRMwIueJ6cAhh1gknjUAQVqMtc6lgpXiSFpZP1UFsun3raFEjgb77VF+M vYe583Z13+2WM2T0ngayFpx5u7hRHlyZmR2JdeEmrp8ogqvrr+e2qStdelN4KiCRzQ6v FmjyyuKRJiW4cbVQ+PSpOBel8Vcfx4JaaXP3K7L7EDaW99Q1Pg48RFviXob2lpt5Xecy gOpNHW3Hr/aMUw4f2iwyqa/dq1YuIpIvStgQ6/69JeYJICuR68lKe728R6RZhgO793p1 oUAbVv/p3AGodIoLcyVrg6PMt9NcFbs3ZNwWISZCL0kJGtWJE0jvv46xKh0S9eHPcaFX AtFA== X-Received: by 10.68.139.162 with SMTP id qz2mr5400671pbb.153.1408060396245; Thu, 14 Aug 2014 16:53:16 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id 5sm9586493pds.12.2014.08.14.16.53.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Aug 2014 16:53:15 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net 1/3] net: phy: bcm7xxx: remove 28nm wildcard entry Date: Thu, 14 Aug 2014 16:52:51 -0700 Message-Id: <1408060373-5996-2-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408060373-5996-1-git-send-email-f.fainelli@gmail.com> References: <1408060373-5996-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A wildcard entry with the 32-bits OUI 0x600d8400 was added as part of the BCM7xxx internal PHY driver, but that entry might match other PHYs that are not covered by this driver, so let's just remove it. Fixes: b560a58c45c6 ("net: phy: add Broadcom BCM7xxx internal PHY driver") Signed-off-by: Florian Fainelli --- drivers/net/phy/bcm7xxx.c | 14 -------------- include/linux/brcmphy.h | 1 - 2 files changed, 15 deletions(-) diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 526b94cea569..2b40548c85d5 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -287,19 +287,6 @@ static struct phy_driver bcm7xxx_driver[] = { .resume = bcm7xxx_28nm_config_init, .driver = { .owner = THIS_MODULE }, }, { - .name = "Broadcom BCM7XXX 28nm", - .phy_id = PHY_ID_BCM7XXX_28, - .phy_id_mask = PHY_BCM_OUI_MASK, - .features = PHY_GBIT_FEATURES | - SUPPORTED_Pause | SUPPORTED_Asym_Pause, - .flags = PHY_IS_INTERNAL, - .config_init = bcm7xxx_28nm_config_init, - .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, - .suspend = bcm7xxx_suspend, - .resume = bcm7xxx_28nm_config_init, - .driver = { .owner = THIS_MODULE }, -}, { .phy_id = PHY_BCM_OUI_4, .phy_id_mask = 0xffff0000, .name = "Broadcom BCM7XXX 40nm", @@ -331,7 +318,6 @@ static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = { { PHY_ID_BCM7366, 0xfffffff0, }, { PHY_ID_BCM7439, 0xfffffff0, }, { PHY_ID_BCM7445, 0xfffffff0, }, - { PHY_ID_BCM7XXX_28, 0xfffffc00 }, { PHY_BCM_OUI_4, 0xffff0000 }, { PHY_BCM_OUI_5, 0xffffff00 }, { } diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 6f76277baf39..61219b9b3445 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -16,7 +16,6 @@ #define PHY_ID_BCM7366 0x600d8490 #define PHY_ID_BCM7439 0x600d8480 #define PHY_ID_BCM7445 0x600d8510 -#define PHY_ID_BCM7XXX_28 0x600d8400 #define PHY_BCM_OUI_MASK 0xfffffc00 #define PHY_BCM_OUI_1 0x00206000