diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-17 03:47:53 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 04:09:40 -0400 |
| commit | 585c09df3738d4f72cee36eb0b975351fd9a339a (patch) | |
| tree | 450567076efe30cfebb8d014f96c26a5314bb44e /arch/arm/mach-shmobile/pm-r8a7779.c | |
| parent | 6b8b0cb477b3e77721982effae3415f3c5f58fee (diff) | |
ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
Change location of pm-rcar.h so it can be used as #include "pm-rcar.h"
instead of the old style #include <mach/pm-rcar.h>. Also clean up
the r8a7779 case to move some unused header file cruft into a C
file.
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>
Diffstat (limited to 'arch/arm/mach-shmobile/pm-r8a7779.c')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7779.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index 2b79bacd9dcb..f0f36cb5ffe7 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c | |||
| @@ -13,20 +13,31 @@ | |||
| 13 | #include <linux/suspend.h> | 13 | #include <linux/suspend.h> |
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | #include <linux/pm_clock.h> | 15 | #include <linux/pm_clock.h> |
| 16 | #include <linux/pm_domain.h> | ||
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 17 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 18 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 20 | #include <linux/console.h> | 21 | #include <linux/console.h> |
| 21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 22 | #include <mach/pm-rcar.h> | ||
| 23 | #include <mach/r8a7779.h> | 23 | #include <mach/r8a7779.h> |
| 24 | #include "common.h" | 24 | #include "common.h" |
| 25 | #include "pm-rcar.h" | ||
| 25 | 26 | ||
| 26 | /* SYSC */ | 27 | /* SYSC */ |
| 27 | #define SYSCIER 0x0c | 28 | #define SYSCIER 0x0c |
| 28 | #define SYSCIMR 0x10 | 29 | #define SYSCIMR 0x10 |
| 29 | 30 | ||
| 31 | struct r8a7779_pm_domain { | ||
| 32 | struct generic_pm_domain genpd; | ||
| 33 | struct rcar_sysc_ch ch; | ||
| 34 | }; | ||
| 35 | |||
| 36 | static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) | ||
| 37 | { | ||
| 38 | return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; | ||
| 39 | } | ||
| 40 | |||
| 30 | #if defined(CONFIG_PM) || defined(CONFIG_SMP) | 41 | #if defined(CONFIG_PM) || defined(CONFIG_SMP) |
| 31 | 42 | ||
| 32 | static void __init r8a7779_sysc_init(void) | 43 | static void __init r8a7779_sysc_init(void) |