8701d8083d
Currently the SCU registers are mapped in SoC-specific code, using
different methods, all involving the static mapping set up from
machine_desc.map_io():
- On emev2, a static (non-identity) mapping is used, with ioremap().
As the static mapping uses the MT_DEVICE type, ioremap() reuses it,
and the returned virtual address is suitable for passing to
shmobile_smp_hook(),
- On sh73a0 and r8a7779, a static identity mapping is used, with the
legacy IOMEM() macro.
As the static mapping uses the MT_DEVICE_NONSHARED type, replacing
IOMEM() by ioremap() would create a new mapping, whose virtual
address cannot be passed to shmobile_smp_hook().
Move the mapping of the SCU registers from SoC-specific code to common
code, always using ioremap(). To work in the absence of a static
mapping, this requires passing the physical SCU base address to
shmobile_smp_hook().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
41 lines
1.2 KiB
C
41 lines
1.2 KiB
C
#ifndef __ARCH_MACH_COMMON_H
|
|
#define __ARCH_MACH_COMMON_H
|
|
|
|
extern void shmobile_init_delay(void);
|
|
extern void shmobile_boot_vector(void);
|
|
extern unsigned long shmobile_boot_fn;
|
|
extern unsigned long shmobile_boot_size;
|
|
extern void shmobile_smp_boot(void);
|
|
extern void shmobile_smp_sleep(void);
|
|
extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
|
|
unsigned long arg);
|
|
extern bool shmobile_smp_cpu_can_disable(unsigned int cpu);
|
|
extern void shmobile_boot_scu(void);
|
|
extern void shmobile_smp_scu_prepare_cpus(phys_addr_t scu_base_phys,
|
|
unsigned int max_cpus);
|
|
extern void shmobile_smp_scu_cpu_die(unsigned int cpu);
|
|
extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
|
|
extern struct platform_suspend_ops shmobile_suspend_ops;
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
int shmobile_suspend_init(void);
|
|
void shmobile_smp_apmu_suspend_init(void);
|
|
#else
|
|
static inline int shmobile_suspend_init(void) { return 0; }
|
|
static inline void shmobile_smp_apmu_suspend_init(void) { }
|
|
#endif
|
|
|
|
#ifdef CONFIG_CPU_FREQ
|
|
int shmobile_cpufreq_init(void);
|
|
#else
|
|
static inline int shmobile_cpufreq_init(void) { return 0; }
|
|
#endif
|
|
|
|
static inline void __init shmobile_init_late(void)
|
|
{
|
|
shmobile_suspend_init();
|
|
shmobile_cpufreq_init();
|
|
}
|
|
|
|
#endif /* __ARCH_MACH_COMMON_H */
|