From: Marek Vasut <marex@denx.de>
Date: Sun, 9 Jun 2019 01:50:51 +0000 (+0200)
Subject: ARM: imx: Call imx_pcie_remove() only for non-DM PCI driver
X-Git-Tag: rel_imx_4.19.35_1.1.0~94
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=ca78f9a9ff87dc129a22cd78679255dbe4ed4d58;p=u-boot.git

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)
---

diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index bd93a3ccfa..c7026d8d8c 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -355,7 +355,7 @@ u32 get_ahb_clk(void)
 
 void arch_preboot_os(void)
 {
-#if defined(CONFIG_PCIE_IMX)
+#if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI)
 	imx_pcie_remove();
 #endif