From: linus.walleij@linaro.org (Linus Walleij)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] ARM: integrator: localize the impd1.h header
Date: Fri, 14 Feb 2014 11:29:27 +0100 [thread overview]
Message-ID: <1392373771-17303-3-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1392373771-17303-1-git-send-email-linus.walleij@linaro.org>
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>
---
Hi Mike, looking for an ACK on this patch.
---
arch/arm/mach-integrator/impd1.c | 2 +-
arch/arm/mach-integrator/impd1.h | 14 ++++++++++++++
arch/arm/mach-integrator/include/mach/impd1.h | 18 ------------------
drivers/clk/versatile/clk-impd1.c | 6 ++++--
4 files changed, 19 insertions(+), 21 deletions(-)
create mode 100644 arch/arm/mach-integrator/impd1.h
delete mode 100644 arch/arm/mach-integrator/include/mach/impd1.h
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index a90e83fe8776..0e870ea818c4 100644
--- 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
index 000000000000..76de4dc9bee4
--- /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
index d75de4b14237..000000000000
--- 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 6d8b8e1a080a..31b44f025f9e 100644
--- 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;
--
1.8.5.3
next prev parent reply other threads:[~2014-02-14 10:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 10:29 [PATCH 0/6] ARM: integrator: multiplatform advancements Linus Walleij
2014-02-14 10:29 ` [PATCH 1/6] ARM: integrator: localize the lm.h header Linus Walleij
2014-02-14 10:29 ` Linus Walleij [this message]
2014-02-14 10:29 ` [PATCH 3/6] ARM: integrator: merge platform.h to hardware.h Linus Walleij
2014-02-14 10:29 ` [PATCH 4/6] ARM: integrator: localize the hardware.h header Linus Walleij
2014-02-14 10:29 ` [PATCH 5/6] ARM: integrator: register sched_clock directly Linus Walleij
2014-02-14 10:29 ` [PATCH 6/6] RFC: ARM: integrator: get rid of <mach/memory.h> Linus Walleij
2014-02-14 12:02 ` Arnd Bergmann
2014-02-14 13:47 ` [PATCH 0/6] ARM: integrator: multiplatform advancements Russell King - ARM Linux
2014-02-24 9:37 ` Linus Walleij
2014-03-05 16:19 ` Pawel Moll
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392373771-17303-3-git-send-email-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).