From patchwork Fri Oct 28 20:56:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 9402683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39CDB601C0 for ; Fri, 28 Oct 2016 20:59:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8982A8BE for ; Fri, 28 Oct 2016 20:59:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F3402A8C5; Fri, 28 Oct 2016 20:59:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 972B22A8C2 for ; Fri, 28 Oct 2016 20:59:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c0EDt-0006MY-3n; Fri, 28 Oct 2016 20:57:57 +0000 Received: from mail-pf0-x22a.google.com ([2607:f8b0:400e:c00::22a]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c0EDU-000699-4b for linux-arm-kernel@lists.infradead.org; Fri, 28 Oct 2016 20:57:33 +0000 Received: by mail-pf0-x22a.google.com with SMTP id e6so42722624pfk.3 for ; Fri, 28 Oct 2016 13:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B6nJChFVtEyYZpvj7BByAVb8GzbUTsEAGIWSl7rLQ7Y=; b=IiKWbPeUHxrre18T8Ca8orrPpO2x+99HVGMnOQX1samo36jENLufeinVTFBd/LkEsV SXpS25dqgOXWIM0HgXxAGfG+JHpFmBUEqNiSnlyFjnP+S0hvhHoBz2J7bBWZWk6PLfMN cVo9dILxsni/99cti5egY/vyNodi4A7D3osDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B6nJChFVtEyYZpvj7BByAVb8GzbUTsEAGIWSl7rLQ7Y=; b=FHKDcwxwFpCiZvYIyb1KddVNOAi2apDQwWLJbPvnxpp1Zy+Y6oLx1gdHo+5fqGSrTQ Q+1jKqvrY1VUI2oQbjS0d+ZVDE4NzJTFEk7QmzCuDnAnySdhyp028fWS2s9uJqfBwKqc 2z7OaIRMXgllb73BSOjst9HYH6d44+lOrjIzvqA6AGb5Wbz+cjtDnKHIt2Rgc9goUX2S 6m16MAmIKVkuy4fMno4floV7f8CyoxrXd1c8FgZeeXxp6wcONXEm3Jmpl2Cq5vOk1z71 Rp8ozZdQhWQgBEoqU7COSigiwa5X/Dy/orpqt5lEJR3McJCympqq/9WPxQ60V0DFCllm N39Q== X-Gm-Message-State: ABUngvcP2PaoAKcHRFVwGbRYbOoyTPa0zvzo9rYVr1wO2IGv1bTtd5KQbTqqAB2Kv8K248Z6 X-Received: by 10.99.218.21 with SMTP id c21mr22995908pgh.67.1477688231033; Fri, 28 Oct 2016 13:57:11 -0700 (PDT) Received: from venom.rtp.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id e90sm20932803pfd.5.2016.10.28.13.57.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Oct 2016 13:57:10 -0700 (PDT) From: Jon Mason To: David Miller , Rob Herring , Mark Rutland , Florian Fainelli Subject: [PATCH v2 1/6] net: phy: broadcom: add bcm54xx_auxctl_read Date: Fri, 28 Oct 2016 16:56:54 -0400 Message-Id: <1477688219-3871-2-git-send-email-jon.mason@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477688219-3871-1-git-send-email-jon.mason@broadcom.com> References: <1477688219-3871-1-git-send-email-jon.mason@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161028_135732_257178_FC910688 X-CRM114-Status: GOOD ( 12.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, rafal@milecki.pl, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add a helper function to read the AUXCTL register for the BCM54xx. This mirrors the bcm54xx_auxctl_write function already present in the code. Signed-off-by: Jon Mason --- drivers/net/phy/broadcom.c | 10 ++++++++++ include/linux/brcmphy.h | 1 + 2 files changed, 11 insertions(+) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 583ef8a..3a64b3d 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -30,6 +30,16 @@ MODULE_DESCRIPTION("Broadcom PHY driver"); MODULE_AUTHOR("Maciej W. Rozycki"); MODULE_LICENSE("GPL"); +static int bcm54xx_auxctl_read(struct phy_device *phydev, u16 regnum) +{ + /* The register must be written to both the Shadow Register Select and + * the Shadow Read Register Selector + */ + phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | + regnum << MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT); + return phy_read(phydev, MII_BCM54XX_AUX_CTL); +} + static int bcm54xx_auxctl_write(struct phy_device *phydev, u16 regnum, u16 val) { return phy_write(phydev, MII_BCM54XX_AUX_CTL, regnum | val); diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 60def78..0ed6691 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -110,6 +110,7 @@ #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_MASK 0x0007