leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: pci: scsi: Use driver-model PCI API

Browse Source 
Adjust the SCSI command to use driver model for its PCI interface.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-11-29 13:17:51 -07:00
parent 5c0bf647c4
commit 9fbdb94667
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/cmd_scsi.c
View File

@ -184,7 +184,7 @@ int scsi_get_disk_count(void)
#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT) #if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
void scsi_init(void) void scsi_init(void)
{ {
int busdevfunc; int busdevfunc = -1;
int i; int i;
/* /*
* Find a device from the list, this driver will support a single * Find a device from the list, this driver will support a single
@ -192,9 +192,21 @@ void scsi_init(void)
*/ */
for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) { for (i = 0; i < ARRAY_SIZE(scsi_device_list); i++) {
/* get PCI Device ID */ /* get PCI Device ID */
#ifdef CONFIG_DM_PCI
struct udevice *dev;
int ret;
ret = dm_pci_find_device(scsi_device_list[i].vendor,
scsi_device_list[i].device, 0, &dev);
if (!ret) {
busdevfunc = dm_pci_get_bdf(dev);
break;
}
#else
busdevfunc = pci_find_device(scsi_device_list[i].vendor, busdevfunc = pci_find_device(scsi_device_list[i].vendor,
scsi_device_list[i].device, scsi_device_list[i].device,
0); 0);
#endif
if (busdevfunc != -1) if (busdevfunc != -1)
break; break;
} }