---

yaml --- r: 81074 b: refs/heads/master c: 29641ce h: refs/heads/master v: v3
git-mirror · Dec 19, 2007 · a661ce9 · a661ce9
1 parent aece36a
commit a661ce9
Show file tree

Hide file tree

Showing 63 changed files with 1,512 additions and 2,528 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f91266edba3c6ef001819c5abe4c3a0643f66fc9
+refs/heads/master: 29641ce165e5f643b48988cb779c6ba97b647503
diff --git a/trunk/Documentation/powerpc/booting-without-of.txt b/trunk/Documentation/powerpc/booting-without-of.txt
@@ -1223,14 +1223,16 @@ platforms are moved over to use the flattened-device-tree model.
 
   Required properties:
     - reg : Offset and length of the register set for the device
+    - device_type : Should be "mdio"
     - compatible : Should define the compatible device type for the
-      mdio.  Currently, this is most likely to be "fsl,gianfar-mdio"
+      mdio.  Currently, this is most likely to be "gianfar"
 
   Example:
 
 	mdio@24520 {
 		reg = <24520 20>;
-		compatible = "fsl,gianfar-mdio";
+		device_type = "mdio"; 
+		compatible = "gianfar";
 
 		ethernet-phy@0 {
 			......
@@ -1629,19 +1631,6 @@ platforms are moved over to use the flattened-device-tree model.
    - interrupt-parent : the phandle for the interrupt controller that
      services interrupts for this device.
    - pio-handle : The phandle for the Parallel I/O port configuration.
-   - rx-clock-name: the UCC receive clock source
-     "none": clock source is disabled
-     "brg1" through "brg16": clock source is BRG1-BRG16, respectively
-     "clk1" through "clk24": clock source is CLK1-CLK24, respectively
-   - tx-clock-name: the UCC transmit clock source
-     "none": clock source is disabled
-     "brg1" through "brg16": clock source is BRG1-BRG16, respectively
-     "clk1" through "clk24": clock source is CLK1-CLK24, respectively
-   The following two properties are deprecated.  rx-clock has been replaced
-   with rx-clock-name, and tx-clock has been replaced with tx-clock-name.
-   Drivers that currently use the deprecated properties should continue to
-   do so, in order to support older device trees, but they should be updated
-   to check for the new properties first.
    - rx-clock : represents the UCC receive clock source.
      0x00 : clock source is disabled;
      0x1~0x10 : clock source is BRG1~BRG16 respectively;

diff --git a/trunk/arch/powerpc/boot/dts/kuroboxHD.dts b/trunk/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -23,12 +23,6 @@ XXXX add flash parts, rtc, ??
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	aliases {
-		serial0 = &serial0;
-		serial1 = &serial1;
-		pci0 = &pci0;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -66,7 +60,7 @@ XXXX add flash parts, rtc, ??
 		i2c@80003000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			cell-index = <0>;
+			device_type = "i2c";
 			compatible = "fsl-i2c";
 			reg = <80003000 1000>;
 			interrupts = <5 2>;
@@ -79,8 +73,7 @@ XXXX add flash parts, rtc, ??
 			};
 		};
 
-		serial0: serial@80004500 {
-			cell-index = <0>;
+		serial@80004500 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <80004500 8>;
@@ -90,8 +83,7 @@ XXXX add flash parts, rtc, ??
 			interrupt-parent = <&mpic>;
 		};
 
-		serial1: serial@80004600 {
-			cell-index = <1>;
+		serial@80004600 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <80004600 8>;
@@ -110,7 +102,7 @@ XXXX add flash parts, rtc, ??
 			reg = <80040000 40000>;
 		};
 
-		pci0: pci@fec00000 {
+		pci@fec00000 {
 			#address-cells = <3>;
 			#size-cells = <2>;
 			#interrupt-cells = <1>;

diff --git a/trunk/arch/powerpc/boot/dts/kuroboxHG.dts b/trunk/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -23,12 +23,6 @@ XXXX add flash parts, rtc, ??
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	aliases {
-		serial0 = &serial0;
-		serial1 = &serial1;
-		pci0 = &pci0;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -66,7 +60,7 @@ XXXX add flash parts, rtc, ??
 		i2c@80003000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			cell-index = <0>;
+			device_type = "i2c";
 			compatible = "fsl-i2c";
 			reg = <80003000 1000>;
 			interrupts = <5 2>;
@@ -79,8 +73,7 @@ XXXX add flash parts, rtc, ??
 			};
 		};
 
-		serial0: serial@80004500 {
-			cell-index = <0>;
+		serial@80004500 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <80004500 8>;
@@ -90,8 +83,7 @@ XXXX add flash parts, rtc, ??
 			interrupt-parent = <&mpic>;
 		};
 
-		serial1: serial@80004600 {
-			cell-index = <1>;
+		serial@80004600 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <80004600 8>;
@@ -110,7 +102,7 @@ XXXX add flash parts, rtc, ??
 			reg = <80040000 40000>;
 		};
 
-		pci0: pci@fec00000 {
+		pci@fec00000 {
 			#address-cells = <3>;
 			#size-cells = <2>;
 			#interrupt-cells = <1>;

diff --git a/trunk/arch/powerpc/boot/dts/lite5200.dts b/trunk/arch/powerpc/boot/dts/lite5200.dts
@@ -284,8 +284,7 @@
 		};
 
 		i2c@3d00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+			device_type = "i2c";
 			compatible = "mpc5200-i2c","fsl-i2c";
 			cell-index = <0>;
 			reg = <3d00 40>;
@@ -295,8 +294,7 @@
 		};
 
 		i2c@3d40 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+			device_type = "i2c";
 			compatible = "mpc5200-i2c","fsl-i2c";
 			cell-index = <1>;
 			reg = <3d40 40>;

diff --git a/trunk/arch/powerpc/boot/dts/lite5200b.dts b/trunk/arch/powerpc/boot/dts/lite5200b.dts
@@ -300,8 +300,7 @@
 		};
 
 		i2c@3d00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+			device_type = "i2c";
 			compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
 			cell-index = <0>;
 			reg = <3d00 40>;
@@ -311,8 +310,7 @@
 		};
 
 		i2c@3d40 {
-			#address-cells = <1>;
-			#size-cells = <0>;
+			device_type = "i2c";
 			compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
 			cell-index = <1>;
 			reg = <3d40 40>;

diff --git a/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts b/trunk/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -15,14 +15,6 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	aliases {
-		ethernet0 = &enet0;
-		ethernet1 = &enet1;
-		serial0 = &serial0;
-		serial1 = &serial1;
-		pci0 = &pci0;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -60,9 +52,7 @@
 		};
 
 		i2c@3000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			cell-index = <0>;
+			device_type = "i2c";
 			compatible = "fsl-i2c";
 			reg = <3000 100>;
 			interrupts = <e 8>;
@@ -71,9 +61,7 @@
 		};
 
 		i2c@3100 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-			cell-index = <1>;
+			device_type = "i2c";
 			compatible = "fsl-i2c";
 			reg = <3100 100>;
 			interrupts = <f 8>;
@@ -103,10 +91,11 @@
 		};
 
 		mdio@24520 {
+			device_type = "mdio";
+			compatible = "gianfar";
+			reg = <24520 20>;
 			#address-cells = <1>;
 			#size-cells = <0>;
-			compatible = "fsl,gianfar-mdio";
-			reg = <24520 20>;
 			phy1: ethernet-phy@1 {
 				interrupt-parent = < &ipic >;
 				interrupts = <13 8>;
@@ -121,8 +110,7 @@
 			};
 		};
 
-		enet0: ethernet@24000 {
-			cell-index = <0>;
+		ethernet@24000 {
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
@@ -133,8 +121,7 @@
 			phy-handle = < &phy1 >;
 		};
 
-		enet1: ethernet@25000 {
-			cell-index = <1>;
+		ethernet@25000 {
 			device_type = "network";
 			model = "eTSEC";
 			compatible = "gianfar";
@@ -145,8 +132,7 @@
 			phy-handle = < &phy4 >;
 		};
 
-		serial0: serial@4500 {
-			cell-index = <0>;
+		serial@4500 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4500 100>;
@@ -155,8 +141,7 @@
 			interrupt-parent = < &ipic >;
 		};
 
-		serial1: serial@4600 {
-			cell-index = <1>;
+		serial@4600 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4600 100>;
@@ -194,8 +179,7 @@
 		};
 	};
 
-	pci0: pci@e0008500 {
-		cell-index = <1>;
+	pci@e0008500 {
 		interrupt-map-mask = <f800 0 0 7>;
 		interrupt-map = <
 

diff --git a/trunk/arch/powerpc/boot/dts/mpc832x_mds.dts b/trunk/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -15,14 +15,6 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	aliases {
-		ethernet0 = &enet0;
-		ethernet1 = &enet1;
-		serial0 = &serial0;
-		serial1 = &serial1;
-		pci0 = &pci0;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -67,7 +59,7 @@
 		i2c@3000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-			cell-index = <0>;
+			device_type = "i2c";
 			compatible = "fsl-i2c";
 			reg = <3000 100>;
 			interrupts = <e 8>;
@@ -80,8 +72,7 @@
 			};
 		};
 
-		serial0: serial@4500 {
-			cell-index = <0>;
+		serial@4500 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4500 100>;
@@ -90,8 +81,7 @@
 			interrupt-parent = < &ipic >;
 		};
 
-		serial1: serial@4600 {
-			cell-index = <1>;
+		serial@4600 {
 			device_type = "serial";
 			compatible = "ns16550";
 			reg = <4600 100>;
@@ -218,34 +208,44 @@
 			mode = "slave";
 		};
 
-		enet0: ucc@2200 {
+		ucc@2200 {
 			device_type = "network";
 			compatible = "ucc_geth";
 			model = "UCC";
-			cell-index = <3>;
 			device-id = <3>;
 			reg = <2200 200>;
 			interrupts = <22>;
 			interrupt-parent = < &qeic >;
+			/*
+			 * mac-address is deprecated and will be removed
+			 * in 2.6.25.  Only recent versions of
+			 * U-Boot support local-mac-address, however.
+			 */
+			mac-address = [ 00 00 00 00 00 00 ];
 			local-mac-address = [ 00 00 00 00 00 00 ];
-			rx-clock-name = "clk9";
-			tx-clock-name = "clk10";
+			rx-clock = <19>;
+			tx-clock = <1a>;
 			phy-handle = < &phy3 >;
 			pio-handle = < &pio3 >;
 		};
 
-		enet1: ucc@3200 {
+		ucc@3200 {
 			device_type = "network";
 			compatible = "ucc_geth";
 			model = "UCC";
-			cell-index = <4>;
 			device-id = <4>;
 			reg = <3200 200>;
 			interrupts = <23>;
 			interrupt-parent = < &qeic >;
+			/*
+			 * mac-address is deprecated and will be removed
+			 * in 2.6.25.  Only recent versions of
+			 * U-Boot support local-mac-address, however.
+			 */
+			mac-address = [ 00 00 00 00 00 00 ];
 			local-mac-address = [ 00 00 00 00 00 00 ];
-			rx-clock-name = "clk7";
-			tx-clock-name = "clk8";
+			rx-clock = <17>;
+			tx-clock = <18>;
 			phy-handle = < &phy4 >;
 			pio-handle = < &pio4 >;
 		};
@@ -283,8 +283,7 @@
 		};
 	};
 
-	pci0: pci@e0008500 {
-		cell-index = <1>;
+	pci@e0008500 {
 		interrupt-map-mask = <f800 0 0 7>;
 		interrupt-map = <
 				/* IDSEL 0x11 AD17 */