mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
f631c7bbb1
Import commits from upstream Linux replacing some downstream patches.
Move accepted patches from pending-{5.15,6.1} to backport-{5.15,6.1}.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
54 lines
1.5 KiB
Diff
54 lines
1.5 KiB
Diff
From c918c472546afa83a619ae3cb1a9d7d346c6e288 Mon Sep 17 00:00:00 2001
|
|
From: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
|
|
Date: Wed, 29 Nov 2017 15:27:57 +0530
|
|
Subject: [PATCH 154/173] phy: Add 2.5G SGMII interface mode
|
|
|
|
Add 2.5G SGMII interface mode(PHY_INTERFACE_MODE_2500SGMII)
|
|
in existing phy_interface list
|
|
|
|
Signed-off-by: Bhaskar Upadhaya <Bhaskar.Upadhaya@nxp.com>
|
|
---
|
|
include/linux/phy.h | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -398,6 +398,7 @@ void phylink_get_linkmodes(unsigned long
|
|
caps |= MAC_1000FD;
|
|
break;
|
|
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
case PHY_INTERFACE_MODE_2500BASEX:
|
|
caps |= MAC_2500FD;
|
|
break;
|
|
@@ -651,6 +652,10 @@ static int phylink_parse_mode(struct phy
|
|
phylink_set(pl->supported, 2500baseX_Full);
|
|
break;
|
|
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
+ phylink_set(pl->supported, 2500baseT_Full);
|
|
+ break;
|
|
+
|
|
case PHY_INTERFACE_MODE_5GBASER:
|
|
phylink_set(pl->supported, 5000baseT_Full);
|
|
break;
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -153,6 +153,7 @@ typedef enum {
|
|
PHY_INTERFACE_MODE_USXGMII,
|
|
/* 10GBASE-KR - with Clause 73 AN */
|
|
PHY_INTERFACE_MODE_10GKR,
|
|
+ PHY_INTERFACE_MODE_2500SGMII,
|
|
PHY_INTERFACE_MODE_MAX,
|
|
} phy_interface_t;
|
|
|
|
@@ -268,6 +269,8 @@ static inline const char *phy_modes(phy_
|
|
return "10gbase-kr";
|
|
case PHY_INTERFACE_MODE_100BASEX:
|
|
return "100base-x";
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
+ return "sgmii-2500";
|
|
default:
|
|
return "unknown";
|
|
}
|