| From 4a4edd625618585b7088d67d915d167738b17915 Mon Sep 17 00:00:00 2001 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Fri, 28 Feb 2020 22:38:38 +0100 |
| Subject: [PATCH] spi: bcm63xx-hsspi: Really keep pll clk enabled |
| |
| commit 51bddd4501bc414b8b1e8f4d096b4a5304068169 upstream. |
| |
| The purpose of commit 0fd85869c2a9 ("spi/bcm63xx-hsspi: keep pll clk enabled") |
| was to keep the pll clk enabled through the lifetime of the device. |
| |
| In order to do that, some 'clk_prepare_enable()'/'clk_disable_unprepare()' |
| calls have been added in the error handling path of the probe function, in |
| the remove function and in the suspend and resume functions. |
| |
| However, a 'clk_disable_unprepare()' call has been unfortunately left in |
| the probe function. So the commit seems to be more or less a no-op. |
| |
| Axe it now, so that the pll clk is left enabled through the lifetime of |
| the device, as described in the commit. |
| |
| Fixes: 0fd85869c2a9 ("spi/bcm63xx-hsspi: keep pll clk enabled") |
| Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Acked-by: Jonas Gorski <jonas.gorski@gmail.com> |
| Link: https://lore.kernel.org/r/20200228213838.7124-1-christophe.jaillet@wanadoo.fr |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c |
| index 9a06ffdb73b8..1669c554ea34 100644 |
| --- a/drivers/spi/spi-bcm63xx-hsspi.c |
| +++ b/drivers/spi/spi-bcm63xx-hsspi.c |
| @@ -371,7 +371,6 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) |
| goto out_disable_clk; |
| |
| rate = clk_get_rate(pll_clk); |
| - clk_disable_unprepare(pll_clk); |
| if (!rate) { |
| ret = -EINVAL; |
| goto out_disable_pll_clk; |
| -- |
| 2.7.4 |
| |