| From 6b3f8f431e744032334ca44993cfb3b4e2b10c3e Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Tue, 17 Jun 2014 16:47:45 +0900 |
| Subject: ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h |
| |
| Change location of pm-rmobile.h so it can be used as #include "pm-rmobile.h" |
| instead of the old style #include <mach/pm-rmobile.h>. Also clean up |
| the sh7372 and sh73a0 header files to get rid of unused include files. |
| |
| 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 6b8b0cb477b3e77721982effae3415f3c5f58fee) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 1 + |
| arch/arm/mach-shmobile/board-mackerel.c | 2 ++ |
| arch/arm/mach-shmobile/include/mach/r8a7740.h | 2 -- |
| arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ---- |
| arch/arm/mach-shmobile/pm-r8a7740.c | 2 +- |
| arch/arm/mach-shmobile/pm-rmobile.c | 2 +- |
| arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h | 0 |
| arch/arm/mach-shmobile/pm-sh7372.c | 2 +- |
| arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- |
| arch/arm/mach-shmobile/setup-sh7372.c | 1 + |
| 10 files changed, 8 insertions(+), 10 deletions(-) |
| rename arch/arm/mach-shmobile/{include/mach => }/pm-rmobile.h (100%) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 93d92b4409bd..284877ae9c83 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -61,6 +61,7 @@ |
| #include <sound/simple_card.h> |
| #include "common.h" |
| #include "irqs.h" |
| +#include "pm-rmobile.h" |
| #include "sh-gpio.h" |
| |
| /* |
| diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c |
| index 3558ff0f834a..0ece865cbc4d 100644 |
| --- a/arch/arm/mach-shmobile/board-mackerel.c |
| +++ b/arch/arm/mach-shmobile/board-mackerel.c |
| @@ -47,6 +47,7 @@ |
| #include <linux/regulator/fixed.h> |
| #include <linux/regulator/machine.h> |
| #include <linux/smsc911x.h> |
| +#include <linux/sh_clk.h> |
| #include <linux/tca6416_keypad.h> |
| #include <linux/usb/renesas_usbhs.h> |
| #include <linux/dma-mapping.h> |
| @@ -62,6 +63,7 @@ |
| #include <asm/mach-types.h> |
| #include "common.h" |
| #include "irqs.h" |
| +#include "pm-rmobile.h" |
| #include "sh-gpio.h" |
| |
| /* |
| diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h |
| index 5e3c9ec06303..1d1a5fd78b6b 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/r8a7740.h |
| +++ b/arch/arm/mach-shmobile/include/mach/r8a7740.h |
| @@ -19,8 +19,6 @@ |
| #ifndef __ASM_R8A7740_H__ |
| #define __ASM_R8A7740_H__ |
| |
| -#include <mach/pm-rmobile.h> |
| - |
| /* |
| * MD_CKx pin |
| */ |
| diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h |
| index 854a9f0ca040..4ad960d5075b 100644 |
| --- a/arch/arm/mach-shmobile/include/mach/sh7372.h |
| +++ b/arch/arm/mach-shmobile/include/mach/sh7372.h |
| @@ -11,10 +11,6 @@ |
| #ifndef __ASM_SH7372_H__ |
| #define __ASM_SH7372_H__ |
| |
| -#include <linux/sh_clk.h> |
| -#include <linux/pm_domain.h> |
| -#include <mach/pm-rmobile.h> |
| - |
| /* DMA slave IDs */ |
| enum { |
| SHDMA_SLAVE_INVALID, |
| diff --git a/arch/arm/mach-shmobile/pm-r8a7740.c b/arch/arm/mach-shmobile/pm-r8a7740.c |
| index a8a0d0506f13..a0d44d537fa0 100644 |
| --- a/arch/arm/mach-shmobile/pm-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/pm-r8a7740.c |
| @@ -10,8 +10,8 @@ |
| */ |
| #include <linux/console.h> |
| #include <linux/suspend.h> |
| -#include <mach/pm-rmobile.h> |
| #include "common.h" |
| +#include "pm-rmobile.h" |
| |
| #ifdef CONFIG_PM |
| static int r8a7740_pd_a4s_suspend(void) |
| diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c |
| index f710235aff2f..ebdd16e94a84 100644 |
| --- a/arch/arm/mach-shmobile/pm-rmobile.c |
| +++ b/arch/arm/mach-shmobile/pm-rmobile.c |
| @@ -17,7 +17,7 @@ |
| #include <linux/pm.h> |
| #include <linux/pm_clock.h> |
| #include <asm/io.h> |
| -#include <mach/pm-rmobile.h> |
| +#include "pm-rmobile.h" |
| |
| /* SYSC */ |
| #define SPDCR IOMEM(0xe6180008) |
| diff --git a/arch/arm/mach-shmobile/include/mach/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h |
| similarity index 100% |
| rename from arch/arm/mach-shmobile/include/mach/pm-rmobile.h |
| rename to arch/arm/mach-shmobile/pm-rmobile.h |
| diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c |
| index 0b1b4deca03e..7ef9a0126780 100644 |
| --- a/arch/arm/mach-shmobile/pm-sh7372.c |
| +++ b/arch/arm/mach-shmobile/pm-sh7372.c |
| @@ -26,8 +26,8 @@ |
| #include <asm/tlbflush.h> |
| #include <asm/suspend.h> |
| #include <mach/sh7372.h> |
| -#include <mach/pm-rmobile.h> |
| #include "common.h" |
| +#include "pm-rmobile.h" |
| |
| /* DBG */ |
| #define DBGREG1 IOMEM(0xe6100020) |
| diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c |
| index d86a128206b3..10170b3560c2 100644 |
| --- a/arch/arm/mach-shmobile/setup-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/setup-r8a7740.c |
| @@ -32,7 +32,6 @@ |
| #include <linux/sh_timer.h> |
| #include <linux/platform_data/sh_ipmmu.h> |
| #include <mach/r8a7740.h> |
| -#include <mach/pm-rmobile.h> |
| #include <asm/mach-types.h> |
| #include <asm/mach/map.h> |
| #include <asm/mach/arch.h> |
| @@ -40,6 +39,7 @@ |
| #include "common.h" |
| #include "dma-register.h" |
| #include "irqs.h" |
| +#include "pm-rmobile.h" |
| |
| static struct map_desc r8a7740_io_desc[] __initdata = { |
| /* |
| diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c |
| index 8da836a373fe..5571f867c611 100644 |
| --- a/arch/arm/mach-shmobile/setup-sh7372.c |
| +++ b/arch/arm/mach-shmobile/setup-sh7372.c |
| @@ -41,6 +41,7 @@ |
| #include "common.h" |
| #include "dma-register.h" |
| #include "irqs.h" |
| +#include "pm-rmobile.h" |
| |
| static struct map_desc sh7372_io_desc[] __initdata = { |
| /* create a 1:1 entity map for 0xe6xxxxxx |
| -- |
| 2.1.2 |
| |