diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:21:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 10:21:13 -0800 |
| commit | 7fcdf327bedfe9cc418af49429d0fc0e48d98de9 (patch) | |
| tree | 4dd9ab338b1641318b1251cc0522c22f14137e4b /arch | |
| parent | f7dd16bf3a2e7e29670051a2488d4be1895e408d (diff) | |
| parent | 2c74088e4104a2a82bd773f79ae0344c22eceb8c (diff) | |
| download | linux-3.10-7fcdf327bedfe9cc418af49429d0fc0e48d98de9.tar.gz linux-3.10-7fcdf327bedfe9cc418af49429d0fc0e48d98de9.tar.bz2 linux-3.10-7fcdf327bedfe9cc418af49429d0fc0e48d98de9.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/powermac/feature.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index 558dd069209..2296f3d46ca 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c @@ -910,16 +910,18 @@ core99_gmac_phy_reset(struct device_node *node, long param, long value) macio->type != macio_intrepid) return -ENODEV; + printk(KERN_DEBUG "Hard reset of PHY chip ...\n"); + LOCK(flags); MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE); (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET); UNLOCK(flags); - mdelay(10); + msleep(10); LOCK(flags); MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */ KEYLARGO_GPIO_OUTOUT_DATA); UNLOCK(flags); - mdelay(10); + msleep(10); return 0; } |