Browse Source

ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h

Change location of pm-rmobile.h so it can be used as #include "pm-rmobile.h"
instead of the old style #include <mach/pm-rmobile.h>. Also clean up
the sh7372 and sh73a0 header files to get rid of unused include files.

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>
Magnus Damm 11 years ago
parent
commit
6b8b0cb477

+ 1 - 0
arch/arm/mach-shmobile/board-armadillo800eva.c

@@ -61,6 +61,7 @@
 #include <sound/simple_card.h>
 #include <sound/simple_card.h>
 #include "common.h"
 #include "common.h"
 #include "irqs.h"
 #include "irqs.h"
+#include "pm-rmobile.h"
 #include "sh-gpio.h"
 #include "sh-gpio.h"
 
 
 /*
 /*

+ 2 - 0
arch/arm/mach-shmobile/board-mackerel.c

@@ -47,6 +47,7 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/smsc911x.h>
+#include <linux/sh_clk.h>
 #include <linux/tca6416_keypad.h>
 #include <linux/tca6416_keypad.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/dma-mapping.h>
 #include <linux/dma-mapping.h>
@@ -62,6 +63,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach-types.h>
 #include "common.h"
 #include "common.h"
 #include "irqs.h"
 #include "irqs.h"
+#include "pm-rmobile.h"
 #include "sh-gpio.h"
 #include "sh-gpio.h"
 
 
 /*
 /*

+ 0 - 2
arch/arm/mach-shmobile/include/mach/r8a7740.h

@@ -19,8 +19,6 @@
 #ifndef __ASM_R8A7740_H__
 #ifndef __ASM_R8A7740_H__
 #define __ASM_R8A7740_H__
 #define __ASM_R8A7740_H__
 
 
-#include <mach/pm-rmobile.h>
-
 /*
 /*
  * MD_CKx pin
  * MD_CKx pin
  */
  */

+ 0 - 4
arch/arm/mach-shmobile/include/mach/sh7372.h

@@ -11,10 +11,6 @@
 #ifndef __ASM_SH7372_H__
 #ifndef __ASM_SH7372_H__
 #define __ASM_SH7372_H__
 #define __ASM_SH7372_H__
 
 
-#include <linux/sh_clk.h>
-#include <linux/pm_domain.h>
-#include <mach/pm-rmobile.h>
-
 /* DMA slave IDs */
 /* DMA slave IDs */
 enum {
 enum {
 	SHDMA_SLAVE_INVALID,
 	SHDMA_SLAVE_INVALID,

+ 1 - 1
arch/arm/mach-shmobile/pm-r8a7740.c

@@ -10,8 +10,8 @@
  */
  */
 #include <linux/console.h>
 #include <linux/console.h>
 #include <linux/suspend.h>
 #include <linux/suspend.h>
-#include <mach/pm-rmobile.h>
 #include "common.h"
 #include "common.h"
+#include "pm-rmobile.h"
 
 
 #ifdef CONFIG_PM
 #ifdef CONFIG_PM
 static int r8a7740_pd_a4s_suspend(void)
 static int r8a7740_pd_a4s_suspend(void)

+ 1 - 1
arch/arm/mach-shmobile/pm-rmobile.c

@@ -17,7 +17,7 @@
 #include <linux/pm.h>
 #include <linux/pm.h>
 #include <linux/pm_clock.h>
 #include <linux/pm_clock.h>
 #include <asm/io.h>
 #include <asm/io.h>
-#include <mach/pm-rmobile.h>
+#include "pm-rmobile.h"
 
 
 /* SYSC */
 /* SYSC */
 #define SPDCR		IOMEM(0xe6180008)
 #define SPDCR		IOMEM(0xe6180008)

+ 0 - 0
arch/arm/mach-shmobile/include/mach/pm-rmobile.h → arch/arm/mach-shmobile/pm-rmobile.h


+ 1 - 1
arch/arm/mach-shmobile/pm-sh7372.c

@@ -26,8 +26,8 @@
 #include <asm/tlbflush.h>
 #include <asm/tlbflush.h>
 #include <asm/suspend.h>
 #include <asm/suspend.h>
 #include <mach/sh7372.h>
 #include <mach/sh7372.h>
-#include <mach/pm-rmobile.h>
 #include "common.h"
 #include "common.h"
+#include "pm-rmobile.h"
 
 
 /* DBG */
 /* DBG */
 #define DBGREG1 IOMEM(0xe6100020)
 #define DBGREG1 IOMEM(0xe6100020)

+ 1 - 1
arch/arm/mach-shmobile/setup-r8a7740.c

@@ -32,7 +32,6 @@
 #include <linux/sh_timer.h>
 #include <linux/sh_timer.h>
 #include <linux/platform_data/sh_ipmmu.h>
 #include <linux/platform_data/sh_ipmmu.h>
 #include <mach/r8a7740.h>
 #include <mach/r8a7740.h>
-#include <mach/pm-rmobile.h>
 #include <asm/mach-types.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/arch.h>
@@ -40,6 +39,7 @@
 #include "common.h"
 #include "common.h"
 #include "dma-register.h"
 #include "dma-register.h"
 #include "irqs.h"
 #include "irqs.h"
+#include "pm-rmobile.h"
 
 
 static struct map_desc r8a7740_io_desc[] __initdata = {
 static struct map_desc r8a7740_io_desc[] __initdata = {
 	 /*
 	 /*

+ 1 - 0
arch/arm/mach-shmobile/setup-sh7372.c

@@ -41,6 +41,7 @@
 #include "common.h"
 #include "common.h"
 #include "dma-register.h"
 #include "dma-register.h"
 #include "irqs.h"
 #include "irqs.h"
+#include "pm-rmobile.h"
 
 
 static struct map_desc sh7372_io_desc[] __initdata = {
 static struct map_desc sh7372_io_desc[] __initdata = {
 	/* create a 1:1 entity map for 0xe6xxxxxx
 	/* create a 1:1 entity map for 0xe6xxxxxx