[Gc-linux-cvs] linux/arch/powerpc/boot/dts wii.dts,1.13,1.14

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/arch/powerpc/boot/dts

Modified Files:
	wii.dts 
Log Message:
Merge gc-linux-v2.6.30.


Index: wii.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** wii.dts	28 Mar 2009 20:44:19 -0000	1.13
--- wii.dts	25 Oct 2009 18:50:26 -0000	1.14
***************
*** 27,31 ****
  	chosen {
  		/* ramdisk */
! 		/* bootargs = "nobats root=/dev/ram0 video=gcnfb:tv=NTSC ip=on force_keyboard_port=4"; */
  
  		/* nfsroot */
--- 27,31 ----
  	chosen {
  		/* ramdisk */
! 		/* bootargs = "nobats root=/dev/ram0 video=gcnfb ip=on force_keyboard_port=4"; */
  
  		/* nfsroot */
***************
*** 33,38 ****
  
  		/* root filesystem on 2nd partition of SD card, whiite style  */
! 		bootargs = "nobats root=/dev/rvlsda2 video=gcnfb force_keyboard_port=4 placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers";
! 		linux,stdout-path = "/exi@0d006800/usbgecko@0d006814";
  	};
  
--- 33,42 ----
  
  		/* root filesystem on 2nd partition of SD card, whiite style  */
! 		bootargs = "nobats root=/dev/mmcblk0p2 rootwait force_keyboard_port=4 video=gcnfb:60Hz,tv=NTSC placeholder_for_additional_kernel_options_targetted_at_hexedit_lovers";
! 		linux,stdout-path = &USBGECKO0;
! 	};
! 
! 	aliases {
! 		ugecon = &USBGECKO0;
  	};
  
***************
*** 67,93 ****
  	};
  
- 	pic: pic@0c003000 {
- 		#interrupt-cells = <1>;
- 		compatible = "nintendo,flipper-pic";
- 		reg = <0c003000 8>;
- 		interrupt-controller;
- 	};
- 
- 	/* External Interface bus */
- 	exi@0d006800 {
- 		#address-cells = <1>;
- 		#size-cells = <1>;
- 		compatible = "nintendo,hollywood-exi";
- 		reg = <0d006800 40>;
- 		interrupts = <04>;
- 		interrupt-parent = <&pic>;
- 
- 		udbg_console: usbgecko@0d006814 {
- 			compatible = "usbgecko,usbgecko";
- 			reg = <0d006814 14>;
- 			virtual-reg = <cd006814>;
- 		};
- 	};
- 
  	/* devices contained in the hollywood chipset */
  	soc {
--- 71,74 ----
***************
*** 100,105 ****
  		ranges = <0c000000 0c000000 00010000
  			  0d000000 0d000000 00010000
  			  0d800000 0d800000 00001000
! 			  133e0000 133e0000 00020000>;
  
  		video@0c002000 {
--- 81,87 ----
  		ranges = <0c000000 0c000000 00010000
  			  0d000000 0d000000 00010000
+ 			  0d040000 0d040000 00050000
  			  0d800000 0d800000 00001000
! 			  133e0000 133e0000 00c20000>;
  
  		video@0c002000 {
***************
*** 107,120 ****
  			reg = <0c002000 100>;
  			interrupts = <08>;
! 			interrupt-parent = <&pic>;
  			xfb-start = <01698000>; /* end-of-mem1 - xfb-size */
  			xfb-size = <168000>;	/* 640x576x2 x 2 bytes */
  		};
  
  		resetswitch@0c003000 {
  			compatible = "nintendo,hollywood-resetswitch";
  			reg = <0c003000 4>;
  			interrupts = <01>;
! 			interrupt-parent = <&pic>;
  		};
  
--- 89,109 ----
  			reg = <0c002000 100>;
  			interrupts = <08>;
! 			interrupt-parent = <&PIC0>;
  			xfb-start = <01698000>; /* end-of-mem1 - xfb-size */
  			xfb-size = <168000>;	/* 640x576x2 x 2 bytes */
  		};
  
+ 		PIC0: pic0@0c003000 {
+ 			#interrupt-cells = <1>;
+ 			compatible = "nintendo,flipper-pic";
+ 			reg = <0c003000 8>;
+ 			interrupt-controller;
+ 		};
+ 
  		resetswitch@0c003000 {
  			compatible = "nintendo,hollywood-resetswitch";
  			reg = <0c003000 4>;
  			interrupts = <01>;
! 			interrupt-parent = <&PIC0>;
  		};
  
***************
*** 124,128 ****
  			       0d006c00 20>;	/* AI */
  			interrupts = <06>;
! 			interrupt-parent = <&pic>;
  		};
  
--- 113,117 ----
  			       0d006c00 20>;	/* AI */
  			interrupts = <06>;
! 			interrupt-parent = <&PIC0>;
  		};
  
***************
*** 131,167 ****
  			reg = <0d006400 100>;
  			interrupts = <03>;
! 			interrupt-parent = <&pic>;
  		};
  
! 		gpio0: starlet-gpio@0d8000c0 {
! 			compatible = "nintendo,starlet-gpio";
! 			reg = <0d8000c0 4>;
! 			gpio-controller;
! 			#gpio-cells = <2>;
  		};
  
! 		starlet-ipc@0d000000 {
! 			compatible = "nintendo,starlet-ipc";
  			reg = <0d000000 40	/* IPC */
  			       133e0000 20000>;	/* MEM2 ioh 128K */
  			interrupts = <0e>;
! 			interrupt-parent = <&pic>;
  
! 		};
  
! 		starlet-es {
! 			compatible = "nintendo,starlet-es";
! 		};
  
! 		starlet-sd {
! 			compatible = "nintendo,starlet-sd";
  		};
  
! 		starlet-keyboard {
! 			compatible = "nintendo,starlet-keyboard";
  		};
  
! 		starlet-hcd {
! 			compatible = "nintendo,starlet-hcd";
  		};
  
--- 120,227 ----
  			reg = <0d006400 100>;
  			interrupts = <03>;
! 			interrupt-parent = <&PIC0>;
  		};
  
! 		/* External Interface bus */
! 		exi@0d006800 {
! 			#address-cells = <1>;
! 			#size-cells = <1>;
! 			compatible = "nintendo,hollywood-exi";
! 			reg = <0d006800 40>;
! 			interrupts = <04>;
! 			interrupt-parent = <&PIC0>;
! 
! 			USBGECKO0: usbgecko@0d006814 {
! 				compatible = "usbgecko,usbgecko";
! 				reg = <0d006814 14>;
! 				virtual-reg = <cd006814>;
! 			};
  		};
  
! 		/*
! 		 * Firmware interfaces accessible through Nintendo IOS IPC.
! 		 */
! 		ios@0d000000 {
! 			compatible = "nintendo,starlet-ios-ipc";
  			reg = <0d000000 40	/* IPC */
  			       133e0000 20000>;	/* MEM2 ioh 128K */
  			interrupts = <0e>;
! 			interrupt-parent = <&PIC0>;
  
! 			starlet-ios-es {
! 				compatible = "nintendo,starlet-ios-es";
! 			};
  
! 			starlet-ios-sd {
! 				compatible = "nintendo,starlet-ios-sd";
! 			};
  
! 			starlet-ios-hcd {
! 				compatible = "nintendo,starlet-ios-hcd";
! 			};
! 
! 			starlet-ios-keyboard {
! 				compatible = "nintendo,starlet-ios-keyboard";
! 			};
  		};
  
! 		/*
! 		 * Hardware accessible through Team Twiizers 'mini' firmware
! 		 * replacement for Starlet.
! 		 */
! 		mini@0d000000 {
! 			#address-cells = <1>;
! 			#size-cells = <1>;
! 			#interrupt-cells = <1>;
! 			compatible = "twiizers,starlet-mini-ipc";
! 			reg = <0d000000 40	/* IPC */
! 			       13fffffc 4>;	/* mini header pointer */
! 
! 			ranges = <0d040000 0d040000 00050000
! 				  0d800000 0d800000 00001000
! 				  133e0000 133e0000 00c20000>;
! 
! 			PIC1: pic1@0d800030 {
! 				#interrupt-cells = <1>;
! 				compatible = "nintendo,hollywood-pic";
! 				reg = <0d800030 8>;
! 				interrupt-controller;
! 				interrupts = <0e>;
! 				interrupt-parent = <&PIC0>;
! 			};
! 			ehci@0d040000 {
! 				compatible = "nintendo,hollywood-ehci";
! 				reg = <0d040000 100
! 				       133e0000 80000>; /* 512 KB */
! 				interrupts = <04>;
! 				interrupt-parent = <&PIC1>;
! 			};
! 			ohci0@0d050000 {
! 				compatible = "nintendo,hollywood-ohci";
! 				reg = <0d050000 100
! 				       13460000 80000>; /* 512 KB */
! 				interrupts = <05>;
! 				interrupt-parent = <&PIC1>;
! 			};
! 			ohci1@0d060000 {
! 				compatible = "nintendo,hollywood-ohci";
! 				reg = <0d060000 100
! 				       134e0000 80000>; /* 512 KB */
! 				interrupts = <06>;
! 				interrupt-parent = <&PIC1>;
! 			};
! 			sdhc0@0d070000 {
! 				compatible = "nintendo,hollywood-sdhci";
! 				reg = <0d070000 200>;
! 				interrupts = <07>;
! 				interrupt-parent = <&PIC1>;
! 			};
  		};
  
! 		gpio0: starlet-gpio@0d8000c0 {
! 			compatible = "nintendo,starlet-gpio";
! 			reg = <0d8000c0 4>;
! 			gpio-controller;
! 			#gpio-cells = <2>;
  		};
  
***************
*** 187,188 ****
--- 247,249 ----
  	};
  };
+