ARM: O5/dra7xx: Add SATA boot support
authorDan Murphy <dmurphy@ti.com>
Mon, 3 Feb 2014 12:59:02 +0000 (06:59 -0600)
committerTom Rini <trini@ti.com>
Wed, 19 Feb 2014 15:47:45 +0000 (10:47 -0500)
Add the SATA boot support for OMAP5 and dra7xx.

Renamed the omap_sata_init to the common init_sata(int dev)
for commonality in with sata stack.

Added the ROM boot device ID for SATA.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Reviewed-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
arch/arm/cpu/armv7/omap-common/sata.c
arch/arm/include/asm/arch-omap5/sata.h
arch/arm/include/asm/arch-omap5/spl.h
board/ti/dra7xx/evm.c
board/ti/omap5_uevm/evm.c

index f5468c4c97c033ef51f28ca87824b9492f92dee3..cad4feed000595410a396ee34961a727aa007a69 100644 (file)
@@ -12,6 +12,7 @@
 #include <scsi.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sata.h>
+#include <sata.h>
 #include <asm/io.h>
 #include "pipe3-phy.h"
 
@@ -31,7 +32,7 @@ struct omap_pipe3 sata_phy = {
        .dpll_map = dpll_map_sata,
 };
 
-int omap_sata_init(void)
+int init_sata(int dev)
 {
        int ret;
        u32 val;
index 2ca89477305f1c3255b6f08bfbd0791fdd2d15b8..b69165b5ee2ffdc5abb2e02a039ef2b2d46ea190 100644 (file)
 #define TI_SATA_IDLE_SMART_WAKE                        (0x3 << 2)
 #define TI_SATA_IDLE_SMART                     (0x2 << 2)
 
-#ifdef CONFIG_SCSI_AHCI_PLAT
-int omap_sata_init(void);
-#else
-static inline int omap_sata_init(void)
-{
-       return 0;
-}
-#endif /* CONFIG_SCSI_AHCI_PLAT */
-
 #endif /* _TI_SATA_H */
index 2d5a62e660338f1c2ed6bd8f2bc8fad4c43177bc..4a279cf0525b56a65cd9ed3a58bdd62bc8ab32e8 100644 (file)
@@ -15,6 +15,7 @@
 #define BOOT_DEVICE_MMC1        5
 #define BOOT_DEVICE_MMC2        6
 #define BOOT_DEVICE_MMC2_2     7
+#define BOOT_DEVICE_SATA       9
 #define BOOT_DEVICE_SPI                10
 #define BOOT_DEVICE_UART       0x43
 
index 1b60b8f672eaa4ca7116365730996acad389d51c..bed828584bf73bbd656c39e0eacc0556e5ddca09 100644 (file)
@@ -12,6 +12,7 @@
  */
 #include <common.h>
 #include <palmas.h>
+#include <sata.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/sata.h>
@@ -80,7 +81,7 @@ int board_init(void)
 
 int board_late_init(void)
 {
-       omap_sata_init();
+       init_sata(0);
        return 0;
 }
 
index b549d72900652cfa020e9c36ff1e62891175f21f..3eaa5ac3986b3688224babc8c90be0eac18c3552 100644 (file)
@@ -15,6 +15,7 @@
 #include "mux_data.h"
 
 #if defined(CONFIG_USB_EHCI) || defined(CONFIG_USB_XHCI_OMAP)
+#include <sata.h>
 #include <usb.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
@@ -70,7 +71,7 @@ int board_init(void)
 
 int board_late_init(void)
 {
-       omap_sata_init();
+       init_sata(0);
        return 0;
 }