summaryrefslogtreecommitdiff
path: root/arch/sh/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-09-07 16:11:04 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-09-07 16:11:04 +0900
commit2dbfa1e37dc703631d5421e0b04aecc5a7aff37d (patch)
tree3d6c8e064889bef673fa0c7f4ef021042ec62410 /arch/sh/drivers
parent9ec165166850930dc3079bfa39f4c1397abd7337 (diff)
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>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r--arch/sh/drivers/pci/pcie-sh7786.c12
1 files changed, 11 insertions, 1 deletions
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);