1 files changed, 13 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c
index 52f9438b92f2..4613f1e86988 100644
--- a/arch/arm/mach-omap2/dpll44xx.c
+++ b/arch/arm/mach-omap2/dpll44xx.c
@@ -15,10 +15,7 @@
 #include <linux/io.h>
 #include <linux/bitops.h>
 
-#include "soc.h"
 #include "clock.h"
-#include "clock44xx.h"
-#include "cm-regbits-44xx.h"
 
 /*
  * Maximum DPLL input frequency (FINT) and output frequency (FOUT) that
@@ -29,13 +26,23 @@
 #define OMAP4_DPLL_LP_FINT_MAX  1000000
 #define OMAP4_DPLL_LP_FOUT_MAX  100000000
 
+/*
+ * Bitfield declarations
+ */
+#define OMAP4430_DPLL_CLKOUT_GATE_CTRL_MASK             (1 << 8)
+#define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_MASK           (1 << 10)
+#define OMAP4430_DPLL_REGM4XEN_MASK                     (1 << 11)
+
+/* Static rate multiplier for OMAP4 REGM4XEN clocks */
+#define OMAP4430_REGM4XEN_MULT                          4
+
 /* Supported only on OMAP4 */
 int omap4_dpllmx_gatectrl_read(struct clk_hw_omap *clk)
 {
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return -EINVAL;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?
@@ -54,7 +61,7 @@ void omap4_dpllmx_allow_gatectrl(struct clk_hw_omap *clk)
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?
@@ -72,7 +79,7 @@ void omap4_dpllmx_deny_gatectrl(struct clk_hw_omap *clk)
         u32 v;
         u32 mask;
 
-        if (!clk || !clk->clksel_reg || !cpu_is_omap44xx())
+        if (!clk || !clk->clksel_reg)
                 return;
 
         mask = clk->flags & CLOCK_CLKOUTX2 ?