diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 22:24:43 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 22:24:43 -0500 |
commit | e1762ec6d72b71c4476018af3c153cd362a5e94e (patch) | |
tree | 6814cb9ee9dee93e5734be92cd1d6775c335ba48 /arch | |
parent | ef59c4e935feb966900a8321e75f74d7df2a2f16 (diff) | |
parent | 0cbd782507c502428c8ab3e91bee3940c19ac4d4 (diff) |
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, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index 2296f3d46ca..558dd069209 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c | |||
@@ -910,18 +910,16 @@ core99_gmac_phy_reset(struct device_node *node, long param, long value) | |||
910 | macio->type != macio_intrepid) | 910 | macio->type != macio_intrepid) |
911 | return -ENODEV; | 911 | return -ENODEV; |
912 | 912 | ||
913 | printk(KERN_DEBUG "Hard reset of PHY chip ...\n"); | ||
914 | |||
915 | LOCK(flags); | 913 | LOCK(flags); |
916 | MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE); | 914 | MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, KEYLARGO_GPIO_OUTPUT_ENABLE); |
917 | (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET); | 915 | (void)MACIO_IN8(KL_GPIO_ETH_PHY_RESET); |
918 | UNLOCK(flags); | 916 | UNLOCK(flags); |
919 | msleep(10); | 917 | mdelay(10); |
920 | LOCK(flags); | 918 | LOCK(flags); |
921 | MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */ | 919 | MACIO_OUT8(KL_GPIO_ETH_PHY_RESET, /*KEYLARGO_GPIO_OUTPUT_ENABLE | */ |
922 | KEYLARGO_GPIO_OUTOUT_DATA); | 920 | KEYLARGO_GPIO_OUTOUT_DATA); |
923 | UNLOCK(flags); | 921 | UNLOCK(flags); |
924 | msleep(10); | 922 | mdelay(10); |
925 | 923 | ||
926 | return 0; | 924 | return 0; |
927 | } | 925 | } |