Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 585c09df authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

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: default avatarMagnus Damm <damm+renesas@opensource.se>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 6b8b0cb4

arch/arm/mach-shmobile/include/mach/r8a7779.h

+0 −12
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-shmobile/pm-r8a7779.c

+12 −1
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-shmobile/pm-r8a7790.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-shmobile/pm-rcar.c

+1 −1
Original line number Diff line number Diff line
@@ -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