ARM64: zynqmp: Add missing nand node for ep108

[oweals/u-boot.git] / cmd / sata.c

diff --git a/cmd/sata.c b/cmd/sata.c
index 8b1f19ce4744e9dc9d4dbeb510957d1131582fd0..8748ccef69685fee1b250633118f908fac69db5c 100644 (file)
--- a/cmd/sata.c
+++ b/cmd/sata.c
@@ -21,13 +21,13 @@ struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 static unsigned long sata_bread(struct blk_desc *block_dev, lbaint_t start,
                                lbaint_t blkcnt, void *dst)
 {
-       return sata_read(block_dev->dev, start, blkcnt, dst);
+       return sata_read(block_dev->devnum, start, blkcnt, dst);
 }
 
 static unsigned long sata_bwrite(struct blk_desc *block_dev, lbaint_t start,
                                 lbaint_t blkcnt, const void *buffer)
 {
-       return sata_write(block_dev->dev, start, blkcnt, buffer);
+       return sata_write(block_dev->devnum, start, blkcnt, buffer);
 }
 
 int __sata_initialize(void)
@@ -38,7 +38,7 @@ int __sata_initialize(void)
        for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++) {
                memset(&sata_dev_desc[i], 0, sizeof(struct blk_desc));
                sata_dev_desc[i].if_type = IF_TYPE_SATA;
-               sata_dev_desc[i].dev = i;
+               sata_dev_desc[i].devnum = i;
                sata_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
                sata_dev_desc[i].type = DEV_TYPE_HARDDISK;
                sata_dev_desc[i].lba = 0;
@@ -183,7 +183,8 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        printf("\nSATA read: device %d block # %ld, count %ld ... ",
                                sata_curr_device, blk, cnt);
 
-                       n = sata_read(sata_curr_device, blk, cnt, (u32 *)addr);
+                       n = blk_dread(&sata_dev_desc[sata_curr_device],
+                                     blk, cnt, (u32 *)addr);
 
                        /* flush cache after read */
                        flush_cache(addr, cnt * sata_dev_desc[sata_curr_device].blksz);
@@ -201,7 +202,8 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        printf("\nSATA write: device %d block # %ld, count %ld ... ",
                                sata_curr_device, blk, cnt);
 
-                       n = sata_write(sata_curr_device, blk, cnt, (u32 *)addr);
+                       n = blk_dwrite(&sata_dev_desc[sata_curr_device],
+                                      blk, cnt, (u32 *)addr);
 
                        printf("%ld blocks written: %s\n",
                                n, (n == cnt) ? "OK" : "ERROR");