diff options
author | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
commit | 786d3693f46579c7cd982e65de9f43eba94e4a57 (patch) | |
tree | e794415702e30899fd7181072e8753bb8068cce2 /arch/powerpc/boot/dts/walnut.dts | |
parent | [POWERPC] Add Vitaly Bordug as PPC8xx maintainer (diff) | |
parent | [POWERPC] 4xx: Enable EMAC on Bamboo board (diff) | |
download | linux-dev-786d3693f46579c7cd982e65de9f43eba94e4a57.tar.xz linux-dev-786d3693f46579c7cd982e65de9f43eba94e4a57.zip |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/boot/dts/walnut.dts')
-rw-r--r-- | arch/powerpc/boot/dts/walnut.dts | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts index ec54f4e04ad6..fa681f5343fe 100644 --- a/arch/powerpc/boot/dts/walnut.dts +++ b/arch/powerpc/boot/dts/walnut.dts @@ -64,10 +64,15 @@ MAL: mcmal { compatible = "ibm,mcmal-405gp", "ibm,mcmal"; dcr-reg = <180 62>; - num-tx-chans = <2>; + num-tx-chans = <1>; num-rx-chans = <1>; interrupt-parent = <&UIC0>; - interrupts = <a 4 b 4 c 4 d 4 e 4>; + interrupts = < + b 4 /* TXEOB */ + c 4 /* RXEOB */ + a 4 /* SERR */ + d 4 /* TXDE */ + e 4 /* RXDE */>; }; POB0: opb { @@ -118,9 +123,10 @@ compatible = "ibm,emac-405gp", "ibm,emac"; interrupt-parent = <&UIC0>; interrupts = <9 4 f 4>; + local-mac-address = [000000000000]; /* Filled in by zImage */ reg = <ef600800 70>; mal-device = <&MAL>; - mal-tx-channel = <0 1>; + mal-tx-channel = <0>; mal-rx-channel = <0>; cell-index = <0>; max-frame-size = <5dc>; |