summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authortang yuantian <Yuantian.Tang@freescale.com>2015-03-20 10:27:54 +0800
committerTom Rini <trini@konsulko.com>2015-04-22 12:14:56 -0400
commit1a1cf6ee47409d44573de3adbcabd2d0f5520cad (patch)
treef81e92bfdfc3b7c4a61db3b6cf1fcb07f805b5d8 /common
parented09a554be3ce7974cf61715a286a1b6b547fdbd (diff)
cmd_scsi: Enable SoC AHCI device on platforms with PCI
Current driver assumes the AHCI is connected to PCI, this is not true on some SoCs, e.g. LS1021A, which has PCI but the AHCI is in SoC. This patch will enable embedded AHCI devices on platforms with PCI. PCI AHCI devices still can be used by commenting CONFIG_SCSI_AHCI_PLAT option in head file. Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index a0a62ebdca8..f80f549d4e1 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -37,7 +37,7 @@
#define SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID}
#endif
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
const struct pci_device_id scsi_device_list[] = { SCSI_DEV_LIST };
#endif
static ccb tempccb; /* temporary scsi command buffer */
@@ -179,7 +179,7 @@ int scsi_get_disk_count(void)
return scsi_max_devs;
}
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
void scsi_init(void)
{
int busdevfunc;