leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: sja1105: Update some comments about PHYLIB

Browse Source 
Since the driver is now using PHYLINK exclusively, it makes sense to
remove all references to it and replace them with PHYLINK.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2019-06-08 16:03:42 +03:00 committed by David S. Miller
parent c44d05358e
commit 1fd4a173f0
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/dsa/sja1105/Kconfig
View File

@ -9,7 +9,7 @@ tristate "NXP SJA1105 Ethernet switch family support"
This is the driver for the NXP SJA1105 automotive Ethernet switch This is the driver for the NXP SJA1105 automotive Ethernet switch
family. These are 5-port devices and are managed over an SPI family. These are 5-port devices and are managed over an SPI
interface. Probing is handled based on OF bindings and so is the interface. Probing is handled based on OF bindings and so is the
linkage to phylib. The driver supports the following revisions: linkage to PHYLINK. The driver supports the following revisions:
- SJA1105E (Gen. 1, No TT-Ethernet) - SJA1105E (Gen. 1, No TT-Ethernet)
- SJA1105T (Gen. 1, TT-Ethernet) - SJA1105T (Gen. 1, TT-Ethernet)
- SJA1105P (Gen. 2, No SGMII, No TT-Ethernet) - SJA1105P (Gen. 2, No SGMII, No TT-Ethernet)

6
drivers/net/dsa/sja1105/sja1105_main.c
View File

@ -70,8 +70,7 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)
/* Keep standard IFG of 12 bytes on egress. */ /* Keep standard IFG of 12 bytes on egress. */
.ifg = 0, .ifg = 0,
/* Always put the MAC speed in automatic mode, where it can be /* Always put the MAC speed in automatic mode, where it can be
* retrieved from the PHY object through phylib and * adjusted at runtime by PHYLINK.
* sja1105_adjust_port_config.
*/ */
.speed = SJA1105_SPEED_AUTO, .speed = SJA1105_SPEED_AUTO,
/* No static correction for 1-step 1588 events */ /* No static correction for 1-step 1588 events */
@ -116,7 +115,6 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)
if (!table->entries) if (!table->entries)
return -ENOMEM; return -ENOMEM;
/* Override table based on phylib DT bindings */
table->entry_count = SJA1105_NUM_PORTS; table->entry_count = SJA1105_NUM_PORTS;
mac = table->entries; mac = table->entries;
@ -157,7 +155,7 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv,
if (!table->entries) if (!table->entries)
return -ENOMEM; return -ENOMEM;
/* Override table based on phylib DT bindings */ /* Override table based on PHYLINK DT bindings */
table->entry_count = SJA1105_MAX_XMII_PARAMS_COUNT; table->entry_count = SJA1105_MAX_XMII_PARAMS_COUNT;
mii = table->entries; mii = table->entries;