diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-11 01:20:30 +0200 |
| commit | 790af815436bc6a93e4c581840be2419897f23b1 (patch) | |
| tree | 1ba0aaacad86092aea67d3612ae066b33b117619 /arch/arm/cpu/armv7/omap-common/sata.c | |
| parent | d0b3723034aa865b8618428739efe1d98b1a2e2b (diff) | |
| parent | db67801bf92f7fae6131dbc0d387131698fb9490 (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/sata.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/sata.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c index cad4feed00..3b4dd3f5d7 100644 --- a/arch/arm/cpu/armv7/omap-common/sata.c +++ b/arch/arm/cpu/armv7/omap-common/sata.c @@ -70,7 +70,13 @@ 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; } + +/* On OMAP platforms SATA provides the SCSI subsystem */ +void scsi_init(void) +{ + init_sata(0); + scsi_scan(1); +} |