diff options
| author | Irina Tirdea <irina.tirdea@nxp.com> | 2017-02-14 10:37:56 +0200 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-08 20:58:49 +0800 |
| commit | 4c436d7312273ce38210af333579d4349b735a0c (patch) | |
| tree | cfebfc7a892a29c4216b5037450ad83076ff003a /drivers/clk | |
| parent | 5be26f45bb56dd095e08c72f65dbd6812e518893 (diff) | |
MLK-13869 Revert "ARM: imx: add sleep for pllv3 relock"
This reverts commit 322503a15740bd9383bb4ed452e5dd5a40598170.
The driver for clk-pllv3 has moved from arch/arm/mach-imx/clk-pllv3.c
to drivers/clk/imx/clk-pllv3.c since the orginal change was made,
so the revert is done to the new file instead.
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/imx/clk-pllv3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c index 38dd536a7ccb..d8b481936f20 100644 --- a/drivers/clk/imx/clk-pllv3.c +++ b/drivers/clk/imx/clk-pllv3.c @@ -11,7 +11,6 @@ */ #include <linux/clk-provider.h> -#include <linux/delay.h> #include <linux/imx_sema4.h> #include <linux/io.h> #include <linux/slab.h> @@ -72,7 +71,6 @@ static int clk_pllv3_wait_lock(struct clk_pllv3 *pll) break; if (time_after(jiffies, timeout)) break; - usleep_range(50, 500); } while (1); return readl_relaxed(pll->base) & BM_PLL_LOCK ? 0 : -ETIMEDOUT; |