diff mbox

[3/4] ARM: OMAP5+: sata: Move scsi_scan() to the right place

Message ID 1411484824-27265-4-git-send-email-rogerq@ti.com
State Accepted
Commit d59baeb76f911d0391e73e5f6068e55ea48514f8
Headers show

Commit Message

Roger Quadros Sept. 23, 2014, 3:07 p.m. UTC 
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>
---
 arch/arm/cpu/armv7/omap-common/sata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Oct. 10, 2014, 2:40 p.m. UTC | #1 
On Tue, Sep 23, 2014 at 06:07:03PM +0300, Roger Quadros wrote:

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

Applied to u-boot/master, thanks!
diff mbox

Patch

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