[Gc-linux-cvs] linux/arch/powerpc/boot/dts wii.dts,1.1,1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5134/arch/powerpc/boot/dts

Modified Files:
	wii.dts 
Log Message:
Added wii platform, specifically.
The platform now:
- uses flipper-pic
- uses device tree for configuration settings
- populates platform devices from device tree instead of drivers


Index: wii.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wii.dts	4 Mar 2008 06:20:54 -0000	1.1
+++ wii.dts	26 Mar 2008 19:51:04 -0000	1.2
@@ -7,18 +7,24 @@
 
 / {
 	model = "NintendoWii";
-	compatible = "nintendo,gamecube";
+	compatible = "nintendo,wii";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
 	chosen {
 		bootargs = "root=/dev/ram0 video=gcnfb:tv=auto ip=192.168.001.047:192.168.001.253:192.168.001.251 force_keyboard_port=4"; 
+
+		linux,crashkernel-base = <0>;
+		linux,crashkernel-size = <0>;
+
+		linux,stdout-path = "/exi@0d006800/usbgecko@0d006814";
 	};
 
 	memory {
 		device_type = "memory";
 		/* 24M - framebuffer - fifo - kexec,	00000000-01653fff */
-		reg = <00000000 01654000>;
+		reg = <00000000 01654000	/* only 1st range is used */
+		       10000000 04000000>;
 	};
 
 	cpus {
@@ -26,7 +32,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		PowerPC,gekko@0 {
+		PowerPC,broadway@0 {
 			device_type = "cpu";
 			reg = <0>;
 			clock-frequency = <2b73a840>; /* 729MHz */
@@ -40,5 +46,80 @@
 		};
 	};
 
+	hollywood_pic: pic@0c003000 {
+		#interrupt-cells = <1>;
+		compatible = "nintendo,flipper-pic";
+		reg = <0c003000 8>;
+		interrupt-controller;
+	};
+
+	mem2 {
+		compatible = "nintendo,mem2";
+		reg = <10000000 3400000>; /* 52M of MEM2 RAM */
+	};
+
+	exi@0d006800 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "nintendo,exi";
+		reg = <0d006800 40>;
+		interrupts = <04>;
+		interrupt-parent = <&hollywood_pic>;
+
+		udbg_console: usbgecko@0d006814 {
+			compatible = "usbgecko,usbgecko";
+			reg = <0d006814 14>;
+			virtual-reg = <cd006814>;
+		};
+	};
+
+	hollywood {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		#interrupt-cells = <1>;
+		model = "hollywood";
+		compatible = "nintendo,hollywood";
+		clock-frequency = <e7be2c0>; /* 243MHz */
+		ranges = <0c000000 0c000000 00010000 
+			  0d000000 0d000000 00010000>;
+
+		vifb@0c002000 {
+			compatible = "nintendo,vifb";
+			reg = <0c002000 100>;
+			interrupts = <08>;
+			interrupt-parent = <&hollywood_pic>;
+			xfb-start = <01698000>; /* end-of-ram - xfb-size */
+			xfb-size = <168000>;
+		};
+
+		rsw@0c003000 {
+			compatible = "nintendo,rsw";
+			reg = <0c003000 4>;
+			interrupts = <01>;
+			interrupt-parent = <&hollywood_pic>;
+		};
+
+		ai@0c005000 {
+			compatible = "nintendo,ai";
+			reg = <0c005000 200	/* DSP */
+			       0d006c00 20>;	/* AI */
+			interrupts = <06>;
+			interrupt-parent = <&hollywood_pic>;
+		};
+
+		starlet-ipc@0d000000 {
+			compatible = "nintendo,starlet-ipc";
+			reg = <0d000000 40>;
+			interrupts = <0e>;
+			interrupt-parent = <&hollywood_pic>;
+		};
+
+		si@0d006400 {
+			compatible = "nintendo,si";
+			reg = <0d006400 100>;
+			interrupts = <03>;
+			interrupt-parent = <&hollywood_pic>;
+		};
+	};
 };