summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2014-09-23 18:07:03 +0300
committerTom Rini <trini@ti.com>2014-10-10 09:44:42 -0400
commitd59baeb76f911d0391e73e5f6068e55ea48514f8 (patch)
treeed80126f1a52c936c05270544bf4458a2dd1f11f /arch/arm/cpu/armv7/omap-common
parent3160b1b98603cba3c480f70e153b259171d3e4a6 (diff)
downloadblackbird-obmc-uboot-d59baeb76f911d0391e73e5f6068e55ea48514f8.tar.gz
blackbird-obmc-uboot-d59baeb76f911d0391e73e5f6068e55ea48514f8.zip
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>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/sata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c
index 131d082bc8..3b4dd3f5d7 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);
}
OpenPOWER on IntegriCloud