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

[karo-tx-linux.git] / arch / arm / mach-imx / clk-pllv3.c

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);
-       }
-}