ARM: OMAP4+: dpll44xx: remove cm-regbits-44xx.h and clock44xx.h includes

Instead, copy the used bitfield definitions to the source file. Done in
preparation to migrate the clock implementation under clock driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Reviewed-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Paul Walmsley <paul@pwsan.com>

diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c
index b0718911f380270825f5ef82243b99f959901947..4613f1e86988751072826fb549a0f920d7df25e8 100644 (file)
--- a/arch/arm/mach-omap2/dpll44xx.c
+++ b/arch/arm/mach-omap2/dpll44xx.c
@@ -16,8 +16,6 @@
 #include <linux/bitops.h>
 
 #include "clock.h"
-#include "clock44xx.h"
-#include "cm-regbits-44xx.h"
 
 /*
  * Maximum DPLL input frequency (FINT) and output frequency (FOUT) that
@@ -28,6 +26,16 @@
 #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)
 {