diff options
Diffstat (limited to 'arch/ppc/8xx_io/enet.c')
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index c6d047ae77ac..5899aea1644b 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
@@ -946,29 +946,6 @@ static int __init scc_enet_init(void) | |||
946 | *((volatile uint *)BCSR1) &= ~BCSR1_ETHEN; | 946 | *((volatile uint *)BCSR1) &= ~BCSR1_ETHEN; |
947 | #endif | 947 | #endif |
948 | 948 | ||
949 | #ifdef CONFIG_MPC885ADS | ||
950 | |||
951 | /* Deassert PHY reset and enable the PHY. | ||
952 | */ | ||
953 | { | ||
954 | volatile uint __iomem *bcsr = ioremap(BCSR_ADDR, BCSR_SIZE); | ||
955 | uint tmp; | ||
956 | |||
957 | tmp = in_be32(bcsr + 1 /* BCSR1 */); | ||
958 | tmp |= BCSR1_ETHEN; | ||
959 | out_be32(bcsr + 1, tmp); | ||
960 | tmp = in_be32(bcsr + 4 /* BCSR4 */); | ||
961 | tmp |= BCSR4_ETH10_RST; | ||
962 | out_be32(bcsr + 4, tmp); | ||
963 | iounmap(bcsr); | ||
964 | } | ||
965 | |||
966 | /* On MPC885ADS SCC ethernet PHY defaults to the full duplex mode | ||
967 | * upon reset. SCC is set to half duplex by default. So this | ||
968 | * inconsistency should be better fixed by the software. | ||
969 | */ | ||
970 | #endif | ||
971 | |||
972 | dev->base_addr = (unsigned long)ep; | 949 | dev->base_addr = (unsigned long)ep; |
973 | #if 0 | 950 | #if 0 |
974 | dev->name = "CPM_ENET"; | 951 | dev->name = "CPM_ENET"; |