ppc64: Add winnipeg support

arch/ppc64/kernel/pSeries_pci.c

@@ -513,8 +513,10 @@ alloc_phb(struct device_node *dev, char *model, unsigned int addr_size_words)
 
 	/***************************************************************
 	* Speedwagon
+	*   include Winnipeg as well for the time being.
 	***************************************************************/
-	} else if (strstr(model, "Speedwagon")) {
+	} else if ((strstr(model, "Speedwagon")) || 
+		   (strstr(model, "Winnipeg"))) {
 		PPCDBG(PPCDBG_PHBINIT, "\tCreate speedwagon\n");
 	        phb = pci_alloc_pci_controller("PHB SW",phb_type_speedwagon);
 		if (phb == NULL) return NULL;

arch/ppc64/kernel/prom.c

@@ -902,11 +902,13 @@ prom_initialize_tce_table(void)
 		/* Keep the old logic in tack to avoid regression. */
 		if (compatible[0] != 0) {
 			if((strstr(compatible, RELOC("python")) == NULL) &&
-			   (strstr(compatible, RELOC("Speedwagon")) == NULL))
+			   (strstr(compatible, RELOC("Speedwagon")) == NULL) &&
+			   (strstr(compatible, RELOC("Winnipeg")) == NULL))
 				continue;
 		} else if (model[0] != 0) {
 			if ((strstr(model, RELOC("ython")) == NULL) &&
-			    (strstr(model, RELOC("peedwagon")) == NULL))
+			    (strstr(model, RELOC("peedwagon")) == NULL) &&
+			    (strstr(model, RELOC("innipeg")) == NULL))
 				continue;
 		}