From patchwork Wed Jan 25 20:00:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 719852 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 3v7wsN6KM4z9sDg for ; Thu, 26 Jan 2017 07:00:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="acoU2nJt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131AbdAYUAz (ORCPT ); Wed, 25 Jan 2017 15:00:55 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33819 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091AbdAYUAv (ORCPT ); Wed, 25 Jan 2017 15:00:51 -0500 Received: by mail-lf0-f68.google.com with SMTP id q89so22070652lfi.1 for ; Wed, 25 Jan 2017 12:00:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KpJL9PHTRVxZTiAe1JNY84jVLGrHEwc6ZlHmGQDUhxU=; b=acoU2nJtDt0qYH1tkoNgRP9TrIFTDPxBuxVsLITH0laSyvlLl9Up06l1Z4hBQQCd+l tbz4cI7hxIDp65Km4FT7Sg5Qp1dUqZ/qNzORhTEQCGNkFDW7fLyohmnQd3E9u2ZCi3tk E+ZNT3f08SnZoqPjk0Yx61we1jqHkugwmlxobW9bf0FBCCsAbk4FEzjgelU+mbx9Hr0b /GKJTrblPzUX6wPZuWX9DGoNzIGCMQnkhMmQKwKv681rH6TMpanHfuF9w3tbXS6jJ+xV q5gMERvAGIj1+Ta1SjOIdRjuDW00lbAVJJDgPTNB5f8VxO1gEoJy2xuLxZIwBQbuxw8i YM0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KpJL9PHTRVxZTiAe1JNY84jVLGrHEwc6ZlHmGQDUhxU=; b=inykTYUvcAjTPwVA1eo8Otr66Acc9RWumdcOT0FYfe6S868/YOZ+g26kh3m3LgF49U AjDIMwgC6vaLNH+JHbASiGZuIqiGHBWISsx3hLyXnyd1Kxbq9JzDPAU/M1EOwYc1PYwS Y6Fo8yltgkwqeR+zJvxHT1qONJ9jTXp+yXHHTlfNfxsFkqvEg7RIaynrlQeGXTStC7TZ BNqlcs8gRLkDKQkEQfiqF7zJdTweo0Dbp4G5rpiioyv4k+H/nq7Lc2vv8zBiozAwk7Tu xJV7nuKXyGBrdZMu8ihPOJmEG8naEyGu/P8lQMXWTvkHDLVtWvZBqaGksqdmUcK6RT8s Lcuw== X-Gm-Message-State: AIkVDXI7mAwMRG+cTcKrhCuLbR1JRGg3se0IeoarHj/70ZyodpsbF1tgZGjEvLSQcFPT7g== X-Received: by 10.46.77.149 with SMTP id c21mr16878757ljd.69.1485374449261; Wed, 25 Jan 2017 12:00:49 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id d77sm354901lfd.26.2017.01.25.12.00.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 12:00:48 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: "David S . Miller" , Florian Fainelli Cc: Xo Wang , Joel Stanley , Jon Mason , Jaedon Shin , netdev@vger.kernel.org, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V2 2/3] net: phy: broadcom: drop duplicated define for RGMII SKEW delay Date: Wed, 25 Jan 2017 21:00:26 +0100 Message-Id: <20170125200027.14387-3-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170125200027.14387-1-zajec5@gmail.com> References: <20170125200027.14387-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Reviewed-by: Florian Fainelli --- V2: Drop the other define to match datasheet. Thanks Florian. --- 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..97d1c057c0a1 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -398,7 +398,7 @@ static int bcm54612e_config_aneg(struct phy_device *phydev) reg = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); /* Disable RXD to RXC delay (default set) */ - reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; + reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; /* Clear shadow selector field */ reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK; bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 34e61004b9dc..f9cb73df127e 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -109,7 +109,6 @@ #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA 0x0800 #define MII_BCM54XX_AUXCTL_MISC_WREN 0x8000 -#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW 0x0100 #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12