diff options
Diffstat (limited to 'arch/arm/mach-shmobile/smp-r8a7779.c')
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7779.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c index 627c1f0d9478..e7a3201473d0 100644 --- a/arch/arm/mach-shmobile/smp-r8a7779.c +++ b/arch/arm/mach-shmobile/smp-r8a7779.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <mach/common.h> | 26 | #include <mach/common.h> |
27 | #include <mach/pm-rcar.h> | ||
27 | #include <mach/r8a7779.h> | 28 | #include <mach/r8a7779.h> |
28 | #include <asm/cacheflush.h> | 29 | #include <asm/cacheflush.h> |
29 | #include <asm/smp_plat.h> | 30 | #include <asm/smp_plat.h> |
@@ -33,25 +34,25 @@ | |||
33 | #define AVECR IOMEM(0xfe700040) | 34 | #define AVECR IOMEM(0xfe700040) |
34 | #define R8A7779_SCU_BASE 0xf0000000 | 35 | #define R8A7779_SCU_BASE 0xf0000000 |
35 | 36 | ||
36 | static struct r8a7779_pm_ch r8a7779_ch_cpu1 = { | 37 | static struct rcar_sysc_ch r8a7779_ch_cpu1 = { |
37 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ | 38 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ |
38 | .chan_bit = 1, /* ARM1 */ | 39 | .chan_bit = 1, /* ARM1 */ |
39 | .isr_bit = 1, /* ARM1 */ | 40 | .isr_bit = 1, /* ARM1 */ |
40 | }; | 41 | }; |
41 | 42 | ||
42 | static struct r8a7779_pm_ch r8a7779_ch_cpu2 = { | 43 | static struct rcar_sysc_ch r8a7779_ch_cpu2 = { |
43 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ | 44 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ |
44 | .chan_bit = 2, /* ARM2 */ | 45 | .chan_bit = 2, /* ARM2 */ |
45 | .isr_bit = 2, /* ARM2 */ | 46 | .isr_bit = 2, /* ARM2 */ |
46 | }; | 47 | }; |
47 | 48 | ||
48 | static struct r8a7779_pm_ch r8a7779_ch_cpu3 = { | 49 | static struct rcar_sysc_ch r8a7779_ch_cpu3 = { |
49 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ | 50 | .chan_offs = 0x40, /* PWRSR0 .. PWRER0 */ |
50 | .chan_bit = 3, /* ARM3 */ | 51 | .chan_bit = 3, /* ARM3 */ |
51 | .isr_bit = 3, /* ARM3 */ | 52 | .isr_bit = 3, /* ARM3 */ |
52 | }; | 53 | }; |
53 | 54 | ||
54 | static struct r8a7779_pm_ch *r8a7779_ch_cpu[4] = { | 55 | static struct rcar_sysc_ch *r8a7779_ch_cpu[4] = { |
55 | [1] = &r8a7779_ch_cpu1, | 56 | [1] = &r8a7779_ch_cpu1, |
56 | [2] = &r8a7779_ch_cpu2, | 57 | [2] = &r8a7779_ch_cpu2, |
57 | [3] = &r8a7779_ch_cpu3, | 58 | [3] = &r8a7779_ch_cpu3, |
@@ -67,7 +68,7 @@ void __init r8a7779_register_twd(void) | |||
67 | 68 | ||
68 | static int r8a7779_platform_cpu_kill(unsigned int cpu) | 69 | static int r8a7779_platform_cpu_kill(unsigned int cpu) |
69 | { | 70 | { |
70 | struct r8a7779_pm_ch *ch = NULL; | 71 | struct rcar_sysc_ch *ch = NULL; |
71 | int ret = -EIO; | 72 | int ret = -EIO; |
72 | 73 | ||
73 | cpu = cpu_logical_map(cpu); | 74 | cpu = cpu_logical_map(cpu); |
@@ -76,14 +77,14 @@ static int r8a7779_platform_cpu_kill(unsigned int cpu) | |||
76 | ch = r8a7779_ch_cpu[cpu]; | 77 | ch = r8a7779_ch_cpu[cpu]; |
77 | 78 | ||
78 | if (ch) | 79 | if (ch) |
79 | ret = r8a7779_sysc_power_down(ch); | 80 | ret = rcar_sysc_power_down(ch); |
80 | 81 | ||
81 | return ret ? ret : 1; | 82 | return ret ? ret : 1; |
82 | } | 83 | } |
83 | 84 | ||
84 | static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle) | 85 | static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle) |
85 | { | 86 | { |
86 | struct r8a7779_pm_ch *ch = NULL; | 87 | struct rcar_sysc_ch *ch = NULL; |
87 | unsigned int lcpu = cpu_logical_map(cpu); | 88 | unsigned int lcpu = cpu_logical_map(cpu); |
88 | int ret; | 89 | int ret; |
89 | 90 | ||
@@ -91,7 +92,7 @@ static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle) | |||
91 | ch = r8a7779_ch_cpu[lcpu]; | 92 | ch = r8a7779_ch_cpu[lcpu]; |
92 | 93 | ||
93 | if (ch) | 94 | if (ch) |
94 | ret = r8a7779_sysc_power_up(ch); | 95 | ret = rcar_sysc_power_up(ch); |
95 | else | 96 | else |
96 | ret = -EIO; | 97 | ret = -EIO; |
97 | 98 | ||