* Fixed the FEC node, and its accompanying PHY
* Fixed a spacing issue in the PIC node
---
arch/powerpc/boot/dts/mpc8540ads.dts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 93d2c2d..5f41c1f 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -83,11 +83,11 @@
reg = <1>;
device_type = "ethernet-phy";
};
- ethernet-phy@2 {
- linux,phandle = <2452002>;
+ ethernet-phy@3 {
+ linux,phandle = <2452003>;
interrupt-parent = <40000>;
interrupts = <37 1>;
- reg = <2>;
+ reg = <3>;
device_type = "ethernet-phy";
};
};@@ -124,14 +124,14 @@
#address-cells = <1>;
#size-cells = <0>;
device_type = "network";
- model = "TSEC";
+ model = "FEC";
compatible = "gianfar";
reg = <26000 1000>;
address = [ 00 E0 0C 00 73 02 ];
local-mac-address = [ 00 E0 0C 00 73 02 ];
interrupts = <19 2>;
interrupt-parent = <40000>;
- phy-handle = <2452002>;
+ phy-handle = <2452003>;
};
serial@4500 {@@ -251,7 +251,7 @@
built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
- big-endian;
+ big-endian;
};
};
};
--
2006_06_07.01.gittree_pull-dirty
On Mon, 2006-08-21 at 14:29 -0500, Andy Fleming wrote:
quoted hunk
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts
b/arch/powerpc/boot/dts/mpc8540ads.dts
index 93d2c2d..5f41c1f 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -83,11 +83,11 @@
reg = <1>;
device_type = "ethernet-phy";
};
- ethernet-phy@2 {
- linux,phandle = <2452002>;
+ ethernet-phy@3 {
+ linux,phandle = <2452003>;
Again, doesn't DTC assign linux,phandle properties as needed (i.e. when
the node is referenced with & syntax)?
-Hollis
On Aug 21, 2006, at 14:39, Hollis Blanchard wrote:
On Mon, 2006-08-21 at 14:29 -0500, Andy Fleming wrote:
quoted
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts
b/arch/powerpc/boot/dts/mpc8540ads.dts
index 93d2c2d..5f41c1f 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -83,11 +83,11 @@
reg = <1>;
device_type = "ethernet-phy";
};
- ethernet-phy@2 {
- linux,phandle = <2452002>;
+ ethernet-phy@3 {
+ linux,phandle = <2452003>;
Again, doesn't DTC assign linux,phandle properties as needed (i.e.
when
the node is referenced with & syntax)?
That's what I hear. I think this would be a good place for using
that, but I'm waiting for someone to determine whether some sort of
labeling system is going to be added, first. As it doesn't require
changes to u-boot or linux, it's an easy fix for a later time.
I will, of course, accede to popular opinion. But I'd rather change
all the phandles in exactly the same way, and I feel that the
notation gets clunky when seen iterated in a table (as shown in Jon's
patch for that change).
Andy