From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 12 Sep 2018 22:28:55 +0000 (+0300)
Subject: ata: ahci: Don't cap AHCI port count under CONFIG_DM_SCSI
X-Git-Tag: v2018.11-rc1~88
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0545ac989d54c0467990a35c05ec28a817b07828;p=oweals%2Fu-boot.git

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 <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

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)))