From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH 2/3] net: phy: broadcom: drop duplicated define for RXD to RXC delay Date: Wed, 25 Jan 2017 16:54:10 +0100 Message-ID: <20170125155411.14922-2-zajec5@gmail.com> References: <20170125155411.14922-1-zajec5@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xo Wang , Joel Stanley , Jon Mason , Jaedon Shin , netdev@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: "David S . Miller" , Florian Fainelli Return-path: Received: from mail-lf0-f66.google.com ([209.85.215.66]:35468 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751685AbdAYPyc (ORCPT ); Wed, 25 Jan 2017 10:54:32 -0500 Received: by mail-lf0-f66.google.com with SMTP id v186so21573390lfa.2 for ; Wed, 25 Jan 2017 07:54:31 -0800 (PST) In-Reply-To: <20170125155411.14922-1-zajec5@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Rafał Miłecki We had two defines for the same bit (both were used with the MII_BCM54XX_AUXCTL_SHDWSEL_MISC register). Signed-off-by: Rafał Miłecki --- drivers/net/phy/broadcom.c | 2 +- include/linux/brcmphy.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 25c6e6cea2dc..9b7c2d57ca92 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -42,7 +42,7 @@ static int bcm54810_config(struct phy_device *phydev) return rc; val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); - val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; + val &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; val |= MII_BCM54XX_AUXCTL_MISC_WREN; rc = bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val); diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 34e61004b9dc..bff53da82b58 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -113,7 +113,6 @@ #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 -#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8) #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_WIRESPEED_EN (1 << 4) #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007 -- 2.11.0