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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C16BC7618A for ; Sun, 19 Mar 2023 17:13:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BEE9585D21; Sun, 19 Mar 2023 18:10:40 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=mailbox.org header.i=@mailbox.org header.b="PRNJP34J"; dkim=pass (2048-bit key) header.d=mailbox.org header.i=@mailbox.org header.b="lQF7dzGk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E07D8545E; Sun, 19 Mar 2023 18:07:49 +0100 (CET) Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050:0:465::101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F364A85D08 for ; Sun, 19 Mar 2023 18:07:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=mailbox.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut+renesas@mailbox.org Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Pfkn54s6Nz9sTn; Sun, 19 Mar 2023 18:07:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8j9WeXU+cu87X0igt8H72MuQuuEoArrEGuu92tJig0w=; b=PRNJP34Jt3zQpxgiM9Y9MwN+HvcM6kdkXn5ilbxJYOw/yWSLmNodNx4gtS4a0RYLcjCDqq QJn6cNqVThxc2cTnsn8zEe4p4du3U26rsc5eXrzwvnOMM/Ip4ziK0FQSWujgwM2F8aEu1q wqgr1oYmoRYqOzM94bx4M1lsnQn82Byv5zndviAqxWCldUhCedYo/KvrXpsPMasImFjlDH dGAkSbqsfw+mRYTJmacSrZvBCBce79+fDQABlb5P23lGhkWg0e5kAJDrGDQyzppwPdvcUP Tz8a3aQke9AxXFdMLCG/NoEq7rdvqw7PnSwG1sJ+ZkId4OGtVquISxCGhPpljQ== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1679245623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8j9WeXU+cu87X0igt8H72MuQuuEoArrEGuu92tJig0w=; b=lQF7dzGkj9xrfoSGdiAfkGDKrmDT8J/GZLQ9EtrbeqJ4SqoJVy/QdPALeCA5La+tRZ1cpi vgj1ZfEd6ZHYUHaJwaFw6v3eyAtpaty7M9mgcfekqVfUiityQiQYwheUhcV+coWZqxlep/ MEBaNiUC5oMFfSQ92qpRqrLRBw9Dm48DHfbAA4oDNsprmA6TOL8jxnvjZXkM7B4XHmlDpg 2D+HfZm+yxLwgNN2iU3Dge/jubCMI7w+XiSDSmeRMHcdSessNSmddSSLzF2+WUSA1r/vAK s+/TdTFO00o4MxGwsOmq4jUeLGaIkLgGNdxArXht0Cu1gu0g3LcfEd4SXvkRNQ== To: u-boot@lists.denx.de Cc: Marek Vasut , "Ariel D'Alessandro" , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Joe Hershberger , Ramon Fried , Stefan Roese , Tim Harvey , Vladimir Oltean Subject: [PATCH 2/3] net: mvpp2: Replace PHY_INTERFACE_MODE_SFI with 5GBASER/10GBASER/XAUI Date: Sun, 19 Mar 2023 18:06:46 +0100 Message-Id: <20230319170647.28149-2-marek.vasut+renesas@mailbox.org> In-Reply-To: <20230319170647.28149-1-marek.vasut+renesas@mailbox.org> References: <20230319170647.28149-1-marek.vasut+renesas@mailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: ca8ad40e31a2eacb435 X-MBO-RS-META: yowwxqmzar9tgu4e8nwkgm3qm9oniygn X-Rspamd-Queue-Id: 4Pfkn54s6Nz9sTn X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Replace PHY_INTERFACE_MODE_SFI with PHY_INTERFACE_MODE_5GBASER, PHY_INTERFACE_MODE_10GBASER and PHY_INTERFACE_MODE_XAUI to match Linux PHY interface modes. Signed-off-by: Marek Vasut --- Cc: "Ariel D'Alessandro" Cc: "Marek Behún" Cc: Joe Hershberger Cc: Marek Vasut Cc: Ramon Fried Cc: Stefan Roese Cc: Tim Harvey Cc: Vladimir Oltean --- drivers/net/mvpp2.c | 8 ++++++-- include/phy_interface.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 71347b7e69c..096b8a35853 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -3438,7 +3438,9 @@ static int gop_port_init(struct mvpp2_port *port) gop_gmac_reset(port, 0); break; - case PHY_INTERFACE_MODE_SFI: + case PHY_INTERFACE_MODE_10GBASER: + case PHY_INTERFACE_MODE_5GBASER: + case PHY_INTERFACE_MODE_XAUI: num_of_act_lanes = 2; mac_num = 0; /* configure PCS */ @@ -3489,7 +3491,9 @@ static void gop_port_enable(struct mvpp2_port *port, int enable) mvpp2_port_disable(port); break; - case PHY_INTERFACE_MODE_SFI: + case PHY_INTERFACE_MODE_10GBASER: + case PHY_INTERFACE_MODE_5GBASER: + case PHY_INTERFACE_MODE_XAUI: gop_xlg_mac_port_enable(port, enable); break; diff --git a/include/phy_interface.h b/include/phy_interface.h index fed3357b9a2..52af7e612b6 100644 --- a/include/phy_interface.h +++ b/include/phy_interface.h @@ -31,6 +31,7 @@ typedef enum { PHY_INTERFACE_MODE_XGMII, PHY_INTERFACE_MODE_XAUI, PHY_INTERFACE_MODE_RXAUI, + PHY_INTERFACE_MODE_5GBASER, PHY_INTERFACE_MODE_SFI, PHY_INTERFACE_MODE_INTERNAL, PHY_INTERFACE_MODE_25G_AUI, @@ -62,6 +63,7 @@ static const char * const phy_interface_strings[] = { [PHY_INTERFACE_MODE_XGMII] = "xgmii", [PHY_INTERFACE_MODE_XAUI] = "xaui", [PHY_INTERFACE_MODE_RXAUI] = "rxaui", + [PHY_INTERFACE_MODE_5GBASER] = "5gbase-r", [PHY_INTERFACE_MODE_SFI] = "sfi", [PHY_INTERFACE_MODE_INTERNAL] = "internal", [PHY_INTERFACE_MODE_25G_AUI] = "25g-aui", -- 2.39.2