Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"

[u-boot.git] / drivers / ata / sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 18c7a66db1bff992b5a678c9b7150ed3490051fe..ac78760a33ebabc65e1d97c2e1653c70d3cbd1f6 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -31,9 +31,9 @@
  * No port multiplier support
  */
 
-#include <common.h>
 #include <ahci.h>
 #include <blk.h>
+#include <bootdev.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <log.h>
@@ -45,6 +45,7 @@
 #include <libata.h>
 #include <malloc.h>
 #include <sata.h>
+#include <time.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
@@ -1076,7 +1077,8 @@ static int sata_mv_probe(struct udevice *dev)
 
        for (i = 0; i < nr_ports; i++) {
                ret = blk_create_devicef(dev, "sata_mv_blk", "blk",
-                                        UCLASS_AHCI, -1, 512, 0, &blk);
+                                        UCLASS_AHCI, -1, DEFAULT_BLKSZ,
+                                        0, &blk);
                if (ret) {
                        debug("Can't create device\n");
                        continue;
@@ -1104,6 +1106,12 @@ static int sata_mv_probe(struct udevice *dev)
                        /* TODO: undo create */
                        continue;
 
+               ret = bootdev_setup_for_sibling_blk(blk, "sata_bootdev");
+               if (ret) {
+                       printf("%s: Failed to create bootdev\n", __func__);
+                       continue;
+               }
+
                /* If we got here, the current SATA port was probed
                 * successfully, so set the probe status to successful.
                 */
@@ -1116,7 +1124,6 @@ static int sata_mv_probe(struct udevice *dev)
 static int sata_mv_scan(struct udevice *dev)
 {
        /* Nothing to do here */
-
        return 0;
 }