aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-09-03 00:56:57 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 18:06:53 -0400
commitc3d6f1f24cf3fdfdad3bff631349dc2aef06c8df (patch)
treeaf58a41345f99a23137b1d0d868787d03b483c99
parent6614a6dc6ebba4d3ca0ba5ea023b61a7d22ab00b (diff)
downloadkernel_samsung_smdk4412-c3d6f1f24cf3fdfdad3bff631349dc2aef06c8df.zip
kernel_samsung_smdk4412-c3d6f1f24cf3fdfdad3bff631349dc2aef06c8df.tar.gz
kernel_samsung_smdk4412-c3d6f1f24cf3fdfdad3bff631349dc2aef06c8df.tar.bz2
[PATCH] sis190: RGMII Tx internal delay fiddling
Don't ask. The patch is based on SiS's GPLed driver. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/sis190.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 2f69ba8..61a24a9 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -273,7 +273,8 @@ enum sis190_eeprom_address {
enum sis190_feature {
F_HAS_RGMII = 1,
- F_PHY_88E1111 = 2
+ F_PHY_88E1111 = 2,
+ F_PHY_BCM5461 = 4
};
struct sis190_private {
@@ -321,7 +322,7 @@ static struct mii_chip_info {
unsigned int type;
u32 feature;
} mii_chip_table[] = {
- { "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, 0 },
+ { "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, F_PHY_BCM5461 },
{ "Agere PHY ET1101B", { 0x0282, 0xf010 }, LAN, 0 },
{ "Marvell PHY 88E1111", { 0x0141, 0x0cc0 }, LAN, F_PHY_88E1111 },
{ "Realtek PHY RTL8201", { 0x0000, 0x8200 }, LAN, 0 },
@@ -960,8 +961,22 @@ static void sis190_phy_task(void * data)
p->ctl |= SIS_R32(StationControl) & ~0x0f001c00;
+ if ((tp->features & F_HAS_RGMII) &&
+ (tp->features & F_PHY_BCM5461)) {
+ // Set Tx Delay in RGMII mode.
+ mdio_write(ioaddr, phy_id, 0x18, 0xf1c7);
+ udelay(200);
+ mdio_write(ioaddr, phy_id, 0x1c, 0x8c00);
+ p->ctl |= 0x03000000;
+ }
+
SIS_W32(StationControl, p->ctl);
+ if (tp->features & F_HAS_RGMII) {
+ SIS_W32(RGDelay, 0x0441);
+ SIS_W32(RGDelay, 0x0440);
+ }
+
net_link(tp, KERN_INFO "%s: link on %s mode.\n", dev->name,
p->msg);
netif_carrier_on(dev);