---

yaml --- r: 156495 b: refs/heads/master c: 320145f h: refs/heads/master i: 156493: 14421c5 156491: 3288738 156487: e416c54 156479: 8f40428 v: v3
git-mirror · Jul 30, 2009 · 8835c32 · 8835c32
1 parent 2f95703
commit 8835c32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a52ac8d181e938d640c2da70cad6d1301abe775
+refs/heads/master: 320145fac91955ee35a6af7e1c2b42388a17b3d8
diff --git a/trunk/arch/arm/mach-ks8695/pci.c b/trunk/arch/arm/mach-ks8695/pci.c
@@ -245,6 +245,9 @@ static int ks8695_pci_fault(unsigned long addr, unsigned int fsr, struct pt_regs
 
 static void __init ks8695_pci_preinit(void)
 {
+	/* make software reset to avoid freeze if PCI bus was messed up */
+	__raw_writel(0x80000000, KS8695_PCI_VA + KS8695_PBCS);
+
 	/* stage 1 initialization, subid, subdevice = 0x0001 */
 	__raw_writel(0x00010001, KS8695_PCI_VA + KS8695_CRCSID);