projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-marvell
[oweals/u-boot.git]
/
board
/
sunxi
/
ahci.c
diff --git
a/board/sunxi/ahci.c
b/board/sunxi/ahci.c
index 5e123285b03d2d8a8fb29b6c2712d11bf4fa1df5..6d51b9b8e95b81ce6b84e1a982ce699b816a16de 100644
(file)
--- a/
board/sunxi/ahci.c
+++ b/
board/sunxi/ahci.c
@@
-76,10
+76,12
@@
void scsi_init(void)
#ifdef CONFIG_SATAPWR
gpio_request(CONFIG_SATAPWR, "satapwr");
gpio_direction_output(CONFIG_SATAPWR, 1);
#ifdef CONFIG_SATAPWR
gpio_request(CONFIG_SATAPWR, "satapwr");
gpio_direction_output(CONFIG_SATAPWR, 1);
+ /* Give attached sata device time to power-up to avoid link timeouts */
+ mdelay(500);
#endif
if (sunxi_ahci_phy_init(SUNXI_SATA_BASE) < 0)
return;
#endif
if (sunxi_ahci_phy_init(SUNXI_SATA_BASE) < 0)
return;
- ahci_init(SUNXI_SATA_BASE);
+ ahci_init(
(void __iomem *)
SUNXI_SATA_BASE);
}
}