From: Jim Quinlan <james.quinlan@broadcom.com>
To: linux-pci@vger.kernel.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Christoph Hellwig <hch@lst.de>,
bcm-kernel-feedback-list@broadcom.com,
james.quinlan@broadcom.com
Cc: Jim Quinlan <james.quinlan@broadcom.com>,
Jens Axboe <axboe@kernel.dk>,
Philipp Zabel <p.zabel@pengutronix.de>,
Florian Fainelli <f.fainelli@gmail.com>,
Hans de Goede <hdegoede@redhat.com>,
linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial
and Parallel ATA drivers)),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v8 02/12] ata: ahci_brcm: Fix use of BCM7216 reset controller
Date: Wed, 15 Jul 2020 10:35:05 -0400 [thread overview]
Message-ID: <20200715143530.9702-3-james.quinlan@broadcom.com> (raw)
In-Reply-To: <20200715143530.9702-1-james.quinlan@broadcom.com>
From: Jim Quinlan <jquinlan@broadcom.com>
A reset controller "rescal" is shared between the AHCI driver and the PCIe
driver for the BrcmSTB 7216 chip. Use
devm_reset_control_get_optional_shared() to handle this sharing.
Signed-off-by: Jim Quinlan <jquinlan@broadcom.com>
Fixes: 272ecd60a636 ("ata: ahci_brcm: BCM7216 reset is self de-asserting")
Fixes: c345ec6a50e9 ("ata: ahci_brcm: Support BCM7216 reset controller name")
---
drivers/ata/ahci_brcm.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 6853dbb4131d..d6115bc04b09 100644
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -428,7 +428,6 @@ static int brcm_ahci_probe(struct platform_device *pdev)
{
const struct of_device_id *of_id;
struct device *dev = &pdev->dev;
- const char *reset_name = NULL;
struct brcm_ahci_priv *priv;
struct ahci_host_priv *hpriv;
struct resource *res;
@@ -452,11 +451,10 @@ static int brcm_ahci_probe(struct platform_device *pdev)
/* Reset is optional depending on platform and named differently */
if (priv->version == BRCM_SATA_BCM7216)
- reset_name = "rescal";
+ priv->rcdev = devm_reset_control_get_optional_shared(&pdev->dev, "rescal");
else
- reset_name = "ahci";
+ priv->rcdev = devm_reset_control_get_optional(&pdev->dev, "ahci");
- priv->rcdev = devm_reset_control_get_optional(&pdev->dev, reset_name);
if (IS_ERR(priv->rcdev))
return PTR_ERR(priv->rcdev);
@@ -479,10 +477,7 @@ static int brcm_ahci_probe(struct platform_device *pdev)
break;
}
- if (priv->version == BRCM_SATA_BCM7216)
- ret = reset_control_reset(priv->rcdev);
- else
- ret = reset_control_deassert(priv->rcdev);
+ ret = reset_control_deassert(priv->rcdev);
if (ret)
return ret;
--
2.17.1
next prev parent reply other threads:[~2020-07-15 14:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 14:35 [PATCH v8 00/12] PCI: brcmstb: enable PCIe for STB chips Jim Quinlan
2020-07-15 14:35 ` Jim Quinlan [this message]
2020-07-20 23:27 ` Florian Fainelli
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=20200715143530.9702-3-james.quinlan@broadcom.com \
--to=james.quinlan@broadcom.com \
--cc=axboe@kernel.dk \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=hch@lst.de \
--cc=hdegoede@redhat.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=nsaenzjulienne@suse.de \
--cc=p.zabel@pengutronix.de \
/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).