From: Francois Romieu <romieu@fr.zoreil.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, pascal.chapperon@wanadoo.fr,
lars.vahlenberg@mandator.com,
Alexey Dobriyan <adobriyan@gmail.com>,
apatard@mandriva.com, jgarzik@pobox.com, akpm@osdl.org
Subject: [patch 2.6.13-git3 4/5] sis190: RGMII Tx internal delay fiddling
Date: Sat, 3 Sep 2005 00:56:57 +0200 [thread overview]
Message-ID: <20050902225657.GE25687@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <20050902225224.GA25687@electric-eye.fr.zoreil.com>
Don't ask.
The patch is based on SiS's GPLed driver.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
diff -puN a/drivers/net/sis190.c~sis190-200 b/drivers/net/sis190.c
--- a/drivers/net/sis190.c~sis190-200 2005-09-02 23:27:58.126761637 +0200
+++ b/drivers/net/sis190.c 2005-09-02 23:27:58.130760990 +0200
@@ -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);
_
next prev parent reply other threads:[~2005-09-02 22:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050902225224.GA25687@electric-eye.fr.zoreil.com>
2005-09-02 22:54 ` [patch 2.6.13-git3 1/5] sis190: unmask the link change events Francois Romieu
2005-09-02 22:55 ` [patch 2.6.13-git3 2/5] sis190: recent chipsets from SiS include a RGMII Francois Romieu
2005-09-02 22:56 ` [patch 2.6.13-git3 3/5] sis190: make 10Mbps the default when handling the StationControl register Francois Romieu
2005-09-02 22:56 ` Francois Romieu [this message]
2005-09-02 22:57 ` [patch 2.6.13-git3 5/5] sis190: basic sis191 support Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050902225657.GE25687@electric-eye.fr.zoreil.com \
--to=romieu@fr.zoreil.com \
--cc=adobriyan@gmail.com \
--cc=akpm@osdl.org \
--cc=apatard@mandriva.com \
--cc=jgarzik@pobox.com \
--cc=lars.vahlenberg@mandator.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pascal.chapperon@wanadoo.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox