diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 18:40:23 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 18:40:23 +1100 |
| commit | 072ef40e08a71aae4ff2835e3c7f601b29daf227 (patch) | |
| tree | 00ec938af2b940b2ca605a14ce1695890540397c /arch/powerpc/platforms/83xx/mpc832x_mds.c | |
| parent | 2b46b5673ca67d23302c2afac045def988a3cade (diff) | |
| parent | bebfa06c61da6246d4aab38efa06a460eb3db4ed (diff) | |
| download | talos-op-linux-072ef40e08a71aae4ff2835e3c7f601b29daf227.tar.gz talos-op-linux-072ef40e08a71aae4ff2835e3c7f601b29daf227.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc832x_mds.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_mds.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 972fa8528a8c..9e3bfcca1cea 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -90,10 +90,11 @@ static void __init mpc832x_sys_setup_arch(void) if ((np = of_find_compatible_node(NULL, "network", "ucc_geth")) != NULL){ - /* Reset the Ethernet PHY */ - bcsr_regs[9] &= ~0x20; + /* Reset the Ethernet PHYs */ +#define BCSR8_FETH_RST 0x50 + bcsr_regs[8] &= ~BCSR8_FETH_RST; udelay(1000); - bcsr_regs[9] |= 0x20; + bcsr_regs[8] |= BCSR8_FETH_RST; iounmap(bcsr_regs); of_node_put(np); } |
