From: Ken Ma make@marvell.com
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 ---
Changes in v4: - Let AHCI_MVEBU select DM_SCSI This patch adds scsi support by creating a SCSI device as a child of mvebu ahci device; the functions of creating SCSI device need the kconfig option DM_SCSI, so let AHCI_MVEBU select DM_SCSI.
Changes in v3: None Changes in v2: None
drivers/ata/Kconfig | 1 + drivers/ata/ahci_mvebu.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 36e1748..49a056e 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 c1d215f..6e3f17e 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, };