MLK-9961-1 Revert "MLK-10091 arm: imx: check pll1 enable when changing arm_podf"

This reverts commit 8cc908a0168afb677b5de6405579b681b6f595db.

Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>

diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
index f45a2a9c4f80d3526f2c596b9fef65a8534bb9ba..45f17c7ca1f3f6eb3fb6e95b2abd2675ee321ac7 100644 (file)
--- a/arch/arm/mach-imx/clk-busy.c
+++ b/arch/arm/mach-imx/clk-busy.c
@@ -18,22 +18,14 @@
 #include <linux/err.h>
 #include "clk.h"
 
-#define ARM_PODF_BUSY  (0x1 << 16)
-
 static int clk_busy_wait(void __iomem *reg, u8 shift)
 {
        unsigned long timeout = jiffies + msecs_to_jiffies(10);
 
-       u32 val = readl_relaxed(reg);
-       if (val & ARM_PODF_BUSY)
-               imx_enable_pll_arm(true);
-
        while (readl_relaxed(reg) & (1 << shift))
                if (time_after(jiffies, timeout))
                        return -ETIMEDOUT;
 
-       if (val & ARM_PODF_BUSY)
-               imx_enable_pll_arm(false);
        return 0;
 }
 

diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c
index 6cad1a07aefcc9b5e1ae7c60b9e4b32fad11eded..08451d6ff04f1bbe9dcd86975e790bc4cf49114c 100644 (file)
--- a/arch/arm/mach-imx/clk-pllv3.c
+++ b/arch/arm/mach-imx/clk-pllv3.c
@@ -26,10 +26,7 @@
 
 #define BM_PLL_POWER           (0x1 << 12)
 #define BM_PLL_LOCK            (0x1 << 31)
-#define BM_PLL_ENABLE          (0x1 << 13)
-#define BM_PLL_BYPASS          (0x1 << 16)
 
-static void __iomem *pll_sys_base;
 /**
  * struct clk_pllv3 - IMX PLL clock version 3
  * @clk_hw:     clock source
@@ -338,7 +335,6 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
        switch (type) {
        case IMX_PLLV3_SYS:
                ops = &clk_pllv3_sys_ops;
-               pll_sys_base = base;
                break;
        case IMX_PLLV3_USB:
                ops = &clk_pllv3_ops;
@@ -370,18 +366,3 @@ struct clk *imx_clk_pllv3(enum imx_pllv3_type type, const char *name,
 
        return clk;
 }
-
-void imx_enable_pll_arm(bool enable)
-{
-       static u32 saved_pll_arm;
-       u32 val;
-
-       if (enable) {
-               saved_pll_arm = val = readl_relaxed(pll_sys_base);
-               val |= BM_PLL_ENABLE;
-               val |= BM_PLL_BYPASS;
-               writel_relaxed(val, pll_sys_base);
-       } else {
-               writel_relaxed(saved_pll_arm, pll_sys_base);
-       }
-}

diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h
index 4a187fc25214757919653df2c7579077e5828259..043bd6ab8053296416d90a925f8254cf4c63f59e 100644 (file)
--- a/arch/arm/mach-imx/clk.h
+++ b/arch/arm/mach-imx/clk.h
@@ -7,7 +7,6 @@
 extern spinlock_t imx_ccm_lock;
 
 extern void imx_cscmr1_fixup(u32 *val);
-extern void imx_enable_pll_arm(bool);
 extern struct imx_sema4_mutex *amp_power_mutex;
 extern struct imx_shared_mem *shared_mem;