p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ata: ahci_brcm: BCM7216 reset is self de-asserting 

The BCM7216 reset controller line is self-deasserting, unlike other
platforms, so make use of reset_control_reset() instead of
reset_control_deassert().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Florian Fainelli 2020-01-17 15:53:13 -08:00 committed by Jens Axboe
parent 1a0600d112
commit 272ecd60a6
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ata/ahci_brcm.c
View File

@ -352,7 +352,8 @@ static int brcm_ahci_suspend(struct device *dev)
else
ret = 0;
reset_control_assert(priv->rcdev);
if (priv->version != BRCM_SATA_BCM7216)
reset_control_assert(priv->rcdev);
return ret;
}
@ -364,7 +365,10 @@ static int __maybe_unused brcm_ahci_resume(struct device *dev)
struct brcm_ahci_priv *priv = hpriv->plat_data;
int ret = 0;
ret = reset_control_deassert(priv->rcdev);
if (priv->version == BRCM_SATA_BCM7216)
ret = reset_control_reset(priv->rcdev);
else
ret = reset_control_deassert(priv->rcdev);
if (ret)
return ret;
@ -475,7 +479,10 @@ static int brcm_ahci_probe(struct platform_device *pdev)
break;
}
ret = reset_control_deassert(priv->rcdev);
if (priv->version == BRCM_SATA_BCM7216)
ret = reset_control_reset(priv->rcdev);
else
ret = reset_control_deassert(priv->rcdev);
if (ret)
return ret;
@ -520,7 +527,8 @@ static int brcm_ahci_probe(struct platform_device *pdev)
out_disable_clks:
ahci_platform_disable_clks(hpriv);
out_reset:
reset_control_assert(priv->rcdev);
if (priv->version != BRCM_SATA_BCM7216)
reset_control_assert(priv->rcdev);
return ret;
}