diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-31 20:09:20 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-31 20:12:55 -0500 |
commit | 7fb76aa07facce5cb9c8d26a0de09001a31eed0c (patch) | |
tree | 0f5077e2da5cfe608b5394c1ba973b04879e5ce4 /arch | |
parent | 3fa97c9db4f6f93f41f7a40d08872dbfd8dc907e (diff) |
[SUNGEM]: Unbreak Sun GEM chips.
Revert: 40727198bfb2ce5842a6e8c7f89cf8a40ff7bf14
These PHY changes hang the sungem driver on startup with Sun chips on
sparc64. Hopefully we can redo these changes in a way that doesn't
break non-Apple systems.
Signed-off-by: David S. Miller <davem@davemloft.net>
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 | } |