From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41201C2BBFD for ; Sat, 11 Apr 2020 23:25:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 101DC2051A for ; Sat, 11 Apr 2020 23:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647542; bh=HfXVT+D10oZb1Gh6vS78q48PrcluJgAc1F/pWrQh+rI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oYniKTLd8HS3BpnT3mrYY4OSPHWFroTBqocBNqFXIIYJE2IWLR7vapqa2wt2XwQbN B/MXaVkXoDafIzOXCxfIghOUaQx1P9d7DUe9+CNufIxUvpzyljg40YCQuaD1y4X9yU OJxNCzZTgK2zOy0SfiOBvyQqorsFsD1eT3kx3cuE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730758AbgDKXZk (ORCPT ); Sat, 11 Apr 2020 19:25:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:52128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730087AbgDKXML (ORCPT ); Sat, 11 Apr 2020 19:12:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B1E8A20CC7; Sat, 11 Apr 2020 23:12:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646731; bh=HfXVT+D10oZb1Gh6vS78q48PrcluJgAc1F/pWrQh+rI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ntS438l+n3zQ5hA8UI8ujFY/KTU4sSa6sVDH88BlpKpPYlYXB9BdH+yTFw8r9SmTc sqozJT65CENxtyPHVAQaabx32drk80XDglpKo+Bur40ZDqvxAKclN+UCEFzZHqZGQ+ z7nNp3kciDcp1+zmoaKh72FDUccaNeKtRMuSc7cU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Oltean , Florian Fainelli , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 06/66] net: phy: mscc: accept all RGMII species in vsc85xx_mac_if_set Date: Sat, 11 Apr 2020 19:11:03 -0400 Message-Id: <20200411231203.25933-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231203.25933-1-sashal@kernel.org> References: <20200411231203.25933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ Upstream commit da206d65f2b293274f8082a26da4e43a1610da54 ] The helper for configuring the pinout of the MII side of the PHY should do so irrespective of whether RGMII delays are used or not. So accept the ID, TXID and RXID variants as well, not just the no-delay RGMII variant. Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/mscc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c index 36647b70b9a36..1ff03d5cb6a64 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -470,6 +470,9 @@ static int vsc85xx_mac_if_set(struct phy_device *phydev, reg_val = phy_read(phydev, MSCC_PHY_EXT_PHY_CNTL_1); reg_val &= ~(MAC_IF_SELECTION_MASK); switch (interface) { + case PHY_INTERFACE_MODE_RGMII_TXID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_ID: case PHY_INTERFACE_MODE_RGMII: reg_val |= (MAC_IF_SELECTION_RGMII << MAC_IF_SELECTION_POS); break; -- 2.20.1