Merge branch 'topic/azt3328' into for-linus

[pandora-kernel.git] / arch / arm / mach-ks8695 / pci.c

diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c
index f5ebcc0..7849966 100644 (file)
--- a/arch/arm/mach-ks8695/pci.c
+++ b/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);