From 0887d33abe7ee5b3ddb92ef5e4eb3d71ac0ff469 Mon Sep 17 00:00:00 2001 From: Stefan Eichenberger Date: Fri, 28 Apr 2023 10:41:06 +0200 Subject: Revert "ata: ahci-imx: Do not disable APB clock" This reverts commit 2b311be08a61793e26757d5239ad9b79222962e5. This patch breaks SATA. We will apply another workaround which is known to work. Upstream-Status: Inappropriate [other] The reverted commit was never sent upstream Signed-off-by: Stefan Eichenberger --- drivers/ata/ahci_imx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index c717fed2e532..f038267c4068 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c @@ -614,6 +614,7 @@ disable_per_clk1: disable_per_clk0: clk_disable_unprepare(imxpriv->per_clk0); disable_phy_apbclk: + clk_disable_unprepare(imxpriv->phy_apbclk); disable_epcs_rx_clk: clk_disable_unprepare(imxpriv->epcs_rx_clk); disable_epcs_tx_clk: @@ -881,12 +882,14 @@ static int imx8_sata_enable(struct ahci_host_priv *hpriv) * To reduce the power consumption, gate off * the PHY clks */ + clk_disable_unprepare(imxpriv->phy_apbclk); clk_disable_unprepare(imxpriv->phy_pclk1); clk_disable_unprepare(imxpriv->phy_pclk0); return ret; } err_out: + clk_disable_unprepare(imxpriv->phy_apbclk); clk_disable_unprepare(imxpriv->phy_pclk1); clk_disable_unprepare(imxpriv->phy_pclk0); imx8_sata_clk_disable(imxpriv); -- cgit v1.2.3