From 86e59530be5b0a87641d3bd76959a55b99028bc2 Mon Sep 17 00:00:00 2001 From: Ludwig Zenz Date: Tue, 2 Jul 2019 15:10:52 +0200 Subject: [PATCH] ARCH: imx: Call sata_remove() not on imx6 duallite/solo boards For a single binary approach for imx6 quad/dual/duallite/solo it is necessary to enable CONFIG_SATA for quad/dual. On the other hand on imx6 duallite/sole SATA is not available. Therefore sata_remove() is skipped according to a blacklist scheme. Adding further imx derivates is probably not recessary as they are usually not pin-compatible and therefore a different board with its own configuration. Signed-off-by: Ludwig Zenz --- arch/arm/mach-imx/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 3a8cf30..6e9a175 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -289,10 +289,12 @@ void arch_preboot_os(void) imx_pcie_remove(); #endif #if defined(CONFIG_SATA) - sata_remove(0); + if (!is_mx6sdl()) { + sata_remove(0); #if defined(CONFIG_MX6) - disable_sata_clock(); + disable_sata_clock(); #endif + } #endif #if defined(CONFIG_VIDEO_IPUV3) /* disable video before launching O/S */ -- 2.7.4