Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ca78f9a9ff87dc129a22cd78679255dbe4ed4d58

Authored by Marek Vasut
Committed by Ye Li
1 parent 1249561d0c
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

ARM: imx: Call imx_pcie_remove() only for non-DM PCI driver 

The DM iMX PCI driver has DM_FLAG_OS_PREPARE set and will call
imx_pcie_remove() from the .remove callback. Do not call it from
the architecture code again.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
(cherry picked from commit 42dc1230cdec48d0278dcc683bc14527cbea12c5)

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/arm/mach-imx/cpu.c
Diff comments   View file @ ca78f9a
... ... @@ -355,7 +355,7 @@
355 355  
356 356 void arch_preboot_os(void)
357 357 {
358   -#if defined(CONFIG_PCIE_IMX)
  358 +#if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI)
359 359 imx_pcie_remove();
360 360 #endif
361 361