forked from Openwrt/openwrt
5ca632e016
Patches 400,701,702 were taken from 6.12 nxp tree. Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> Link: https://github.com/openwrt/openwrt/pull/19152 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From 5677c6ef5f4096f3149a4e8cfd1438bc9eb2e8a4 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] 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>
|
|
---
|
|
Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 +
|
|
drivers/net/phy/phy-core.c | 1 +
|
|
drivers/net/phy/phylink.c | 2 ++
|
|
include/linux/phy.h | 3 +++
|
|
4 files changed, 7 insertions(+)
|
|
|
|
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
|
|
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
|
|
@@ -65,6 +65,7 @@ properties:
|
|
- mii
|
|
- gmii
|
|
- sgmii
|
|
+ - sgmii-2500
|
|
- psgmii
|
|
- qsgmii
|
|
- qusgmii
|
|
--- a/drivers/net/phy/phy-core.c
|
|
+++ b/drivers/net/phy/phy-core.c
|
|
@@ -138,6 +138,7 @@ int phy_interface_num_ports(phy_interfac
|
|
case PHY_INTERFACE_MODE_RXAUI:
|
|
case PHY_INTERFACE_MODE_XAUI:
|
|
case PHY_INTERFACE_MODE_1000BASEKX:
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
return 1;
|
|
case PHY_INTERFACE_MODE_QSGMII:
|
|
case PHY_INTERFACE_MODE_QUSGMII:
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -230,6 +230,7 @@ static int phylink_interface_max_speed(p
|
|
case PHY_INTERFACE_MODE_GMII:
|
|
return SPEED_1000;
|
|
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
case PHY_INTERFACE_MODE_2500BASEX:
|
|
case PHY_INTERFACE_MODE_10G_QXGMII:
|
|
return SPEED_2500;
|
|
@@ -544,6 +545,7 @@ static unsigned long phylink_get_capabil
|
|
break;
|
|
|
|
case PHY_INTERFACE_MODE_2500BASEX:
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
caps |= MAC_2500FD;
|
|
break;
|
|
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -170,6 +170,7 @@ typedef enum {
|
|
PHY_INTERFACE_MODE_QUSGMII,
|
|
PHY_INTERFACE_MODE_1000BASEKX,
|
|
PHY_INTERFACE_MODE_10G_QXGMII,
|
|
+ PHY_INTERFACE_MODE_2500SGMII,
|
|
PHY_INTERFACE_MODE_MAX,
|
|
} phy_interface_t;
|
|
|
|
@@ -235,6 +236,8 @@ static inline const char *phy_modes(phy_
|
|
return "gmii";
|
|
case PHY_INTERFACE_MODE_SGMII:
|
|
return "sgmii";
|
|
+ case PHY_INTERFACE_MODE_2500SGMII:
|
|
+ return "sgmii-2500";
|
|
case PHY_INTERFACE_MODE_TBI:
|
|
return "tbi";
|
|
case PHY_INTERFACE_MODE_REVMII:
|