Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938785AbcKDSXQ (ORCPT ); Fri, 4 Nov 2016 14:23:16 -0400 Received: from smtpoutz27.laposte.net ([194.117.213.102]:49553 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S936462AbcKDSXP (ORCPT ); Fri, 4 Nov 2016 14:23:15 -0400 Subject: [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions To: =?UTF-8?B?TcOlbnMgUnVsbGfDpXJk?= , "David S. Miller" , netdev References: <581CD1AF.6030300@laposte.net> Cc: LKML , Mason , Andrew Lunn From: Sebastian Frias Message-ID: <581CD210.5060206@laposte.net> Date: Fri, 4 Nov 2016 19:23:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <581CD1AF.6030300@laposte.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-VR-SrcIP: 92.154.11.170 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeelvddrkeelgdduudehucetufdoteggodetrfdotffvucfrrhho X-VR-Cause-2: fhhilhgvmecunfetrffquffvgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhht X-VR-Cause-3: shculddquddttddmnecujfgurhepuffvfhfhkffffgggjggtgfesthejrgdttdefjeenucfhrhhomhep X-VR-Cause-4: ufgvsggrshhtihgrnhcuhfhrihgrshcuoehsfhekgeeslhgrphhoshhtvgdrnhgvtheqnecukfhppeel X-VR-Cause-5: vddrudehgedruddurddujedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghloheplgdu X-VR-Cause-6: jedvrddvjedrtddrvddugegnpdhinhgvthepledvrdduheegrdduuddrudejtddpmhgrihhlfhhrohhm X-VR-Cause-7: pehsfhekgeeslhgrphhoshhtvgdrnhgvthdprhgtphhtthhopehmrghnshesmhgrnhhsrhdrtghomh X-VR-AvState: No X-VR-State: 0 X-VR-State: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1765 Lines: 50 Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII definitions: PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays. Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC mode or the pad mode for the HW to work properly. Signed-off-by: Sebastian Frias --- drivers/net/ethernet/aurora/nb8800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index d2855c9..fba2699 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id) static void nb8800_mac_config(struct net_device *dev) { struct nb8800_priv *priv = netdev_priv(dev); + struct phy_device *phydev = dev->phydev; bool gigabit = priv->speed == SPEED_1000; u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE; u32 mac_mode = 0; @@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev) mac_mode |= HALF_DUPLEX; if (gigabit) { - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII) + if (phy_interface_is_rgmii(phydev)) mac_mode |= RGMII_MODE; mac_mode |= GMAC_MODE; @@ -1278,9 +1279,8 @@ static int nb8800_tangox_init(struct net_device *dev) break; case PHY_INTERFACE_MODE_RGMII: - pad_mode = PAD_MODE_RGMII; - break; - + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: pad_mode = PAD_MODE_RGMII; break; -- 1.7.11.2