projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-shmobile
/
smp-r8a7779.c
diff --git
a/arch/arm/mach-shmobile/smp-r8a7779.c
b/arch/arm/mach-shmobile/smp-r8a7779.c
index
627c1f0
..
3100e35
100644
(file)
--- a/
arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/
arch/arm/mach-shmobile/smp-r8a7779.c
@@
-23,35
+23,38
@@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
-#include <mach/r8a7779.h>
+
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
+#include "common.h"
+#include "pm-rcar.h"
+#include "r8a7779.h"
+
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
-static struct r
8a7779_pm
_ch r8a7779_ch_cpu1 = {
+static struct r
car_sysc
_ch r8a7779_ch_cpu1 = {
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 1, /* ARM1 */
.isr_bit = 1, /* ARM1 */
};
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 1, /* ARM1 */
.isr_bit = 1, /* ARM1 */
};
-static struct r
8a7779_pm
_ch r8a7779_ch_cpu2 = {
+static struct r
car_sysc
_ch r8a7779_ch_cpu2 = {
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 2, /* ARM2 */
.isr_bit = 2, /* ARM2 */
};
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 2, /* ARM2 */
.isr_bit = 2, /* ARM2 */
};
-static struct r
8a7779_pm
_ch r8a7779_ch_cpu3 = {
+static struct r
car_sysc
_ch r8a7779_ch_cpu3 = {
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 3, /* ARM3 */
.isr_bit = 3, /* ARM3 */
};
.chan_offs = 0x40, /* PWRSR0 .. PWRER0 */
.chan_bit = 3, /* ARM3 */
.isr_bit = 3, /* ARM3 */
};
-static struct r
8a7779_pm
_ch *r8a7779_ch_cpu[4] = {
+static struct r
car_sysc
_ch *r8a7779_ch_cpu[4] = {
[1] = &r8a7779_ch_cpu1,
[2] = &r8a7779_ch_cpu2,
[3] = &r8a7779_ch_cpu3,
[1] = &r8a7779_ch_cpu1,
[2] = &r8a7779_ch_cpu2,
[3] = &r8a7779_ch_cpu3,
@@
-67,7
+70,7
@@
void __init r8a7779_register_twd(void)
static int r8a7779_platform_cpu_kill(unsigned int cpu)
{
static int r8a7779_platform_cpu_kill(unsigned int cpu)
{
- struct r
8a7779_pm
_ch *ch = NULL;
+ struct r
car_sysc
_ch *ch = NULL;
int ret = -EIO;
cpu = cpu_logical_map(cpu);
int ret = -EIO;
cpu = cpu_logical_map(cpu);
@@
-76,14
+79,14
@@
static int r8a7779_platform_cpu_kill(unsigned int cpu)
ch = r8a7779_ch_cpu[cpu];
if (ch)
ch = r8a7779_ch_cpu[cpu];
if (ch)
- ret = r
8a7779
_sysc_power_down(ch);
+ ret = r
car
_sysc_power_down(ch);
return ret ? ret : 1;
}
static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
return ret ? ret : 1;
}
static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- struct r
8a7779_pm
_ch *ch = NULL;
+ struct r
car_sysc
_ch *ch = NULL;
unsigned int lcpu = cpu_logical_map(cpu);
int ret;
unsigned int lcpu = cpu_logical_map(cpu);
int ret;
@@
-91,7
+94,7
@@
static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
ch = r8a7779_ch_cpu[lcpu];
if (ch)
ch = r8a7779_ch_cpu[lcpu];
if (ch)
- ret = r
8a7779
_sysc_power_up(ch);
+ ret = r
car
_sysc_power_up(ch);
else
ret = -EIO;
else
ret = -EIO;