diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-20 00:53:11 +1000 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-19 16:18:33 -0500 |
| commit | b3af7a55da9925b73136d5358573e8962dfd35a0 (patch) | |
| tree | 3335e4e2248b6ecbaa4c0001275be5e78acdc0d9 /arch/powerpc/boot/dts/walnut.dts | |
| parent | 094624fa66758e9f555587c29b23cf5bc67c10fd (diff) | |
| download | kernel-crypto-b3af7a55da9925b73136d5358573e8962dfd35a0.tar.gz kernel-crypto-b3af7a55da9925b73136d5358573e8962dfd35a0.tar.xz kernel-crypto-b3af7a55da9925b73136d5358573e8962dfd35a0.zip | |
[POWERPC] 4xx: Enable EMAC for PPC405 Walnut board
This patch enables the ibm_newemac driver for the Walnut board. It fixes the
device tree for the walnut board to order the MAL interrupts correctly and
adds the local-mac-address property to the EMAC node. The bootwrapper is also
updated to extract the MAC address from the OpenBIOS offset where it is stored.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
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 ec54f4e04ad..fa681f5343f 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>; |