| From 90c46084d324d1468ff19ab5fd93a3903abb05d3 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Tue, 17 Jun 2014 16:47:21 +0900 |
| Subject: ARM: shmobile: Move clock.h |
| |
| 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> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit ad6ffa0b59dc2c81474d7642fa2188e25cce99d6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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/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/{include/mach => }/clock.h | 0 |
| 13 files changed, 13 insertions(+), 13 deletions(-) |
| rename arch/arm/mach-shmobile/{include/mach => }/clock.h (100%) |
| |
| diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c |
| index 2ff6ad6e608e..c3535858eff8 100644 |
| --- a/arch/arm/mach-shmobile/board-genmai-reference.c |
| +++ b/arch/arm/mach-shmobile/board-genmai-reference.c |
| @@ -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 |
| diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c |
| index d322a162b4b0..4a6dd63f75a8 100644 |
| --- a/arch/arm/mach-shmobile/board-koelsch-reference.c |
| +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c |
| @@ -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[] = { |
| diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c |
| index 749832e3f33c..1d198b029c07 100644 |
| --- a/arch/arm/mach-shmobile/board-lager-reference.c |
| +++ b/arch/arm/mach-shmobile/board-lager-reference.c |
| @@ -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[] = { |
| diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c |
| index b5bc22c6a858..857b142e4af9 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a73a4.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a73a4.c |
| @@ -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 |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c |
| index 50931e3c97c7..6986527da6f0 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7740.c |
| @@ -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 | |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c |
| index 13f8f3ab8840..017fa503c2b8 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7778.c |
| @@ -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) |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c |
| index a13298bd37a8..eb7b13187057 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7779.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7779.c |
| @@ -23,8 +23,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" |
| |
| /* |
| * MD1 = 1 MD1 = 0 |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c |
| index 296a057109e4..8c6244609cbe 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7790.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7790.c |
| @@ -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 |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c |
| index e2fdfcc14436..20cad4a4d741 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7791.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7791.c |
| @@ -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 |
| diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c |
| index d16d9ca7f79e..b19bc7e50a9a 100644 |
| --- a/arch/arm/mach-shmobile/clock-sh7372.c |
| +++ b/arch/arm/mach-shmobile/clock-sh7372.c |
| @@ -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) |
| diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c |
| index 0d9cd1fe0212..3956b95ef99b 100644 |
| --- a/arch/arm/mach-shmobile/clock-sh73a0.c |
| +++ b/arch/arm/mach-shmobile/clock-sh73a0.c |
| @@ -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) |
| diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c |
| index e7232a0373b9..2a58a782e203 100644 |
| --- a/arch/arm/mach-shmobile/clock.c |
| +++ b/arch/arm/mach-shmobile/clock.c |
| @@ -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(const struct clk_name *clks, |
| #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) |
| { |
| diff --git a/arch/arm/mach-shmobile/include/mach/clock.h b/arch/arm/mach-shmobile/clock.h |
| similarity index 100% |
| rename from arch/arm/mach-shmobile/include/mach/clock.h |
| rename to arch/arm/mach-shmobile/clock.h |
| -- |
| 2.1.2 |
| |