diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-11 12:23:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-11 12:23:11 -0400 |
| commit | 59a2b9e605c5a5e2dff35506a13b51f33d3051b4 (patch) | |
| tree | 016d452dff11fc6fd90192d56e575d28757504c3 /drivers/pci/pcie_imx.c | |
| parent | 838157d02edade9bfaa33da216bf109336ab9547 (diff) | |
| parent | 7666cccf4f24dd500a9279741a0b64a3f89a7331 (diff) | |
Merge tag 'u-boot-imx-20210502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20210502
-------------------
- mx6: fixes for Ventana
- local fixes from maintainer
- imx7d: Ronetix's iMX7-CM
- imx8: Ronetix iMX8MQ-CM
Engicam i.Core MX8M
Compulab iot-gate-imx8
- Fixes i.MX8 documentation
- Fixes phy usage with fec
Diffstat (limited to 'drivers/pci/pcie_imx.c')
| -rw-r--r-- | drivers/pci/pcie_imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index d9c2325a221..73875e00dba 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -473,7 +473,7 @@ static int imx6_pcie_assert_core_reset(struct imx_pcie_priv *priv, * If both LTSSM_ENABLE and REF_SSP_ENABLE are active we have a strong * indication that the bootloader activated the link. */ - if (is_mx6dq() && prepare_for_boot) { + if ((is_mx6dq() || is_mx6sdl()) && prepare_for_boot) { u32 val, gpr1, gpr12; gpr1 = readl(&iomuxc_regs->gpr[1]); |