]>
Commit | Line | Data |
---|---|---|
f7075c3a SS |
1 | --- a/drivers/pci/host/pci-imx6.c |
2 | +++ b/drivers/pci/host/pci-imx6.c | |
3 | @@ -200,12 +200,6 @@ static int pcie_phy_write(void __iomem * | |
4 | static int imx6q_pcie_abort_handler(unsigned long addr, | |
5 | unsigned int fsr, struct pt_regs *regs) | |
6 | { | |
7 | - /* | |
8 | - * If it was an imprecise abort, then we need to correct the | |
9 | - * return address to be _after_ the instruction. | |
10 | - */ | |
11 | - if (fsr & (1 << 10)) | |
12 | - regs->ARM_pc += 4; | |
13 | return 0; | |
14 | } | |
15 | ||
16 | @@ -322,7 +316,7 @@ static void imx6_pcie_host_init(struct p | |
17 | IMX6Q_GPR12_PCIE_CTL_2, 1 << 10); | |
18 | ||
19 | while (!dw_pcie_link_up(pp)) { | |
20 | - usleep_range(100, 1000); | |
21 | + usleep_range(2000, 3000); | |
22 | count++; | |
23 | if (count >= 10) { | |
24 | dev_err(pp->dev, "phy link never came up\n"); |