From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: [PATCH 5/9] ata: ahci_brcm: Allow optional reset controller to be used Date: Thu, 20 Sep 2018 12:16:40 -0700 Message-ID: <20180920191646.18198-7-f.fainelli@gmail.com> References: <20180920191646.18198-1-f.fainelli@gmail.com> Return-path: In-Reply-To: <20180920191646.18198-1-f.fainelli@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Jens Axboe , Rob Herring , Mark Rutland , Kishon Vijay Abraham I , Al Cooper , Ray Jui , Tejun Heo , Fengguang Wu , Arnd Bergmann , "open list:LIBATA SUBSYSTEM Serial and Parallel ATA drivers" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , bcm-kernel-feedback-list@broadcom.com List-Id: devicetree@vger.kernel.org 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 --- drivers/ata/ahci_brcm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c index f3d557777d82..d535e87151dc 100644 --- a/drivers/ata/ahci_brcm.c +++ b/drivers/ata/ahci_brcm.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #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,10 @@ static int brcm_ahci_probe(struct platform_device *pdev) if (IS_ERR(priv->top_ctrl)) return PTR_ERR(priv->top_ctrl); + priv->rcdev = of_reset_control_get(pdev->dev.of_node, NULL); + if (!IS_ERR(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; @@ -464,6 +470,9 @@ static int brcm_ahci_remove(struct platform_device *pdev) brcm_sata_phys_disable(priv); + if (!IS_ERR(priv->rcdev)) + reset_control_assert(priv->rcdev); + return 0; } -- 2.17.1