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 47FFAC2BBFD for ; Sat, 11 Apr 2020 23:18:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17FE220CC7 for ; Sat, 11 Apr 2020 23:18:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586647093; bh=tL5KqA/A1apd2OrNKNGGjHvAXjB7VJvNySpa1cDJy9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pSlXeXqzdCEU1EycO5OdIeYWbtwnFo5VqfxEU6epyIFP0I35py+WpwqFMP3wsrF0H uOV9bNMpGk1nPessCqB7OHBRW7jg9Y9/ANpdl5lWLS+oMxWYHGYsMlcrjMfCiydpB4 9Dv6/yRvZYodjklISwA/poCGX3il37eX1WG1aEl8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730590AbgDKXSJ (ORCPT ); Sat, 11 Apr 2020 19:18:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:55954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730320AbgDKXOS (ORCPT ); Sat, 11 Apr 2020 19:14:18 -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 EBC7C20757; Sat, 11 Apr 2020 23:14:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586646858; bh=tL5KqA/A1apd2OrNKNGGjHvAXjB7VJvNySpa1cDJy9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ToFKF6Mfawtl5THdJOI+nV7pqAu0035gtrQNqE3GQOUXJ2dz4K9uwhTidgel79rl6 LjPerQ3afWp2882oUdvMTOQ3VF6/JH2ybJnrHYlN5A/TbqreYI2w2jMmRa855KYTcB MEYGKxWwOtVripC/gN5R3Qt4UuiUKW2x4ztUKGSQ= 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.9 04/26] net: phy: mscc: accept all RGMII species in vsc85xx_mac_if_set Date: Sat, 11 Apr 2020 19:13:51 -0400 Message-Id: <20200411231413.26911-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200411231413.26911-1-sashal@kernel.org> References: <20200411231413.26911-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 77a6671d572e3..2c4de7f87c3fd 100644 --- a/drivers/net/phy/mscc.c +++ b/drivers/net/phy/mscc.c @@ -260,6 +260,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