diff options
| author | Bjorn Helgaas | 2022-08-04 11:41:55 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2022-08-04 11:41:55 -0500 |
| commit | fea77e9f29782f73b72ac1bd6e669ccd82841204 (patch) | |
| tree | 0b5d6f3862d9ba0bc6d28424b17255ac68152920 /drivers/pci | |
| parent | 94d13317bef31a2ec149c8f245302ffdda3c54da (diff) | |
| parent | 22f3571cbc84b9150238a43d271ffbf7fad3d81d (diff) | |
Merge branch 'pci/ctrl/exynos'
- Move samsung phy-exynos-pcie init all to exynos5433_pcie_phy_init()
instead of splitting across phy_init() and phy_power_on() (Marek
Szyprowski)
- Call phy_init() before phy_power_on() for samsung phy-exynos-pcie, as
required by the PHY programming model (Marek Szyprowski)
* pci/ctrl/exynos:
PCI: exynos: Correct generic PHY usage
phy: samsung: phy-exynos-pcie: sanitize init/power_on callbacks
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-exynos.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c index 2ede426e3295..3786946cb09e 100644 --- a/drivers/pci/controller/dwc/pci-exynos.c +++ b/drivers/pci/controller/dwc/pci-exynos.c @@ -258,9 +258,8 @@ static int exynos_pcie_host_init(struct dw_pcie_rp *pp) exynos_pcie_assert_core_reset(ep); - phy_reset(ep->phy); - phy_power_on(ep->phy); phy_init(ep->phy); + phy_power_on(ep->phy); exynos_pcie_deassert_core_reset(ep); exynos_pcie_enable_irq_pulse(ep); |