From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/08] ARM: shmobile: Move clock.h
Date: Tue, 20 May 2014 07:58:21 +0000 [thread overview]
Message-ID: <20140520080017.13851.96123.sendpatchset@w520> (raw)
In-Reply-To: <20140520075949.13851.42995.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Change location of clock.h so it can be used as #include "clock.h"
instead of the old style #include <mach/clock.h>.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
arch/arm/mach-shmobile/board-genmai-reference.c | 2
arch/arm/mach-shmobile/board-koelsch-reference.c | 2
arch/arm/mach-shmobile/board-lager-reference.c | 2
arch/arm/mach-shmobile/board-marzen-reference.c | 2
arch/arm/mach-shmobile/clock-r8a73a4.c | 2
arch/arm/mach-shmobile/clock-r8a7740.c | 2
arch/arm/mach-shmobile/clock-r8a7778.c | 2
arch/arm/mach-shmobile/clock-r8a7779.c | 2
arch/arm/mach-shmobile/clock-r8a7790.c | 2
arch/arm/mach-shmobile/clock-r8a7791.c | 2
arch/arm/mach-shmobile/clock-sh7372.c | 2
arch/arm/mach-shmobile/clock-sh73a0.c | 2
arch/arm/mach-shmobile/clock.c | 4 -
arch/arm/mach-shmobile/clock.h | 56 ++++++++++++++++++++++
arch/arm/mach-shmobile/include/mach/clock.h | 56 ----------------------
15 files changed, 70 insertions(+), 70 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-genmai-reference.c
+++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-05-19 23:44:47.000000000 +0900
@@ -20,11 +20,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "clock.h"
/*
* This is a really crude hack to provide clkdev support to platform
--- 0001/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-05-19 23:45:09.000000000 +0900
@@ -23,12 +23,12 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
+#include "clock.h"
/* DU */
static struct rcar_du_encoder_data koelsch_du_encoders[] = {
--- 0002/arch/arm/mach-shmobile/board-lager-reference.c
+++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-05-19 23:45:28.000000000 +0900
@@ -22,12 +22,12 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
+#include "clock.h"
/* DU */
static struct rcar_du_encoder_data lager_du_encoders[] = {
--- 0001/arch/arm/mach-shmobile/board-marzen-reference.c
+++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-05-19 23:45:51.000000000 +0900
@@ -23,11 +23,11 @@
#include <linux/clocksource.h>
#include <linux/of_platform.h>
#include <mach/r8a7779.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/irqs.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
+#include "clock.h"
static void __init marzen_init_timer(void)
{
--- 0001/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-05-19 23:46:16.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
+#include "clock.h"
#define CPG_BASE 0xe6150000
#define CPG_LEN 0x270
--- 0001/arch/arm/mach-shmobile/clock-r8a7740.c
+++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-05-19 23:46:48.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r8a7740.h>
+#include "clock.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
--- 0001/arch/arm/mach-shmobile/clock-r8a7778.c
+++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-05-19 23:47:09.000000000 +0900
@@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
+#include "clock.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
--- 0001/arch/arm/mach-shmobile/clock-r8a7779.c
+++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-05-19 23:47:31.000000000 +0900
@@ -24,9 +24,9 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <linux/sh_timer.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r8a7779.h>
+#include "clock.h"
/*
* MD1 = 1 MD1 = 0
--- 0001/arch/arm/mach-shmobile/clock-r8a7790.c
+++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-05-19 23:47:50.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/r8a7790.h>
+#include "clock.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/clock-r8a7791.c
+++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-05-19 23:48:36.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
#include <mach/rcar-gen2.h>
+#include "clock.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0001/arch/arm/mach-shmobile/clock-sh7372.c
+++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-05-19 23:48:53.000000000 +0900
@@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
#include <mach/common.h>
+#include "clock.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)
--- 0001/arch/arm/mach-shmobile/clock-sh73a0.c
+++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-05-19 23:49:11.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
-#include <mach/clock.h>
#include <mach/common.h>
+#include "clock.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)
--- 0001/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2014-05-19 23:49:57.000000000 +0900
@@ -25,7 +25,7 @@
#ifdef CONFIG_COMMON_CLK
#include <linux/clk.h>
#include <linux/clkdev.h>
-#include <mach/clock.h>
+#include "clock.h"
void __init shmobile_clk_workaround(const struct clk_name *clks,
int nr_clks, bool enable)
@@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons
#else /* CONFIG_COMMON_CLK */
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/clock.h>
#include <mach/common.h>
+#include "clock.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{
--- /dev/null
+++ work/arch/arm/mach-shmobile/clock.h 2014-05-19 23:43:52.000000000 +0900
@@ -0,0 +1,56 @@
+#ifndef CLOCK_H
+#define CLOCK_H
+
+#ifdef CONFIG_COMMON_CLK
+/* temporary clock configuration helper for platform devices */
+
+struct clk_name {
+ const char *clk;
+ const char *con_id;
+ const char *dev_id;
+};
+
+void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks,
+ bool enable);
+
+#else /* CONFIG_COMMON_CLK */
+/* legacy clock implementation */
+
+struct clk;
+unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk);
+extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops;
+
+/* clock ratio */
+struct clk_ratio {
+ int mul;
+ int div;
+};
+
+#define SH_CLK_RATIO(name, m, d) \
+static struct clk_ratio name ##_ratio = { \
+ .mul = m, \
+ .div = d, \
+}
+
+#define SH_FIXED_RATIO_CLKg(name, p, r) \
+struct clk name = { \
+ .parent = &p, \
+ .ops = &shmobile_fixed_ratio_clk_ops,\
+ .priv = &r ## _ratio, \
+}
+
+#define SH_FIXED_RATIO_CLK(name, p, r) \
+static SH_FIXED_RATIO_CLKg(name, p, r)
+
+#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \
+ SH_CLK_RATIO(name, m, d); \
+ SH_FIXED_RATIO_CLK(name, p, name)
+
+#define SH_CLK_SET_RATIO(p, m, d) \
+do { \
+ (p)->mul = m; \
+ (p)->div = d; \
+} while (0)
+
+#endif /* CONFIG_COMMON_CLK */
+#endif
--- 0001/arch/arm/mach-shmobile/include/mach/clock.h
+++ /dev/null 2013-06-03 21:41:10.638032047 +0900
@@ -1,56 +0,0 @@
-#ifndef CLOCK_H
-#define CLOCK_H
-
-#ifdef CONFIG_COMMON_CLK
-/* temporary clock configuration helper for platform devices */
-
-struct clk_name {
- const char *clk;
- const char *con_id;
- const char *dev_id;
-};
-
-void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks,
- bool enable);
-
-#else /* CONFIG_COMMON_CLK */
-/* legacy clock implementation */
-
-struct clk;
-unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk);
-extern struct sh_clk_ops shmobile_fixed_ratio_clk_ops;
-
-/* clock ratio */
-struct clk_ratio {
- int mul;
- int div;
-};
-
-#define SH_CLK_RATIO(name, m, d) \
-static struct clk_ratio name ##_ratio = { \
- .mul = m, \
- .div = d, \
-}
-
-#define SH_FIXED_RATIO_CLKg(name, p, r) \
-struct clk name = { \
- .parent = &p, \
- .ops = &shmobile_fixed_ratio_clk_ops,\
- .priv = &r ## _ratio, \
-}
-
-#define SH_FIXED_RATIO_CLK(name, p, r) \
-static SH_FIXED_RATIO_CLKg(name, p, r)
-
-#define SH_FIXED_RATIO_CLK_SET(name, p, m, d) \
- SH_CLK_RATIO(name, m, d); \
- SH_FIXED_RATIO_CLK(name, p, name)
-
-#define SH_CLK_SET_RATIO(p, m, d) \
-do { \
- (p)->mul = m; \
- (p)->div = d; \
-} while (0)
-
-#endif /* CONFIG_COMMON_CLK */
-#endif
next prev parent reply other threads:[~2014-05-20 7:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 7:59 [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Magnus Damm
2014-05-20 7:58 ` [PATCH 02/08] ARM: shmobile: Move dma-register.h Magnus Damm
2014-05-20 7:58 ` Magnus Damm [this message]
2014-05-20 7:58 ` [PATCH 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm
2014-05-20 7:58 ` [PATCH 05/08] ARM: shmobile: Move common.h Magnus Damm
2014-05-20 7:58 ` [PATCH 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm
2014-05-20 7:59 ` [PATCH 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm
2014-05-20 7:59 ` [PATCH 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm
2014-05-20 7:59 ` [PATCH 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm
2014-06-06 9:11 ` [PATCH 00/08] ARM: shmobile: Rework include path (Try 2, Part 1) Geert Uytterhoeven
2014-06-06 10:14 ` Simon Horman
2014-06-06 10:24 ` Arnd Bergmann
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=20140520080017.13851.96123.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--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).