[Gc-linux-cvs] linux/arch/powerpc/boot/dts gamecube.dts, 1.8, 1.9 wii.dts, 1.14, 1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot/dts
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/arch/powerpc/boot/dts

Modified Files:
	gamecube.dts wii.dts 
Log Message:
Merge v2.6.32.

Index: gamecube.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/gamecube.dts,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gamecube.dts	1 Feb 2009 18:29:34 -0000	1.8
--- gamecube.dts	9 Dec 2009 18:44:54 -0000	1.9
***************
*** 13,16 ****
--- 13,18 ----
   */
  
+ /dts-v1/;
+ 
  / {
  	model = "NintendoGameCube";
***************
*** 21,25 ****
  	chosen {
  		bootargs = "root=/dev/nfs nfsroot=192.168.001.253:/nfsroot/cube,nfsvers=3,udp ip=on video=gcn-vifb:tv=auto force_keyboard_port=4";
! 		linux,stdout-path = "/exi@0c006800/usbgecko@0c006814";
  	};
  
--- 23,31 ----
  	chosen {
  		bootargs = "root=/dev/nfs nfsroot=192.168.001.253:/nfsroot/cube,nfsvers=3,udp ip=on video=gcn-vifb:tv=auto force_keyboard_port=4";
! 		linux,stdout-path = &USBGECKO0;
! 	};
! 
! 	aliases {
! 		ugecon = &USBGECKO0;
  	};
  
***************
*** 27,31 ****
  		device_type = "memory";
  		/* 24M minus framebuffer memory area (640*576*2*2) */
! 		reg = <00000000 01698000>;
  	};
  
--- 33,37 ----
  		device_type = "memory";
  		/* 24M minus framebuffer memory area (640*576*2*2) */
! 		reg = <0x00000000 0x01698000>;
  	};
  
***************
*** 37,71 ****
  			device_type = "cpu";
  			reg = <0>;
! 			clock-frequency = <1cf7c580>; /* 486MHz */
! 			bus-frequency = <9a7ec80>; /* 162MHz core-to-bus 3x */
! 			timebase-frequency = <269fb20>; /* 162MHz / 4 */
  			/* Following required by dtc but not used */
! 			i-cache-line-size = <20>;
! 			d-cache-line-size = <20>;
! 			i-cache-size = <8000>;
! 			d-cache-size = <8000>;
! 		};
! 	};
! 
! 	pic: pic@0c003000 {
! 		#interrupt-cells = <1>;
! 		compatible = "nintendo,flipper-pic";
! 		reg = <0c003000 8>;
! 		interrupt-controller;
! 	};
! 
! 	/* External Interface bus */
! 	exi@0c006800 {
! 		#address-cells = <1>;
! 		#size-cells = <1>;
! 		compatible = "nintendo,flipper-exi";
! 		reg = <0c006800 40>;
! 		interrupts = <04>;
! 		interrupt-parent = <&pic>;
! 
! 		udbg_console: usbgecko@0c006814 {
! 			compatible = "usbgecko,usbgecko";
! 			reg = <0c006814 14>;
! 			virtual-reg = <cc006814>;
  		};
  	};
--- 43,54 ----
  			device_type = "cpu";
  			reg = <0>;
! 			clock-frequency = <486000000>; /* 486MHz */
! 			bus-frequency = <162000000>; /* 162MHz core-to-bus 3x */
! 			timebase-frequency = <40500000>; /* 162MHz / 4 */
  			/* Following required by dtc but not used */
! 			i-cache-line-size = <32>;
! 			d-cache-line-size = <32>;
! 			i-cache-size = <32768>;
! 			d-cache-size = <32768>;
  		};
  	};
***************
*** 78,97 ****
  		model = "flipper";
  		compatible = "nintendo,flipper";
! 		clock-frequency = <9a7ec80>; /* 162MHz */
! 		ranges = <0c000000 0c000000 00010000>;
  
  		video@0c002000 {
  			compatible = "nintendo,flipper-video";
! 			reg = <0c002000 100>;
! 			interrupts = <08>;
  			interrupt-parent = <&pic>;
! 			xfb-start = <01698000>; /* end-of-ram - xfb-size */
! 			xfb-size = <168000>;
  		};
  
  		resetswitch@0c003000 {
  			compatible = "nintendo,flipper-resetswitch";
! 			reg = <0c003000 4>;
! 			interrupts = <01>;
  			interrupt-parent = <&pic>;
  		};
--- 61,87 ----
  		model = "flipper";
  		compatible = "nintendo,flipper";
! 		clock-frequency = <162000000>; /* 162MHz */
! 		ranges = <0x0c000000 0x0c000000 0x00010000>;
  
  		video@0c002000 {
  			compatible = "nintendo,flipper-video";
! 			reg = <0x0c002000 0x100>;
! 			interrupts = <8>;
  			interrupt-parent = <&pic>;
! 			xfb-start = <0x01698000>; /* end-of-ram - xfb-size */
! 			xfb-size = <0x168000>;
! 		};
! 
! 		pic: pic@0c003000 {
! 			#interrupt-cells = <1>;
! 			compatible = "nintendo,flipper-pic";
! 			reg = <0x0c003000 0x8>;
! 			interrupt-controller;
  		};
  
  		resetswitch@0c003000 {
  			compatible = "nintendo,flipper-resetswitch";
! 			reg = <0x0c003000 0x4>;
! 			interrupts = <1>;
  			interrupt-parent = <&pic>;
  		};
***************
*** 99,104 ****
  		auxram@0c005000 {
  			compatible = "nintendo,flipper-auxram";
! 			reg = <0c005000 200>;	/* DSP */
! 			interrupts = <06>;
  			interrupt-parent = <&pic>;
  		};
--- 89,94 ----
  		auxram@0c005000 {
  			compatible = "nintendo,flipper-auxram";
! 			reg = <0x0c005000 0x200>;	/* DSP */
! 			interrupts = <6>;
  			interrupt-parent = <&pic>;
  		};
***************
*** 106,112 ****
  		audio@0c005000 {
  			compatible = "nintendo,flipper-audio";
! 			reg = <0c005000 200	/* DSP */
! 			       0c006c00 20>;	/* AI */
! 			interrupts = <06>;
  			interrupt-parent = <&pic>;
  		};
--- 96,102 ----
  		audio@0c005000 {
  			compatible = "nintendo,flipper-audio";
! 			reg = <0x0c005000 0x200		/* DSP */
! 			       0x0c006c00 0x20>;	/* AI */
! 			interrupts = <6>;
  			interrupt-parent = <&pic>;
  		};
***************
*** 114,119 ****
  		disk@0c006000 {
  			compatible = "nintendo,flipper-disk";
! 			reg = <0c006000 40>;
! 			interrupts = <02>;
  			interrupt-parent = <&pic>;
  		};
--- 104,109 ----
  		disk@0c006000 {
  			compatible = "nintendo,flipper-disk";
! 			reg = <0x0c006000 0x40>;
! 			interrupts = <2>;
  			interrupt-parent = <&pic>;
  		};
***************
*** 121,127 ****
  		serial@0c006400 {
  			compatible = "nintendo,flipper-serial";
! 			reg = <0c006400 100>;
! 			interrupts = <03>;
  			interrupt-parent = <&pic>;
  		};
          };
--- 111,133 ----
  		serial@0c006400 {
  			compatible = "nintendo,flipper-serial";
! 			reg = <0x0c006400 0x100>;
! 			interrupts = <3>;
! 			interrupt-parent = <&pic>;
! 		};
! 
! 		/* External Interface bus */
! 		exi@0c006800 {
! 			#address-cells = <1>;
! 			#size-cells = <1>;
! 			compatible = "nintendo,flipper-exi";
! 			reg = <0x0c006800 0x40>;
! 			interrupts = <4>;
  			interrupt-parent = <&pic>;
+ 
+ 			USBGECKO0: usbgecko@0c006814 {
+ 				compatible = "usbgecko,usbgecko";
+ 				reg = <0x0c006814 0x14>;
+ 				virtual-reg = <0xcc006814>;
+ 			};
  		};
          };

Index: wii.dts
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/dts/wii.dts,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wii.dts	25 Oct 2009 18:50:26 -0000	1.14
--- wii.dts	9 Dec 2009 18:44:54 -0000	1.15
***************
*** 13,21 ****
   */
  
  
! /memreserve/ 01694000-01697fff; /* lowmem stub save area */
! /memreserve/ 01698000-017fffff;	/* framebuffer, see video@0c002000 */
! /memreserve/ 01800000-0fffffff;	/* memory hole */
! /memreserve/ 10000000-10003fff;	/* DSP */
  
  / {
--- 13,22 ----
   */
  
+ /dts-v1/;
  
! /memreserve/ 0x01694000 0x0004000;	/* lowmem stub save area */
! /memreserve/ 0x01698000 0x0168000;	/* framebuffer, see video@0c002000 */
! /memreserve/ 0x01800000 0xe800000;	/* memory hole */
! /memreserve/ 0x10000000 0x0004000;	/* DSP */
  
  / {
***************
*** 42,47 ****
  
  	lowmem-stub {
! 		reg = <00000000 4000>;
! 		save-area = <01694000>;	/* must be memreserve'd */
  	};
  
--- 43,48 ----
  
  	lowmem-stub {
! 		reg = <0x00000000 0x4000>;
! 		save-area = <0x01694000>;	/* must be memreserve'd */
  	};
  
***************
*** 49,53 ****
  		device_type = "memory";
  		/* mem1 + hole + mem2 - ioh */
! 		reg = <00000000 133e0000>;
  	};
  
--- 50,54 ----
  		device_type = "memory";
  		/* mem1 + hole + mem2 - ioh */
! 		reg = <0x00000000 0x133e0000>;
  	};
  
***************
*** 60,71 ****
  			device_type = "cpu";
  			reg = <0>;
! 			clock-frequency = <2b73a840>; /* 729MHz */
! 			bus-frequency = <e7be2c0>; /* 243MHz core-to-bus 3x */
! 			timebase-frequency = <39ef8b0>; /* 243MHz / 4 */
  			/* Following required by dtc but not used */
! 			i-cache-line-size = <20>;
! 			d-cache-line-size = <20>;
! 			i-cache-size = <8000>;
! 			d-cache-size = <8000>;
  		};
  	};
--- 61,72 ----
  			device_type = "cpu";
  			reg = <0>;
! 			clock-frequency = <729000000>; /* 729MHz */
! 			bus-frequency = <243000000>; /* 243MHz core-to-bus 3x */
! 			timebase-frequency = <60750000>; /* 243MHz / 4 */
  			/* Following required by dtc but not used */
! 			i-cache-line-size = <32>;
! 			d-cache-line-size = <32>;
! 			i-cache-size = <32768>;
! 			d-cache-size = <32768>;
  		};
  	};
***************
*** 78,95 ****
  		model = "hollywood";
  		compatible = "nintendo,hollywood";
! 		clock-frequency = <e7be2c0>; /* 243MHz */
! 		ranges = <0c000000 0c000000 00010000
! 			  0d000000 0d000000 00010000
! 			  0d040000 0d040000 00050000
! 			  0d800000 0d800000 00001000
! 			  133e0000 133e0000 00c20000>;
  
  		video@0c002000 {
  			compatible = "nintendo,hollywood-video";
! 			reg = <0c002000 100>;
! 			interrupts = <08>;
  			interrupt-parent = <&PIC0>;
! 			xfb-start = <01698000>; /* end-of-mem1 - xfb-size */
! 			xfb-size = <168000>;	/* 640x576x2 x 2 bytes */
  		};
  
--- 79,96 ----
  		model = "hollywood";
  		compatible = "nintendo,hollywood";
! 		clock-frequency = <243000000>; /* 243MHz */
! 		ranges = <0x0c000000 0x0c000000 0x00010000
! 			  0x0d000000 0x0d000000 0x00010000
! 			  0x0d040000 0x0d040000 0x00050000
! 			  0x0d800000 0x0d800000 0x00007000
! 			  0x133e0000 0x133e0000 0x00c20000>;
  
  		video@0c002000 {
  			compatible = "nintendo,hollywood-video";
! 			reg = <0x0c002000 0x100>;
! 			interrupts = <8>;
  			interrupt-parent = <&PIC0>;
! 			xfb-start = <0x01698000>; /* end-of-mem1 - xfb-size */
! 			xfb-size = <0x168000>;    /* 640x576x2 x 2 bytes */
  		};
  
***************
*** 97,101 ****
  			#interrupt-cells = <1>;
  			compatible = "nintendo,flipper-pic";
! 			reg = <0c003000 8>;
  			interrupt-controller;
  		};
--- 98,102 ----
  			#interrupt-cells = <1>;
  			compatible = "nintendo,flipper-pic";
! 			reg = <0x0c003000 0x8>;
  			interrupt-controller;
  		};
***************
*** 103,108 ****
  		resetswitch@0c003000 {
  			compatible = "nintendo,hollywood-resetswitch";
! 			reg = <0c003000 4>;
! 			interrupts = <01>;
  			interrupt-parent = <&PIC0>;
  		};
--- 104,109 ----
  		resetswitch@0c003000 {
  			compatible = "nintendo,hollywood-resetswitch";
! 			reg = <0x0c003000 0x4>;
! 			interrupts = <1>;
  			interrupt-parent = <&PIC0>;
  		};
***************
*** 110,116 ****
  		audio@0c005000 {
  			compatible = "nintendo,hollywood-audio";
! 			reg = <0c005000 200	/* DSP */
! 			       0d006c00 20>;	/* AI */
! 			interrupts = <06>;
  			interrupt-parent = <&PIC0>;
  		};
--- 111,117 ----
  		audio@0c005000 {
  			compatible = "nintendo,hollywood-audio";
! 			reg = <0x0c005000 0x200	/* DSP */
! 			       0x0d006c00 0x20>;	/* AI */
! 			interrupts = <6>;
  			interrupt-parent = <&PIC0>;
  		};
***************
*** 118,123 ****
  		serial@0d006400 {
  			compatible = "nintendo,hollywood-serial";
! 			reg = <0d006400 100>;
! 			interrupts = <03>;
  			interrupt-parent = <&PIC0>;
  		};
--- 119,124 ----
  		serial@0d006400 {
  			compatible = "nintendo,hollywood-serial";
! 			reg = <0x0d006400 0x100>;
! 			interrupts = <3>;
  			interrupt-parent = <&PIC0>;
  		};
***************
*** 128,139 ****
  			#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>;
  			};
  		};
--- 129,140 ----
  			#size-cells = <1>;
  			compatible = "nintendo,hollywood-exi";
! 			reg = <0x0d006800 0x40>;
! 			interrupts = <4>;
  			interrupt-parent = <&PIC0>;
  
  			USBGECKO0: usbgecko@0d006814 {
  				compatible = "usbgecko,usbgecko";
! 				reg = <0x0d006814 0x14>;
! 				virtual-reg = <0xcd006814>;
  			};
  		};
***************
*** 144,150 ****
  		ios@0d000000 {
  			compatible = "nintendo,starlet-ios-ipc";
! 			reg = <0d000000 40	/* IPC */
! 			       133e0000 20000>;	/* MEM2 ioh 128K */
! 			interrupts = <0e>;
  			interrupt-parent = <&PIC0>;
  
--- 145,151 ----
  		ios@0d000000 {
  			compatible = "nintendo,starlet-ios-ipc";
! 			reg = <0x0d000000 0x40		/* IPC */
! 			       0x133e0000 0x20000>;	/* MEM2 ioh 128K */
! 			interrupts = <14>;
  			interrupt-parent = <&PIC0>;
  
***************
*** 175,225 ****
  			#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>;
--- 176,238 ----
  			#interrupt-cells = <1>;
  			compatible = "twiizers,starlet-mini-ipc";
! 			reg = <0x0d000000 0x40	/* IPC */
! 			       0x13fffffc 0x4>;	/* mini header pointer */
  
! 			ranges = <0x0d040000 0x0d040000 0x00050000
! 				  0x0d800000 0x0d800000 0x00007000
! 				  0x133e0000 0x133e0000 0x00c20000>;
  
  			PIC1: pic1@0d800030 {
  				#interrupt-cells = <1>;
  				compatible = "nintendo,hollywood-pic";
! 				reg = <0x0d800030 0x8>;
  				interrupt-controller;
! 				interrupts = <14>;
! 				interrupt-parent = <&PIC0>;
! 			};
! 			disk@0d806000 {
! 				compatible = "nintendo,hollywood-disk";
! 				reg = <0x0d806000 0x40>;
! 				interrupts = <2>;
  				interrupt-parent = <&PIC0>;
  			};
  			ehci@0d040000 {
  				compatible = "nintendo,hollywood-ehci";
! 				reg = <0x0d040000 0x100
! 				       0x133e0000 0x80000>; /* 512 KB */
! 				interrupts = <4>;
  				interrupt-parent = <&PIC1>;
  			};
  			ohci0@0d050000 {
  				compatible = "nintendo,hollywood-ohci";
! 				reg = <0x0d050000 0x100
! 				       0x13460000 0x80000>; /* 512 KB */
! 				interrupts = <5>;
  				interrupt-parent = <&PIC1>;
  			};
  			ohci1@0d060000 {
  				compatible = "nintendo,hollywood-ohci";
! 				reg = <0x0d060000 0x100
! 				       0x134e0000 0x80000>; /* 512 KB */
! 				interrupts = <6>;
  				interrupt-parent = <&PIC1>;
  			};
  			sdhc0@0d070000 {
  				compatible = "nintendo,hollywood-sdhci";
! 				reg = <0x0d070000 0x200>;
! 				interrupts = <7>;
! 				interrupt-parent = <&PIC1>;
! 			};
! 			sdhc1@0d080000 {
! 				compatible = "nintendo,hollywood-sdhci";
! 				reg = <0x0d080000 0x200>;
! 				interrupts = <8>;
  				interrupt-parent = <&PIC1>;
  			};
  		};
  
! 		gpio0: hollywood-gpio@0d8000c0 {
! 			compatible = "nintendo,hollywood-gpio";
! 			reg = <0x0d8000c0 0x4>;
  			gpio-controller;
  			#gpio-cells = <2>;
***************
*** 231,236 ****
  		        compatible = "virtual,i2c-gpio";
  
! 		        gpios = <&gpio0  10 0 /* 0x10 = 31 - 15 */
! 		                 &gpio0  11 0 /* 0x11 = 31 - 14 */
  				>;
  		        sda-is-open-drain = <1>;
--- 244,249 ----
  		        compatible = "virtual,i2c-gpio";
  
! 		        gpios = <&gpio0  16 0 /* 31-15 */
! 		                 &gpio0  17 0 /* 31-14 */
  				>;
  		        sda-is-open-drain = <1>;
***************
*** 242,246 ****
  		        audio-video-encoder {
  		                compatible = "nintendo,wii-ave-rvl";
! 		                reg = <70>;
  		        };
  		};
--- 255,259 ----
  		        audio-video-encoder {
  		                compatible = "nintendo,wii-ave-rvl";
! 		                reg = <0x70>;
  		        };
  		};