ata: ahci_mvebu: add scsi support

Mvebu AHCI is AHCI driver which uses SCSI under the hood.
This patch adjusts AHCI setup to support SCSI by creating
a SCSI device as a child. Since the functions of creating
SCSI device need the kconfig option DM_SCSI, so let
AHCI_MVEBU select DM_SCSI.

Signed-off-by: Ken Ma <make@marvell.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 36e1748a4fa679b47e2ce6a6638922d677a44822..49a056e9416a55333004d03c6e5d27ea63261267 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -104,6 +104,7 @@ config AHCI_MVEBU
        depends on ARCH_MVEBU
        depends on AHCI
        select SCSI_AHCI
+       select DM_SCSI
        help
          This option enables support for the Marvell EBU SoC's
          onboard AHCI SATA.

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index c1d215f6b457d1558bd1e9d97eab1b3f971bd18d..6e3f17ee276d9c19c69c3058205c2a2c20a02a4a 100644 (file)
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -16,6 +16,20 @@ __weak int board_ahci_enable(void)
        return 0;
 }
 
+static int mvebu_ahci_bind(struct udevice *dev)
+{
+       struct udevice *scsi_dev;
+       int ret;
+
+       ret = ahci_bind_scsi(dev, &scsi_dev);
+       if (ret) {
+               debug("%s: Failed to bind (err=%d\n)", __func__, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
 static int mvebu_ahci_probe(struct udevice *dev)
 {
        /*
@@ -24,7 +38,7 @@ static int mvebu_ahci_probe(struct udevice *dev)
         */
        board_ahci_enable();
 
-       ahci_init(devfdt_get_addr_ptr(dev));
+       ahci_probe_scsi(dev, (ulong)devfdt_get_addr_ptr(dev));
 
        return 0;
 }
@@ -39,5 +53,6 @@ U_BOOT_DRIVER(ahci_mvebu_drv) = {
        .name           = "ahci_mvebu",
        .id             = UCLASS_AHCI,
        .of_match       = mvebu_ahci_ids,
+       .bind           = mvebu_ahci_bind,
        .probe          = mvebu_ahci_probe,
 };