diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2020-06-11 12:03:19 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-07 18:23:48 -0400 |
| commit | 44a4042b01b547a100c387538196dacfa28b88f4 (patch) | |
| tree | fce7269c7c166978d02ac9eae607abda71dcea47 /drivers/ata/sata_sil.c | |
| parent | cc696e7caec612c1e334db8cd729e0045662bf00 (diff) | |
| download | u-boot-44a4042b01b547a100c387538196dacfa28b88f4.tar.gz u-boot-44a4042b01b547a100c387538196dacfa28b88f4.tar.bz2 u-boot-44a4042b01b547a100c387538196dacfa28b88f4.zip | |
sata_sil: Enable DM_PCI operation
Even though the sata_sil driver was converted over to the driver model,
it still assumed that the PCI controller is using the legacy interface.
Allow the "devno" member to be a struct udevice pointer and use
DM_PCI_COMPAT to covert the rest of the interface.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/ata/sata_sil.c')
| -rw-r--r-- | drivers/ata/sata_sil.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 6896fa8771..d5ba94c172 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -27,7 +27,11 @@ #include "sata_sil.h" +#ifdef CONFIG_DM_PCI +#define virt_to_bus(devno, v) dm_pci_virt_to_mem(devno, (void *) (v)) +#else #define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) +#endif /* just compatible ahci_ops */ struct sil_ops { @@ -608,13 +612,18 @@ static int sil_init_sata(struct udevice *uc_dev, int dev) /* Save the private struct to block device struct */ #if !CONFIG_IS_ENABLED(BLK) sata_dev_desc[dev].priv = (void *)sata; + sata->devno = sata_info.devno; #else priv->sil_sata_desc[dev] = sata; priv->port_num = dev; +#ifdef CONFIG_DM_PCI + sata->devno = uc_dev->parent; +#else + sata->devno = sata_info.devno; +#endif /* CONFIG_DM_PCI */ #endif sata->id = dev; sata->port = port; - sata->devno = sata_info.devno; sprintf(sata->name, "SATA#%d", dev); sil_cmd_soft_reset(sata); tmp = readl(port + PORT_SSTATUS); |