From a00fad21a3b907d1032611b3df9df321cea6c7e5 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 5 Dec 2007 11:14:26 +1100 Subject: [PATCH] --- yaml --- r: 74726 b: refs/heads/master c: 8df4538e21f7313a29fa6c5af78c08a135d44738 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/phy.c | 37 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 20c795792a58..e3000086abde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1f304f2e8fbc6ca80d5ef90132bd0772048f0ef +refs/heads/master: 8df4538e21f7313a29fa6c5af78c08a135d44738 diff --git a/trunk/drivers/net/ibm_newemac/phy.c b/trunk/drivers/net/ibm_newemac/phy.c index a5e89c55abd5..9308fad76d57 100644 --- a/trunk/drivers/net/ibm_newemac/phy.c +++ b/trunk/drivers/net/ibm_newemac/phy.c @@ -327,6 +327,42 @@ static int m88e1111_init(struct mii_phy *phy) return 0; } +static int et1011c_init(struct mii_phy *phy) +{ + u16 reg_short; + + reg_short = (u16)(phy_read(phy, 0x16)); + reg_short &= ~(0x7); + reg_short |= 0x6; /* RGMII Trace Delay*/ + phy_write(phy, 0x16, reg_short); + + reg_short = (u16)(phy_read(phy, 0x17)); + reg_short &= ~(0x40); + phy_write(phy, 0x17, reg_short); + + phy_write(phy, 0x1c, 0x74f0); + return 0; +} + +static struct mii_phy_ops et1011c_phy_ops = { + .init = et1011c_init, + .setup_aneg = genmii_setup_aneg, + .setup_forced = genmii_setup_forced, + .poll_link = genmii_poll_link, + .read_link = genmii_read_link +}; + +static struct mii_phy_def et1011c_phy_def = { + .phy_id = 0x0282f000, + .phy_id_mask = 0x0fffff00, + .name = "ET1011C Gigabit Ethernet", + .ops = &et1011c_phy_ops +}; + + + + + static struct mii_phy_ops m88e1111_phy_ops = { .init = m88e1111_init, .setup_aneg = genmii_setup_aneg, @@ -344,6 +380,7 @@ static struct mii_phy_def m88e1111_phy_def = { }; static struct mii_phy_def *mii_phy_table[] = { + &et1011c_phy_def, &cis8201_phy_def, &bcm5248_phy_def, &m88e1111_phy_def,