From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com,
Florian Fainelli <f.fainelli@gmail.com>,
Jens Axboe <axboe@kernel.dk>, Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Hans de Goede <hdegoede@redhat.com>,
Philipp Zabel <p.zabel@pengutronix.de>, Tejun Heo <tj@kernel.org>,
Jaedon Shin <jaedon.shin@gmail.com>,
linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial
and Parallel ATA drivers)),
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
FLATTENED DEVICE TREE BINDINGS)
Subject: [PATCH v3 3/3] ata: ahci_brcm: BCM7216 reset is self de-asserting
Date: Tue, 7 Jan 2020 10:30:22 -0800 [thread overview]
Message-ID: <20200107183022.26224-4-f.fainelli@gmail.com> (raw)
In-Reply-To: <20200107183022.26224-1-f.fainelli@gmail.com>
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>
---
drivers/ata/ahci_brcm.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index c229fea39a47..62c948e56beb 100644
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -352,7 +352,10 @@ static int brcm_ahci_suspend(struct device *dev)
if (ret)
return ret;
- return reset_control_assert(priv->rcdev);
+ if (priv->version != BRCM_SATA_BCM7216)
+ ret = reset_control_assert(priv->rcdev);
+
+ return ret;
}
static int brcm_ahci_resume(struct device *dev)
@@ -362,7 +365,10 @@ static int 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 +481,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 +529,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;
}
--
2.17.1
next prev parent reply other threads:[~2020-01-07 18:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 18:30 [PATCH v3 0/3] ata: ahci_brcm: Follow-up changes for BCM7216 Florian Fainelli
2020-01-07 18:30 ` [PATCH v3 1/3] ata: ahci_brcm: Correct reset control API usage Florian Fainelli
2020-01-07 18:30 ` [PATCH v3 2/3] ata: ahci_brcm: Perform reset after obtaining resources Florian Fainelli
2020-01-07 18:30 ` Florian Fainelli [this message]
2020-01-07 18:47 ` [PATCH v3 0/3] ata: ahci_brcm: Follow-up changes for BCM7216 Hans de Goede
2020-01-08 9:25 ` Philipp Zabel
2020-01-17 4:44 ` Florian Fainelli
2020-01-17 4:51 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200107183022.26224-4-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=axboe@kernel.dk \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=devicetree@vger.kernel.org \
--cc=hdegoede@redhat.com \
--cc=jaedon.shin@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).