---

yaml --- r: 274155 b: refs/heads/master c: f352c72 h: refs/heads/master i: 274153: 9aeabfb 274151: a5c7b5d v: v3
git-mirror · Sep 19, 2011 · 120c606 · 120c606
1 parent b155890
commit 120c606
Show file tree

Hide file tree

Showing 7 changed files with 1,413 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fa3d9e5c699ff49e96199eeb9bea4508e7f5dac
+refs/heads/master: f352c7251255effe6c2326190f1378adbd142aa3
diff --git a/trunk/arch/powerpc/platforms/wsp/Kconfig b/trunk/arch/powerpc/platforms/wsp/Kconfig
@@ -4,6 +4,9 @@ config PPC_WSP
 	select PPC_SCOM
 	select PPC_XICS
 	select PPC_ICP_NATIVE
+	select PCI
+	select PPC_IO_WORKAROUNDS if PCI
+	select PPC_INDIRECT_PIO if PCI
 	default n
 
 menu "WSP platform selection"

diff --git a/trunk/arch/powerpc/platforms/wsp/Makefile b/trunk/arch/powerpc/platforms/wsp/Makefile
@@ -4,3 +4,4 @@ obj-y				+= setup.o ics.o
 obj-$(CONFIG_PPC_PSR2)		+= psr2.o opb_pic.o
 obj-$(CONFIG_PPC_WSP)		+= scom_wsp.o
 obj-$(CONFIG_SMP)		+= smp.o scom_smp.o
+obj-$(CONFIG_PCI)		+= wsp_pci.o
diff --git a/trunk/arch/powerpc/platforms/wsp/psr2.c b/trunk/arch/powerpc/platforms/wsp/psr2.c
@@ -63,6 +63,10 @@ static void __init psr2_setup_arch(void)
 #ifdef CONFIG_SMP
 	a2_setup_smp();
 #endif
+#ifdef CONFIG_PCI
+	wsp_setup_pci();
+#endif
+
 }
 
 static int __init psr2_probe(void)

diff --git a/trunk/arch/powerpc/platforms/wsp/wsp.h b/trunk/arch/powerpc/platforms/wsp/wsp.h
@@ -3,6 +3,9 @@
 
 #include <asm/wsp.h>
 
+/* Devtree compatible strings for major devices */
+#define PCIE_COMPATIBLE     "ibm,wsp-pciex"
+
 extern void wsp_setup_pci(void);
 extern void scom_init_wsp(void);