Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2010 14:49:13 GMT
From:      Rafal Jaworowski <raj@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 176618 for review
Message-ID:  <201004071449.o37EnDmu063321@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@176618?ac=10

Change 176618 by raj@raj_fdt on 2010/04/07 14:48:29

	Adjust and clean up DTS files.

Affected files ...

.. //depot/projects/fdt/sys/boot/fdt/dts/db78100.dts#2 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/db88f5182.dts#4 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/db88f5281.dts#4 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#8 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#4 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/mpc8572ds.dts#3 edit
.. //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#6 edit

Differences ...

==== //depot/projects/fdt/sys/boot/fdt/dts/db78100.dts#2 (text+ko) ====

@@ -204,7 +204,6 @@
 		enet0: ethernet@72000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V2";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -214,7 +213,7 @@
 			interrupt-parent = <&PIC>;
 			phy-handle = <&phy0>;
 
-			mdio@004 {
+			mdio@0 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "mrvl,mdio";
@@ -228,7 +227,6 @@
 		enet1: ethernet@76000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V2";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -238,7 +236,7 @@
 			interrupt-parent = <&PIC>;
 			phy-handle = <&phy0>;
 
-			mdio@004 {
+			mdio@0 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "mrvl,mdio";
@@ -250,7 +248,6 @@
 		};
 
 		serial0: serial@12000 {
-			cell-index = <0>;
 			compatible = "ns16550";
 			reg = <0x12000 0x20>;
 			reg-shift = <2>;
@@ -260,7 +257,6 @@
 		};
 
 		serial1: serial@12100 {
-			cell-index = <1>;
 			compatible = "ns16550";
 			reg = <0x12100 0x20>;
 			reg-shift = <2>;

==== //depot/projects/fdt/sys/boot/fdt/dts/db88f5182.dts#4 (text+ko) ====

@@ -173,7 +173,6 @@
 		enet0: ethernet@72000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V1";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -184,7 +183,6 @@
 		};
 
 		serial0: serial@12000 {
-			cell-index = <0>;
 			compatible = "ns16550";
 			reg = <0x12000 0x20>;
 			reg-shift = <2>;
@@ -194,7 +192,6 @@
 		};
 
 		serial1: serial@12100 {
-			cell-index = <1>;
 			compatible = "ns16550";
 			reg = <0x12100 0x20>;
 			reg-shift = <2>;

==== //depot/projects/fdt/sys/boot/fdt/dts/db88f5281.dts#4 (text+ko) ====

@@ -173,7 +173,6 @@
 		enet0: ethernet@72000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V1";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -181,10 +180,20 @@
 			local-mac-address = [ 00 00 00 00 00 00 ];
 			interrupts = <18 19 20 21 22>;
 			interrupt-parent = <&PIC>;
+			phy-handle = <&phy0>;
+
+			mdio@0 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "mrvl,mdio";
+
+				phy0: ethernet-phy@0 {
+					reg = <0x8>;
+				};
+			};
 		};
 
 		serial0: serial@12000 {
-			cell-index = <0>;
 			compatible = "ns16550";
 			reg = <0x12000 0x20>;
 			reg-shift = <2>;
@@ -194,7 +203,6 @@
 		};
 
 		serial1: serial@12100 {
-			cell-index = <1>;
 			compatible = "ns16550";
 			reg = <0x12100 0x20>;
 			reg-shift = <2>;
@@ -216,12 +224,5 @@
 			interrupts = <24 25 26 27 23>;
 			interrupt-parent = <&PIC>;
 		};
-
-		sata@80000 {
-			compatible = "mrvl,sata";
-			reg = <0x80000 0x6000>;
-			interrupts = <29>;
-			interrupt-parent = <&PIC>;
-		};
 	};
 };

==== //depot/projects/fdt/sys/boot/fdt/dts/db88f6281.dts#8 (text+ko) ====

@@ -196,7 +196,6 @@
 		enet0: ethernet@72000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V2";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -206,7 +205,7 @@
 			interrupt-parent = <&PIC>;
 			phy-handle = <&phy0>;
 
-			mdio@004 {
+			mdio@0 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "mrvl,mdio";
@@ -218,7 +217,6 @@
 		};
 
 		serial0: serial@12000 {
-			cell-index = <0>;
 			compatible = "ns16550";
 			reg = <0x12000 0x20>;
 			reg-shift = <2>;
@@ -228,7 +226,6 @@
 		};
 
 		serial1: serial@12100 {
-			cell-index = <1>;
 			compatible = "ns16550";
 			reg = <0x12100 0x20>;
 			reg-shift = <2>;

==== //depot/projects/fdt/sys/boot/fdt/dts/mpc8555cds.dts#4 (text+ko) ====

@@ -393,8 +393,8 @@
 		interrupt-parent = <&mpic>;
 		interrupts = <24 2>;
 		bus-range = <0 0>;
-		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
-			  0x1000000 0x0 0x0 0xe2000000 0x0 0x100000>;
+		ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+			  0x1000000 0x0 0x0 0xfee00000 0x0 0x00010000>;
 		clock-frequency = <66666666>;
 		#interrupt-cells = <1>;
 		#size-cells = <2>;
@@ -427,8 +427,8 @@
 		interrupt-parent = <&mpic>;
 		interrupts = <25 2>;
 		bus-range = <0 0>;
-		ranges = <0x2000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
-			  0x1000000 0x0 0x0 0xe3000000 0x0 0x100000>;
+		ranges = <0x2000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+			  0x1000000 0x0 0x0 0xfee10000 0x0 0x00010000>;
 		clock-frequency = <66666666>;
 		#interrupt-cells = <1>;
 		#size-cells = <2>;

==== //depot/projects/fdt/sys/boot/fdt/dts/mpc8572ds.dts#3 (text+ko) ====

@@ -618,8 +618,8 @@
 		#address-cells = <3>;
 		reg = <0 0xffe08000 0 0x1000>;
 		bus-range = <0 255>;
-		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
-			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x00010000>;
+		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x10000000
+			  0x1000000 0x0 0x00000000 0 0xfee20000 0x0 0x00010000>;
 		clock-frequency = <33333333>;
 		interrupt-parent = <&mpic>;
 		interrupts = <24 2>;
@@ -745,9 +745,9 @@
 			#size-cells = <2>;
 			#address-cells = <3>;
 			device_type = "pci";
-			ranges = <0x2000000 0x0 0x80000000
-				  0x2000000 0x0 0x80000000
-				  0x0 0x20000000
+			ranges = <0x2000000 0x0 0xa0000000
+				  0x2000000 0x0 0xa0000000
+				  0x0 0x10000000
 
 				  0x1000000 0x0 0x0
 				  0x1000000 0x0 0x0
@@ -756,9 +756,9 @@
 				reg = <0x0 0x0 0x0 0x0 0x0>;
 				#size-cells = <2>;
 				#address-cells = <3>;
-				ranges = <0x2000000 0x0 0x80000000
-					  0x2000000 0x0 0x80000000
-					  0x0 0x20000000
+				ranges = <0x2000000 0x0 0xa0000000
+					  0x2000000 0x0 0xa0000000
+					  0x0 0x10000000
 
 					  0x1000000 0x0 0x0
 					  0x1000000 0x0 0x0
@@ -827,8 +827,8 @@
 		#address-cells = <3>;
 		reg = <0 0xffe09000 0 0x1000>;
 		bus-range = <0 255>;
-		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
-			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x00010000>;
+		ranges = <0x2000000 0x0 0x90000000 0 0x90000000 0x0 0x10000000
+			  0x1000000 0x0 0x00000000 0 0xfee10000 0x0 0x00010000>;
 		clock-frequency = <33333333>;
 		interrupt-parent = <&mpic>;
 		interrupts = <25 2>;
@@ -845,9 +845,9 @@
 			#size-cells = <2>;
 			#address-cells = <3>;
 			device_type = "pci";
-			ranges = <0x2000000 0x0 0xa0000000
-				  0x2000000 0x0 0xa0000000
-				  0x0 0x20000000
+			ranges = <0x2000000 0x0 0x90000000
+				  0x2000000 0x0 0x90000000
+				  0x0 0x10000000
 
 				  0x1000000 0x0 0x0
 				  0x1000000 0x0 0x0
@@ -863,8 +863,8 @@
 		#address-cells = <3>;
 		reg = <0 0xffe0a000 0 0x1000>;
 		bus-range = <0 255>;
-		ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
-			  0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x00010000>;
+		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x10000000
+			  0x1000000 0x0 0x00000000 0 0xfee00000 0x0 0x00010000>;
 		clock-frequency = <33333333>;
 		interrupt-parent = <&mpic>;
 		interrupts = <26 2>;
@@ -881,9 +881,9 @@
 			#size-cells = <2>;
 			#address-cells = <3>;
 			device_type = "pci";
-			ranges = <0x2000000 0x0 0xc0000000
-				  0x2000000 0x0 0xc0000000
-				  0x0 0x20000000
+			ranges = <0x2000000 0x0 0x80000000
+				  0x2000000 0x0 0x80000000
+				  0x0 0x10000000
 
 				  0x1000000 0x0 0x0
 				  0x1000000 0x0 0x0

==== //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#6 (text+ko) ====

@@ -193,7 +193,6 @@
 		enet0: ethernet@72000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			cell-index = <0>;
 			model = "V2";
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
@@ -203,7 +202,7 @@
 			interrupt-parent = <&PIC>;
 			phy-handle = <&phy0>;
 
-			mdio@004 {
+			mdio@0 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 				compatible = "mrvl,mdio";
@@ -215,7 +214,6 @@
 		};
 
 		serial0: serial@12000 {
-			cell-index = <0>;
 			compatible = "ns16550";
 			reg = <0x12000 0x20>;
 			reg-shift = <2>;
@@ -225,7 +223,6 @@
 		};
 
 		serial1: serial@12100 {
-			cell-index = <1>;
 			compatible = "ns16550";
 			reg = <0x12100 0x20>;
 			reg-shift = <2>;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004071449.o37EnDmu063321>