From 8835c322b5ef1c315f1109930444788592f6a1a0 Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Thu, 9 Jul 2009 08:48:03 +0100
Subject: [PATCH] --- yaml --- r: 156495 b: refs/heads/master c:
 320145fac91955ee35a6af7e1c2b42388a17b3d8 h: refs/heads/master i:   156493:
 14421c582893b71fdc25e4e0bd71fa1dcb2b7861   156491:
 3288738f6490918a439bd5087b949ee8bb8220b2   156487:
 e416c541c7191a03570836bead4babac2cdd776f   156479:
 8f404289907c53178ac4a11d0d4b1b314a163a57 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-ks8695/pci.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 53297dd2acf0..d62ee133e655 100644
--- 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
index f5ebcc0fcab9..78499667eb7b 100644
--- 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);