diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2018-10-01 10:33:00 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-01 16:39:09 -0600 |
| commit | 2b2c47d9e1fe90311b725125d6252a859ee87a79 (patch) | |
| tree | e06fcf427e9421604eb1899a0976bf7d309e3c15 /drivers/ata | |
| parent | d6dc71d1468f7611b18c740d6f78e7f2f3fa726b (diff) | |
| download | linux-stable-2b2c47d9e1fe90311b725125d6252a859ee87a79.tar.gz linux-stable-2b2c47d9e1fe90311b725125d6252a859ee87a79.tar.bz2 linux-stable-2b2c47d9e1fe90311b725125d6252a859ee87a79.zip | |
ata: ahci_brcm: Allow optional reset controller to be used
On BCM63138, we need to reset the AHCI core prior to start utilizing it,
grab the reset controller device cookie and do that.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/ahci_brcm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index f3d557777d82..0e401b7c0856 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -25,6 +25,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/reset.h> #include <linux/string.h> #include "ahci.h" @@ -94,6 +95,7 @@ struct brcm_ahci_priv { u32 port_mask; u32 quirks; enum brcm_ahci_version version; + struct reset_control *rcdev; }; static inline u32 brcm_sata_readreg(void __iomem *addr) @@ -411,6 +413,11 @@ static int brcm_ahci_probe(struct platform_device *pdev) if (IS_ERR(priv->top_ctrl)) return PTR_ERR(priv->top_ctrl); + /* Reset is optional depending on platform */ + priv->rcdev = devm_reset_control_get(&pdev->dev, "ahci"); + if (!IS_ERR_OR_NULL(priv->rcdev)) + reset_control_deassert(priv->rcdev); + if ((priv->version == BRCM_SATA_BCM7425) || (priv->version == BRCM_SATA_NSP)) { priv->quirks |= BRCM_AHCI_QUIRK_NO_NCQ; |