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>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index e32c8fe729fffa8cc0f105e94b109f0763c2c3ec..6853dbb4131d8765ff8f1b013f0ba29e6e67bc22 100644 (file)
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -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 @@ out_disable_phys:
 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;
 }