From: Roger Quadros <rogerq@ti.com>
Date: Tue, 23 Sep 2014 15:07:03 +0000 (+0300)
Subject: ARM: OMAP5+: sata: Move scsi_scan() to the right place
X-Git-Tag: v2014.10~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d59baeb76f911d0391e73e5f6068e55ea48514f8;p=platform%2Fkernel%2Fu-boot.git

ARM: OMAP5+: sata: Move scsi_scan() to the right place

scsi_scan() must be called as part of scsi_init() and not
as part of sata_init().

Signed-off-by: Roger Quadros <rogerq@ti.com>
---

diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c
index 131d082..3b4dd3f 100644
--- a/arch/arm/cpu/armv7/omap-common/sata.c
+++ b/arch/arm/cpu/armv7/omap-common/sata.c
@@ -70,7 +70,6 @@ int init_sata(int dev)
 	writel(val, TI_SATA_WRAPPER_BASE + TI_SATA_SYSCONFIG);
 
 	ret = ahci_init(DWC_AHSATA_BASE);
-	scsi_scan(1);
 
 	return ret;
 }
@@ -79,4 +78,5 @@ int init_sata(int dev)
 void scsi_init(void)
 {
 	init_sata(0);
+	scsi_scan(1);
 }