From patchwork Mon Jul 24 13:48:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9859425 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 CFE1D60349 for ; Mon, 24 Jul 2017 13:50:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFF32274D2 for ; Mon, 24 Jul 2017 13:50:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B497B28403; Mon, 24 Jul 2017 13:50:39 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11469274D2 for ; Mon, 24 Jul 2017 13:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xtORmHfl7PTpsASCBf/8dkinNCJflXbM+5E65jNfsxc=; b=d2ChtePmX71sNZXyQdT7y6+IhC OUq7vzBuOCQDLFnFJiXFTFxGw1PPOmAv+y3hfhTY1RViVCBd90ttBhPHEB1HDK9NO5ftChv3D6ElJ B6XMVykPyQ1HOZkMrnDWKwuftAaOuDUU+ZruK55obT+RlkfF2g8QWVovYI7s5u5wdkRaWd80t+jPW OI46qpPwE0YWpe3yk6MAs3rtwrNq0ahhOBKGpE4OyWZl0uXCiHiRe5ftysAjm9lZS1aWt5DmOF4Eu x0ipWcITt3/cdjuWYZm7ZYd3/WUV88VJ3Rl9aeahTu6bXQTl5ZI2CZoPTVrESZAPVfM1yuVWglvVA /wwJJAAw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dZdkk-0006Gp-CQ; Mon, 24 Jul 2017 13:50:30 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dZdkf-00058H-JV for linux-arm-kernel@lists.infradead.org; Mon, 24 Jul 2017 13:50:27 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 38A0C21E0A; Mon, 24 Jul 2017 15:50:01 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 10E4020DB8; Mon, 24 Jul 2017 15:50:01 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com Subject: [PATCH net-next 03/18] net: mvpp2: set the SMI PHY address when connecting to the PHY Date: Mon, 24 Jul 2017 15:48:33 +0200 Message-Id: <20170724134848.19330-4-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724134848.19330-1-antoine.tenart@free-electrons.com> References: <20170724134848.19330-1-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170724_065025_832873_7D042085 X-CRM114-Status: GOOD ( 12.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, netdev@vger.kernel.org, Antoine Tenart , linux@armlinux.org.uk, nadavh@marvell.com, stefanc@marvell.com, mw@semihalf.com, 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 When connecting to the PHY, explicitly set the SMI PHY address in the controller registers to configure a given port to be connected to the selected PHY. Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvpp2.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 1e592abc9067..6ffff929b22a 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -359,6 +359,8 @@ #define MVPP22_SMI_MISC_CFG_REG 0x1204 #define MVPP22_SMI_POLLING_EN BIT(10) +#define MVPP22_SMI_PHY_ADDR(port) (0x120c + (port) * 0x4) + #define MVPP22_GMAC_BASE(port) (0x7000 + (port) * 0x1000 + 0xe00) #define MVPP2_CAUSE_TXQ_SENT_DESC_ALL_MASK 0xff @@ -5939,7 +5941,9 @@ static void mvpp21_get_mac_address(struct mvpp2_port *port, unsigned char *addr) static int mvpp2_phy_connect(struct mvpp2_port *port) { + struct mvpp2 *priv = port->priv; struct phy_device *phy_dev; + u32 phy_addr; phy_dev = of_phy_connect(port->dev, port->phy_node, mvpp2_link_event, 0, port->phy_interface); @@ -5954,6 +5958,16 @@ static int mvpp2_phy_connect(struct mvpp2_port *port) port->duplex = 0; port->speed = 0; + if (priv->hw_version != MVPP22) + return 0; + + /* Set the SMI PHY address */ + if (of_property_read_u32(port->phy_node, "reg", &phy_addr)) { + netdev_err(port->dev, "cannot find the PHY address\n"); + return -EINVAL; + } + + writel(phy_addr, priv->iface_base + MVPP22_SMI_PHY_ADDR(port->gop_id)); return 0; }