ARM: integrator: localize the impd1.h header

As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the impd1.h
header down to the machine folder, copying the the three defines
only used by the clock driver down into the clock driver.

Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index a90e83fe8776c668d61f1e122306eedc258f7081..0e870ea818c4e6acd87a48626a994f9bf1ce3016 100644 (file)
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -25,9 +25,9 @@
 #include <linux/slab.h>
 #include <linux/irqchip/arm-vic.h>
 
-#include <mach/impd1.h>
 #include <asm/sizes.h>
 #include "lm.h"
+#include "impd1.h"
 
 static int module_id;
 

diff --git a/arch/arm/mach-integrator/impd1.h b/arch/arm/mach-integrator/impd1.h
new file mode 100644 (file)
index 0000000..76de4dc
--- /dev/null
+++ b/arch/arm/mach-integrator/impd1.h
@@ -0,0 +1,14 @@
+#define IMPD1_LEDS     0x0c
+#define IMPD1_INT      0x10
+#define IMPD1_SW       0x14
+#define IMPD1_CTRL     0x18
+
+#define IMPD1_CTRL_DISP_LCD    (0 << 0)
+#define IMPD1_CTRL_DISP_VGA    (1 << 0)
+#define IMPD1_CTRL_DISP_LCD1   (2 << 0)
+#define IMPD1_CTRL_DISP_ENABLE (1 << 2)
+#define IMPD1_CTRL_DISP_MASK   (7 << 0)
+
+struct device;
+
+void impd1_tweak_control(struct device *dev, u32 mask, u32 val);

diff --git a/arch/arm/mach-integrator/include/mach/impd1.h b/arch/arm/mach-integrator/include/mach/impd1.h
deleted file mode 100644 (file)
index d75de4b..0000000
--- a/arch/arm/mach-integrator/include/mach/impd1.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#define IMPD1_OSC1     0x00
-#define IMPD1_OSC2     0x04
-#define IMPD1_LOCK     0x08
-#define IMPD1_LEDS     0x0c
-#define IMPD1_INT      0x10
-#define IMPD1_SW       0x14
-#define IMPD1_CTRL     0x18
-
-#define IMPD1_CTRL_DISP_LCD    (0 << 0)
-#define IMPD1_CTRL_DISP_VGA    (1 << 0)
-#define IMPD1_CTRL_DISP_LCD1   (2 << 0)
-#define IMPD1_CTRL_DISP_ENABLE (1 << 2)
-#define IMPD1_CTRL_DISP_MASK   (7 << 0)
-
-struct device;
-
-void impd1_tweak_control(struct device *dev, u32 mask, u32 val);
-

diff --git a/drivers/clk/versatile/clk-impd1.c b/drivers/clk/versatile/clk-impd1.c
index 6d8b8e1a080ab0c695e694bcfff63b442f0e0bbf..31b44f025f9e2af0a85941f71b8a6d006d806346 100644 (file)
--- a/drivers/clk/versatile/clk-impd1.c
+++ b/drivers/clk/versatile/clk-impd1.c
@@ -13,10 +13,12 @@
 #include <linux/io.h>
 #include <linux/platform_data/clk-integrator.h>
 
-#include <mach/impd1.h>
-
 #include "clk-icst.h"
 
+#define IMPD1_OSC1     0x00
+#define IMPD1_OSC2     0x04
+#define IMPD1_LOCK     0x08
+
 struct impd1_clk {
        char *vco1name;
        struct clk *vco1clk;