diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-16 19:37:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-04-16 19:37:21 +1000 |
| commit | 2618991940c44d234a4c61366e83a34f908e9660 (patch) | |
| tree | ad4afe4bfc1e9eb2fbd12f6f0214dd14124ce851 | |
| parent | 7533b08c5667f3564a380fa53438f29906cd9a51 (diff) | |
Revert "[POWERPC] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround"
This reverts commit 4b2d72f5035764cd2e89f5a13ab35c11a27c557b.
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 16 | ||||
| -rw-r--r-- | drivers/net/ibm_newemac/core.h | 8 |
2 files changed, 3 insertions, 21 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index f314731ac62c..378a23963495 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -43,8 +43,6 @@ #include <asm/io.h> #include <asm/dma.h> #include <asm/uaccess.h> -#include <asm/dcr.h> -#include <asm/dcr-regs.h> #include "core.h" @@ -2332,10 +2330,6 @@ static int __devinit emac_init_phy(struct emac_instance *dev) dev->phy.mdio_read = emac_mdio_read; dev->phy.mdio_write = emac_mdio_write; - /* Enable internal clock source */ - if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX)) - dcri_clrset(SDR0, SDR0_MFR, 0, SDR0_MFR_ECS); - /* Configure EMAC with defaults so we can at least use MDIO * This is needed mostly for 440GX */ @@ -2368,11 +2362,6 @@ static int __devinit emac_init_phy(struct emac_instance *dev) if (!emac_mii_phy_probe(&dev->phy, i)) break; } - - /* Enable external clock source */ - if (emac_has_feature(dev, EMAC_FTR_440GX_PHY_CLK_FIX)) - dcri_clrset(SDR0, SDR0_MFR, SDR0_MFR_ECS, 0); - mutex_unlock(&emac_phy_map_lock); if (i == 0x20) { printk(KERN_WARNING "%s: can't find PHY!\n", np->full_name); @@ -2498,11 +2487,8 @@ static int __devinit emac_init_config(struct emac_instance *dev) } /* Check EMAC version */ - if (of_device_is_compatible(np, "ibm,emac4")) { + if (of_device_is_compatible(np, "ibm,emac4")) dev->features |= EMAC_FTR_EMAC4; - if (of_device_is_compatible(np, "ibm,emac-440gx")) - dev->features |= EMAC_FTR_440GX_PHY_CLK_FIX; - } /* Fixup some feature bits based on the device tree */ if (of_get_property(np, "has-inverted-stacr-oc", NULL)) diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h index 96ec48266b4a..4e74d8287c65 100644 --- a/drivers/net/ibm_newemac/core.h +++ b/drivers/net/ibm_newemac/core.h @@ -301,10 +301,6 @@ struct emac_instance { * Set if we have new type STACR with STAOPC */ #define EMAC_FTR_HAS_NEW_STACR 0x00000040 -/* - * Set if we need phy clock workaround for 440gx - */ -#define EMAC_FTR_440GX_PHY_CLK_FIX 0x00000080 /* Right now, we don't quite handle the always/possible masks on the @@ -316,8 +312,8 @@ enum { EMAC_FTRS_POSSIBLE = #ifdef CONFIG_IBM_NEW_EMAC_EMAC4 - EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR | - EMAC_FTR_STACR_OC_INVERT | EMAC_FTR_440GX_PHY_CLK_FIX | + EMAC_FTR_EMAC4 | EMAC_FTR_HAS_NEW_STACR | + EMAC_FTR_STACR_OC_INVERT | #endif #ifdef CONFIG_IBM_NEW_EMAC_TAH EMAC_FTR_HAS_TAH | |