From 0545ac989d54c0467990a35c05ec28a817b07828 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 13 Sep 2018 01:28:55 +0300 Subject: [PATCH] ata: ahci: Don't cap AHCI port count under CONFIG_DM_SCSI When using device model this sort of hardcoded limits aren't used or necessary. Signed-off-by: Tuomas Tynkkynen Reviewed-by: Simon Glass --- drivers/ata/ahci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 333f0457f6..5fafb63aeb 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -230,8 +230,10 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv) debug("cap 0x%x port_map 0x%x n_ports %d\n", uc_priv->cap, uc_priv->port_map, uc_priv->n_ports); +#if !defined(CONFIG_DM_SCSI) if (uc_priv->n_ports > CONFIG_SYS_SCSI_MAX_SCSI_ID) uc_priv->n_ports = CONFIG_SYS_SCSI_MAX_SCSI_ID; +#endif for (i = 0; i < uc_priv->n_ports; i++) { if (!(port_map & (1 << i))) -- 2.25.1