diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2018-10-17 03:40:56 -0400 |
---|---|---|
committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2018-10-17 04:40:22 -0400 |
commit | 1e10f73e4cb033e73a3f47b0cc6080c0e3cf28f2 (patch) | |
tree | a77c44eef64c56afcb7716b3dee477fcaf49828b /drivers/pci/controller/dwc/pci-keystone.c | |
parent | 00a2c4094f8edb07ef03a307c2a5b211e9065165 (diff) |
PCI: keystone: Move dw_pcie_setup_rc() out of ks_pcie_establish_link()
No functional change. Move dw_pcie_setup_rc() out of
ks_pcie_establish_link() so that ks_pcie_establish_linki() can be used only
to start the link.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Diffstat (limited to 'drivers/pci/controller/dwc/pci-keystone.c')
-rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 5d9c5d199ada..afb948372077 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c | |||
@@ -86,12 +86,9 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_ANY_ID, PCI_ANY_ID, quirk_limit_mrrs); | |||
86 | static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) | 86 | static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) |
87 | { | 87 | { |
88 | struct dw_pcie *pci = ks_pcie->pci; | 88 | struct dw_pcie *pci = ks_pcie->pci; |
89 | struct pcie_port *pp = &pci->pp; | ||
90 | struct device *dev = pci->dev; | 89 | struct device *dev = pci->dev; |
91 | unsigned int retries; | 90 | unsigned int retries; |
92 | 91 | ||
93 | dw_pcie_setup_rc(pp); | ||
94 | |||
95 | if (dw_pcie_link_up(pci)) { | 92 | if (dw_pcie_link_up(pci)) { |
96 | dev_info(dev, "Link already up\n"); | 93 | dev_info(dev, "Link already up\n"); |
97 | return 0; | 94 | return 0; |
@@ -266,6 +263,8 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) | |||
266 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); | 263 | struct dw_pcie *pci = to_dw_pcie_from_pp(pp); |
267 | struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); | 264 | struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); |
268 | 265 | ||
266 | dw_pcie_setup_rc(pp); | ||
267 | |||
269 | ks_pcie_establish_link(ks_pcie); | 268 | ks_pcie_establish_link(ks_pcie); |
270 | ks_dw_pcie_setup_rc_app_regs(ks_pcie); | 269 | ks_dw_pcie_setup_rc_app_regs(ks_pcie); |
271 | ks_pcie_setup_interrupts(ks_pcie); | 270 | ks_pcie_setup_interrupts(ks_pcie); |