aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/spider_net.c
diff options
context:
space:
mode:
authorJens Osterkamp <Jens.Osterkamp@de.ibm.com>2006-05-04 05:59:41 -0400
committerStephen Hemminger <shemminger@osdl.org>2006-05-08 16:01:12 -0700
commit8ec93459655a3618dedec6360bb28d63f0010ef6 (patch)
tree48a3599fd2701a507bdc9e3308c970b28cb99086 /drivers/net/spider_net.c
parentb636d17a3bee8ba988e78e4bc8262f0dc3fad8ab (diff)
downloadkernel_samsung_smdk4412-8ec93459655a3618dedec6360bb28d63f0010ef6.tar.gz
kernel_samsung_smdk4412-8ec93459655a3618dedec6360bb28d63f0010ef6.tar.bz2
kernel_samsung_smdk4412-8ec93459655a3618dedec6360bb28d63f0010ef6.zip
spidernet: enable support for bcm5461 ethernet phy
A newer board revision changed the type of ethernet phy. Moreover, this generalizes the way that a phy gets switched into fiber mode when autodetection is not available. Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Diffstat (limited to 'drivers/net/spider_net.c')
-rw-r--r--drivers/net/spider_net.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index b36838bfb8d..394339d5e87 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1794,15 +1794,7 @@ spider_net_setup_phy(struct spider_net_card *card)
if (phy->def->ops->setup_forced)
phy->def->ops->setup_forced(phy, SPEED_1000, DUPLEX_FULL);
- /* the following two writes could be moved to sungem_phy.c */
- /* enable fiber mode */
- spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x9020);
- /* LEDs active in both modes, autosense prio = fiber */
- spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0x945f);
-
- /* switch off fibre autoneg */
- spider_net_write_phy(card->netdev, 1, MII_NCONFIG, 0xfc01);
- spider_net_write_phy(card->netdev, 1, 0x0b, 0x0004);
+ phy->def->ops->enable_fiber(phy);
phy->def->ops->read_link(phy);
pr_info("Found %s with %i Mbps, %s-duplex.\n", phy->def->name,