Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"

[u-boot] / drivers / block / sata_ceva.c

diff --git a/drivers/block/sata_ceva.c b/drivers/block/sata_ceva.c
index 9b5466483aa42adec35ab0a3adabc686e7efd10f..dcc3b90b17f1157db4f56f30704dd4e448b62d1e 100644 (file)
--- a/drivers/block/sata_ceva.c
+++ b/drivers/block/sata_ceva.c
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
-#include <dm.h>
 #include <netdev.h>
 #include <ahci.h>
 #include <scsi.h>
@@ -74,9 +73,10 @@
 #define DRV_NAME       "ahci-ceva"
 #define CEVA_FLAG_BROKEN_GEN2  1
 
-static int ceva_init_sata(ulong mmio)
+int init_sata(int dev)
 {
        ulong tmp;
+       ulong mmio = ZYNQMP_SATA_BASEADDR;
        int i;
 
        /*
@@ -111,40 +111,3 @@ static int ceva_init_sata(ulong mmio)
        }
        return 0;
 }
-
-static int sata_ceva_probe(struct udevice *dev)
-{
-       struct scsi_platdata *plat = dev_get_platdata(dev);
-
-       ceva_init_sata(plat->base);
-       return 0;
-}
-
-static const struct udevice_id sata_ceva_ids[] = {
-       { .compatible = "ceva,ahci-1v84" },
-       { }
-};
-
-static int sata_ceva_ofdata_to_platdata(struct udevice *dev)
-{
-       struct scsi_platdata *plat = dev_get_platdata(dev);
-
-       plat->base = dev_get_addr(dev);
-       if (plat->base == FDT_ADDR_T_NONE)
-               return -EINVAL;
-
-       /* Hardcode number for ceva sata controller */
-       plat->max_lun = 1; /* Actually two but untested */
-       plat->max_id = 2;
-
-       return 0;
-}
-
-U_BOOT_DRIVER(ceva_host_blk) = {
-       .name = "ceva_sata",
-       .id = UCLASS_SCSI,
-       .of_match = sata_ceva_ids,
-       .probe = sata_ceva_probe,
-       .ofdata_to_platdata = sata_ceva_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct scsi_platdata),
-};