From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 7 Sep 2010 07:11:04 +0000 (+0900)
Subject: sh: Make SH7786 PCIe port reset logic more aggressive.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2dbfa1e37dc703631d5421e0b04aecc5a7aff37d;p=linux-beck.git

sh: Make SH7786 PCIe port reset logic more aggressive.

This attempts a more complete port reset, building on top of the existing
approach.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
index 03e6d8217b0c..40b0ed042236 100644
--- a/arch/sh/drivers/pci/pcie-sh7786.c
+++ b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -204,6 +204,16 @@ static int phy_init(struct pci_channel *chan)
 	return -ETIMEDOUT;
 }
 
+static void pcie_reset(struct sh7786_pcie_port *port)
+{
+	struct pci_channel *chan = port->hose;
+
+	pci_write_reg(chan, 1, SH4A_PCIESRSTR);
+	pci_write_reg(chan, 0, SH4A_PCIETCTLR);
+	pci_write_reg(chan, 0, SH4A_PCIESRSTR);
+	pci_write_reg(chan, 0, SH4A_PCIETXVC0SR);
+}
+
 static int pcie_init(struct sh7786_pcie_port *port)
 {
 	struct pci_channel *chan = port->hose;
@@ -213,7 +223,7 @@ static int pcie_init(struct sh7786_pcie_port *port)
 	int ret, i;
 
 	/* Begin initialization */
-	pci_write_reg(chan, 0, SH4A_PCIETCTLR);
+	pcie_reset(port);
 
 	/* Initialize as type1. */
 	data = pci_read_reg(chan, SH4A_PCIEPCICONF3);