Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bd0076cc330f303905018a17d9dcfbabde497572
Commit:     bd0076cc330f303905018a17d9dcfbabde497572
Parent:     e52f5677bf6954dbd128a2d659d77a85ced55d30
Author:     Valentine Barshak <[EMAIL PROTECTED]>
AuthorDate: Wed Sep 19 03:29:13 2007 +1000
Committer:  Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Thu Sep 20 07:37:14 2007 -0500

    [POWERPC] 4xx: Fix Sequoia MAL0 and EMAC dts entries.
    
    According to PowerPC 440EPx documentation,
    MAL0 is comprised of four channels (two transmit and two receive).
    Each channel is dedicated to one of two EMAC cores.
    This patch fixes Sequoia DTS MAL0 entry and EMAC entries,
    assigning correct channel numbers to EMACs.
    
    Signed-off-by: Valentine Barshak <[EMAIL PROTECTED]>
    Signed-off-by: Josh Boyer <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/dts/sequoia.dts |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/boot/dts/sequoia.dts 
b/arch/powerpc/boot/dts/sequoia.dts
index b236798..36be75b 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -107,8 +107,8 @@
                MAL0: mcmal {
                        compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
                        dcr-reg = <180 62>;
-                       num-tx-chans = <4>;
-                       num-rx-chans = <4>;
+                       num-tx-chans = <2>;
+                       num-rx-chans = <2>;
                        interrupt-parent = <&MAL0>;
                        interrupts = <0 1 2 3 4>;
                        #interrupt-cells = <1>;
@@ -255,7 +255,7 @@
                                reg = <ef600e00 70>;
                                local-mac-address = [000000000000];
                                mal-device = <&MAL0>;
-                               mal-tx-channel = <0 1>;
+                               mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
                                max-frame-size = <5dc>;
@@ -281,7 +281,7 @@
                                reg = <ef600f00 70>;
                                local-mac-address = [000000000000];
                                mal-device = <&MAL0>;
-                               mal-tx-channel = <2 3>;
+                               mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
                                max-frame-size = <5dc>;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to