redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Magnus Damm 2014-06-17 16:47:53 +09:00 committed by Simon Horman
parent 6b8b0cb477
commit 585c09df37
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-shmobile/include/mach/r8a7779.h
View File

@ -2,8 +2,6 @@
#define __ASM_R8A7779_H__
#include <linux/sh_clk.h>
#include <linux/pm_domain.h>
#include <mach/pm-rcar.h>
/* HPB-DMA slave IDs */
enum {
@ -12,16 +10,6 @@ enum {
HPBDMA_SLAVE_SDHI0_RX,
};
struct r8a7779_pm_domain {
struct generic_pm_domain genpd;
struct rcar_sysc_ch ch;
};
static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
{
return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
}
extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq_extpin(int irlm);
extern void r8a7779_init_irq_extpin_dt(int irlm);

13
arch/arm/mach-shmobile/pm-r8a7779.c
View File

@ -13,20 +13,31 @@
#include <linux/suspend.h>
#include <linux/err.h>
#include <linux/pm_clock.h>
#include <linux/pm_domain.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
#include "common.h"
#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c
#define SYSCIMR 0x10
struct r8a7779_pm_domain {
struct generic_pm_domain genpd;
struct rcar_sysc_ch ch;
};
static inline struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d)
{
return &container_of(d, struct r8a7779_pm_domain, genpd)->ch;
}
#if defined(CONFIG_PM) || defined(CONFIG_SMP)
static void __init r8a7779_sysc_init(void)

2
arch/arm/mach-shmobile/pm-r8a7790.c
View File

@ -12,8 +12,8 @@
#include <linux/kernel.h>
#include <asm/io.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
#include "pm-rcar.h"
/* SYSC */
#define SYSCIER 0x0c

2
arch/arm/mach-shmobile/pm-rcar.c
View File

@ -13,7 +13,7 @@
#include <linux/mm.h>
#include <linux/spinlock.h>
#include <asm/io.h>
#include <mach/pm-rcar.h>
#include "pm-rcar.h"
/* SYSC */
#define SYSCSR 0x00

0
arch/arm/mach-shmobile/include/mach/pm-rcar.h → arch/arm/mach-shmobile/pm-rcar.h
View File

2
arch/arm/mach-shmobile/smp-r8a7779.c
View File

@ -23,13 +23,13 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <mach/pm-rcar.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 "common.h"
#include "pm-rcar.h"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000

2
arch/arm/mach-shmobile/smp-r8a7790.c
View File

@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
#include "common.h"
#include "pm-rcar.h"
#define RST 0xe6160000
#define CA15BAR 0x0020