diff options
| author | Tang Yuantian <Yuantian.Tang@nxp.com> | 2016-09-30 14:13:13 +0800 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-09-30 10:28:51 +0200 |
| commit | 1ce788d24268a33513d832d9030ceab93f1c2ce2 (patch) | |
| tree | bbc34f596df5f8819bf056c30a6c99929c75a7b6 /drivers/ata | |
| parent | dcd3ea81f572fba57d18e91743a525a9787c1f6e (diff) | |
| download | linux-1ce788d24268a33513d832d9030ceab93f1c2ce2.tar.gz linux-1ce788d24268a33513d832d9030ceab93f1c2ce2.tar.bz2 linux-1ce788d24268a33513d832d9030ceab93f1c2ce2.zip | |
ahci: qoriq: Revert "ahci: qoriq: Disable NCQ on ls2080a SoC"
This reverts commit 640847298e2b7f19 ("ahci: qoriq: Disable NCQ
on ls2080a SoC")
The erratum has been fixed in ls2080a v2.0 and later soc.
In reality, customer will not get any ls2080a v1.0 soc. Neither apply
to any products. So reverting this commit won't create any side effect.
Blacklisting v2.0 could also be a option, but that needs to check the
soc version which is not suitable in the driver.
Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci_qoriq.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c index 925c4b6a753b..1eba8dff875e 100644 --- a/drivers/ata/ahci_qoriq.c +++ b/drivers/ata/ahci_qoriq.c @@ -136,7 +136,7 @@ static struct ata_port_operations ahci_qoriq_ops = { .hardreset = ahci_qoriq_hardreset, }; -static struct ata_port_info ahci_qoriq_port_info = { +static const struct ata_port_info ahci_qoriq_port_info = { .flags = AHCI_FLAG_COMMON | ATA_FLAG_NCQ, .pio_mask = ATA_PIO4, .udma_mask = ATA_UDMA6, @@ -221,12 +221,6 @@ static int ahci_qoriq_probe(struct platform_device *pdev) if (rc) goto disable_resources; - /* Workaround for ls2080a */ - if (qoriq_priv->type == AHCI_LS2080A) { - hpriv->flags |= AHCI_HFLAG_NO_NCQ; - ahci_qoriq_port_info.flags &= ~ATA_FLAG_NCQ; - } - rc = ahci_platform_init_host(pdev, hpriv, &ahci_qoriq_port_info, &ahci_qoriq_sht); if (rc) |