diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-24 12:18:13 +0800 |
commit | 0a296a966f183e4ef1fcb37940940e8df8c4f258 (patch) | |
tree | f3715d78e72389582ce2ad5dc5c59051f1814b4b /drivers/ata/ahci_platform.c | |
parent | 03d8016839b087e141e26472fabcf860bc05cf7d (diff) | |
parent | e429f243df2823451c92227317e5fce5f310b674 (diff) |
Merge tag 'v4.1.25' into linux-linaro-lsk-v4.1lsk-v4.1-16.05
This is the 4.1.25 stable release
Diffstat (limited to 'drivers/ata/ahci_platform.c')
-rw-r--r-- | drivers/ata/ahci_platform.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c index 78d6ae0b90c4..706af86bde6b 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -49,6 +49,9 @@ static int ahci_probe(struct platform_device *pdev) if (rc) return rc; + of_property_read_u32(dev->of_node, + "ports-implemented", &hpriv->force_port_map); + if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci")) hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ; |