summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKen Ma <make@marvell.com>2018-05-25 15:49:26 +0800
committerStefan Roese <sr@denx.de>2018-05-29 08:33:05 +0200
commit6ac8538b0bcbe749bb358b7d134026a510d741e3 (patch)
treebe980f34a081fe65913dd5f73133bbdd4ac7bf0e /drivers
parent329dd3244fd8ba44538b7f10caff220c1a91d16e (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/Kconfig1
-rw-r--r--drivers/ata/ahci_mvebu.c17
2 files changed, 17 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 36e1748a4f..49a056e941 100644
--- 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 c1d215f6b4..6e3f17ee27 100644
--- 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,
};