From patchwork Wed Jan 25 15:54:09 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: 719721 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 3v7qPD55Q8z9sD5 for ; Thu, 26 Jan 2017 02:54:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eF9ZNdJd"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063AbdAYPyj (ORCPT ); Wed, 25 Jan 2017 10:54:39 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33224 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751720AbdAYPyg (ORCPT ); Wed, 25 Jan 2017 10:54:36 -0500 Received: by mail-lf0-f67.google.com with SMTP id x1so21632415lff.0 for ; Wed, 25 Jan 2017 07:54:30 -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:mime-version :content-transfer-encoding; bh=CLnXVyjkDYLuHKivtQ7Eh2SOLBSSz6FXp37lWgZZO/s=; b=eF9ZNdJdGokJP3d9+3/ITBI+TMk0aoc3CEXTPAo58vYpJgXoJed20nQtyP5Nua/+0C sUinkO9t6/RuC2BZzkHo2csAXD5IQy/q9k/hpwh76Gk0Fc967H9FCfvDn55A5zA8HSIW 7FMINrKefaIusfwzbSLSVMeYUKBu3vEXU0qxq9/TpsNY+9y2fs3wxuKQd7PIulotJphs YJLlmCa5Z3lUaMKLxRA8CcRoKF4A5BzN0B4/cBcXW0YRQoVQm1SdjdycklbJHGMwzcHb 1/uUHp9PiZwbbCw8OTQJzKtN5O+20eKF38iR1gXAkRyjkjGccklu303JufuwACc+GG0/ efXA== 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:mime-version :content-transfer-encoding; bh=CLnXVyjkDYLuHKivtQ7Eh2SOLBSSz6FXp37lWgZZO/s=; b=hFzLnpvtOimNW4x3fDi04/7PX3zSA/v4JF6x824s9gCiSV0LVWWeRLYT9c36BDsjoa Xvkdj65Q4Cb/LIyEVl/iL3/i//d62lmtpZ8qaYZ3h6Rx+00GpYa7mPae8AytvBI3XMj9 GODe4eI81YCWSFGWiMR4I4fvqP3VycH2XqdU8/Ol/10cu08jME3ZgwhF1plZe7zH6Rps WOBHGqqHYVAzg7mkI5loxAQ5itOBLNdUkjV4ykMl/Vx8MvJ3AOr0SFQJpp1sBdnvFnYX G8AdAGdJfR62kQc0AwZqmrqp3YvKiteLe0plDVblVSrmi6j2vVAN8f+W4FiOG8PnHNGM 2voQ== X-Gm-Message-State: AIkVDXICF6xGwFrzjEaSnqHAW9yxwbTTgQSMYu9qB99TA7LCtiUW8SpaDxc+fpvS7USKtw== X-Received: by 10.25.219.82 with SMTP id s79mr8468103lfg.116.1485359669148; Wed, 25 Jan 2017 07:54:29 -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 e23sm8595244lji.29.2017.01.25.07.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Jan 2017 07:54:28 -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 1/3] net: phy: broadcom: use auxctl reading helper in BCM54612E code Date: Wed, 25 Jan 2017 16:54:09 +0100 Message-Id: <20170125155411.14922-1-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 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 Starting with commit 5b4e29005123 ("net: phy: broadcom: add bcm54xx_auxctl_read") we have a reading helper so use it and avoid code duplication. It also means we don't need MII_BCM54XX_AUXCTL_SHDWSEL_MISC define as it's the same as MII_BCM54XX_AUXCTL_SHDWSEL_MISC just for reading needs (same value shifted by 12 bits). Signed-off-by: Rafał Miłecki Reviewed-by: Florian Fainelli --- drivers/net/phy/broadcom.c | 6 ++---- include/linux/brcmphy.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 4223e35490b0..25c6e6cea2dc 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -395,10 +395,8 @@ static int bcm54612e_config_aneg(struct phy_device *phydev) (phydev->interface != PHY_INTERFACE_MODE_RGMII_RXID)) { u16 reg; - /* Errata: reads require filling in the write selector field */ - bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, - MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC); - reg = phy_read(phydev, MII_BCM54XX_AUX_CTL); + 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; /* Clear shadow selector field */ diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 295fb3e73de5..34e61004b9dc 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -111,7 +111,6 @@ #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_MISC_RDSEL_MISC 0x7000 #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)