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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 4838BC47253 for ; Fri, 1 May 2020 13:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23F6B2051A for ; Fri, 1 May 2020 13:50:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588341020; bh=gQAWuW39xI8mn+xgNei4VJx/ZoOFJOfZegmSKlqk98g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ITfYoXFsh+ZTt2JS2jO62gajBNMZkZQlLUmR/j1QnuZoaJhEQVGT13MIE+cQ+gKMo cg+V7kwmd53tGbvKe3o0vGIOA0ErlDS580qNe7LC9cAbzrpHUR6yKz9yFJx+LXu/63 xhrejVDOAyr0LZz044pXNilN85nlGjh2hgrD2ikI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728724AbgEANuP (ORCPT ); Fri, 1 May 2020 09:50:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:40222 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731255AbgEANkN (ORCPT ); Fri, 1 May 2020 09:40:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 98CF5208DB; Fri, 1 May 2020 13:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588340413; bh=gQAWuW39xI8mn+xgNei4VJx/ZoOFJOfZegmSKlqk98g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PUBjGKeC34zieqpt/zhuDtTIvGKNzjeLknD0670Ofpa8Lxy4PLIuZVk81BWKY8omE gUkIz6ZO7ytrzvGYlaUSnFSaSFvrKnhJ12KkocT4xjbunCOO+qqCgb+n2TwxM7OQ66 xaBGFT4ehx9ulnLA9aiuzUlVChmO3Hq82sPvfu2k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atsushi Nemoto , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 68/83] net: stmmac: socfpga: Allow all RGMII modes Date: Fri, 1 May 2020 15:23:47 +0200 Message-Id: <20200501131541.183432435@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131524.004332640@linuxfoundation.org> References: <20200501131524.004332640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Atsushi Nemoto [ Upstream commit a7a0d6269652846671312b29992143f56e2866b8 ] Allow all the RGMII modes to be used. (Not only "rgmii", "rgmii-id" but "rgmii-txid", "rgmii-rxid") Signed-off-by: Atsushi Nemoto Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c index e0212d2fc2a12..fa32cd5b418ef 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c @@ -241,6 +241,8 @@ static int socfpga_set_phy_mode_common(int phymode, u32 *val) switch (phymode) { case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: *val = SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII; break; case PHY_INTERFACE_MODE_MII: -- 2.20.1