diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-24 15:12:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-24 15:12:11 -0800 |
| commit | 59bc954c7a2572e1c903012ab722eba942a5d65c (patch) | |
| tree | 30804d58bd0dacaf75c2abfe2008fcfb46976585 /drivers/net | |
| parent | c102b6fddcab89cc6a17c43f8b731e2c9f29b88a (diff) | |
| parent | 37b558f6cda6c8cf8045c419e8ed38d2de551016 (diff) | |
Merge branch 'Remainder-for-DT-bindings-for-Felix-DSA-switch-on-LS1028A'
Vladimir Oltean says:
====================
Remainder for "DT bindings for Felix DSA switch on LS1028A"
This series is the remainder of patchset [0] which has been merged
through Shawn Guo's devicetree tree.
It contains changes to the PHY mode validation in the Felix driver
("gmii" to "internal") and the documentation for the DT bindings.
[0]: https://patchwork.ozlabs.org/cover/1242716/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dsa/ocelot/felix.c | 3 | ||||
| -rw-r--r-- | drivers/net/dsa/ocelot/felix_vsc9959.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 3257962..35124ef 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -176,8 +176,7 @@ static void felix_phylink_validate(struct dsa_switch *ds, int port, phylink_set(mask, 100baseT_Full); phylink_set(mask, 1000baseT_Full); - /* The internal ports that run at 2.5G are overclocked GMII */ - if (state->interface == PHY_INTERFACE_MODE_GMII || + if (state->interface == PHY_INTERFACE_MODE_INTERNAL || state->interface == PHY_INTERFACE_MODE_2500BASEX || state->interface == PHY_INTERFACE_MODE_USXGMII) { phylink_set(mask, 2500baseT_Full); diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c index 2c812b4..93800e8 100644 --- a/drivers/net/dsa/ocelot/felix_vsc9959.c +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c @@ -955,8 +955,7 @@ static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port, phy_interface_t phy_mode) { switch (phy_mode) { - case PHY_INTERFACE_MODE_GMII: - /* Only supported on internal to-CPU ports */ + case PHY_INTERFACE_MODE_INTERNAL: if (port != 4 && port != 5) return -ENOTSUPP; return 0; |