From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 05/08] ARM: shmobile: Move common.h
Date: Tue, 17 Jun 2014 07:47:37 +0000 [thread overview]
Message-ID: <20140617074737.30008.85029.sendpatchset@w520> (raw)
In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Change location for common.h so it can be used as #include "common.h"
instead of the old style #include <mach/common.h>.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes since V1:
- rebased to v3.16-rc1
arch/arm/mach-shmobile/board-ape6evm-reference.c | 2
arch/arm/mach-shmobile/board-ape6evm.c | 2
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2
arch/arm/mach-shmobile/board-armadillo800eva.c | 2
arch/arm/mach-shmobile/board-bockw-reference.c | 2
arch/arm/mach-shmobile/board-bockw.c | 2
arch/arm/mach-shmobile/board-genmai-reference.c | 2
arch/arm/mach-shmobile/board-genmai.c | 2
arch/arm/mach-shmobile/board-koelsch-reference.c | 2
arch/arm/mach-shmobile/board-koelsch.c | 2
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2
arch/arm/mach-shmobile/board-kzm9g.c | 2
arch/arm/mach-shmobile/board-lager-reference.c | 2
arch/arm/mach-shmobile/board-lager.c | 2
arch/arm/mach-shmobile/board-mackerel.c | 2
arch/arm/mach-shmobile/board-marzen-reference.c | 2
arch/arm/mach-shmobile/board-marzen.c | 2
arch/arm/mach-shmobile/clock-r7s72100.c | 2
arch/arm/mach-shmobile/clock-r8a73a4.c | 2
arch/arm/mach-shmobile/clock-r8a7740.c | 2
arch/arm/mach-shmobile/clock-r8a7778.c | 2
arch/arm/mach-shmobile/clock-r8a7779.c | 2
arch/arm/mach-shmobile/clock-r8a7790.c | 2
arch/arm/mach-shmobile/clock-r8a7791.c | 2
arch/arm/mach-shmobile/clock-sh7372.c | 2
arch/arm/mach-shmobile/clock-sh73a0.c | 2
arch/arm/mach-shmobile/clock.c | 2
arch/arm/mach-shmobile/common.h | 56 ++++++++++++++
arch/arm/mach-shmobile/console.c | 2
arch/arm/mach-shmobile/include/mach/common.h | 56 --------------
arch/arm/mach-shmobile/platsmp-apmu.c | 2
arch/arm/mach-shmobile/platsmp-scu.c | 2
arch/arm/mach-shmobile/platsmp.c | 2
arch/arm/mach-shmobile/pm-r8a7740.c | 2
arch/arm/mach-shmobile/pm-r8a7779.c | 2
arch/arm/mach-shmobile/pm-sh7372.c | 2
arch/arm/mach-shmobile/pm-sh73a0.c | 2
arch/arm/mach-shmobile/setup-emev2.c | 2
arch/arm/mach-shmobile/setup-r7s72100.c | 2
arch/arm/mach-shmobile/setup-r8a73a4.c | 2
arch/arm/mach-shmobile/setup-r8a7740.c | 2
arch/arm/mach-shmobile/setup-r8a7778.c | 2
arch/arm/mach-shmobile/setup-r8a7779.c | 2
arch/arm/mach-shmobile/setup-r8a7790.c | 2
arch/arm/mach-shmobile/setup-r8a7791.c | 2
arch/arm/mach-shmobile/setup-rcar-gen2.c | 2
arch/arm/mach-shmobile/setup-sh7372.c | 2
arch/arm/mach-shmobile/setup-sh73a0.c | 2
arch/arm/mach-shmobile/smp-emev2.c | 2
arch/arm/mach-shmobile/smp-r8a7779.c | 2
arch/arm/mach-shmobile/smp-r8a7790.c | 2
arch/arm/mach-shmobile/smp-r8a7791.c | 2
arch/arm/mach-shmobile/smp-sh73a0.c | 2
53 files changed, 107 insertions(+), 107 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ work/arch/arm/mach-shmobile/board-ape6evm-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
static void __init ape6evm_add_standard_devices(void)
{
--- 0005/arch/arm/mach-shmobile/board-ape6evm.c
+++ work/arch/arm/mach-shmobile/board-ape6evm.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,10 +33,10 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* LEDS */
--- 0001/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ work/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
/*
* CON1 Camera Module
--- 0005/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,7 +45,6 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
@@ -60,6 +59,7 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
#include "sh-gpio.h"
--- 0001/arch/arm/mach-shmobile/board-bockw-reference.c
+++ work/arch/arm/mach-shmobile/board-bockw-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,9 +19,9 @@
*/
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
+#include "common.h"
/*
* see board-bock.c for checking detail of dip-switch
--- 0005/arch/arm/mach-shmobile/board-bockw.c
+++ work/arch/arm/mach-shmobile/board-bockw.c 2014-06-17 16:05:44.000000000 +0900
@@ -35,11 +35,11 @@
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
#include <media/soc_camera.h>
-#include <mach/common.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
#define FPGA 0x18200000
--- 0004/arch/arm/mach-shmobile/board-genmai-reference.c
+++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -20,11 +20,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
/*
* This is a really crude hack to provide clkdev support to platform
--- 0005/arch/arm/mach-shmobile/board-genmai.c
+++ work/arch/arm/mach-shmobile/board-genmai.c 2014-06-17 16:05:44.000000000 +0900
@@ -25,10 +25,10 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* Ether */
--- 0005/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,11 +23,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0005/arch/arm/mach-shmobile/board-koelsch.c
+++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,11 +45,11 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0001/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/input.h>
#include <linux/of_platform.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
static void __init kzm_init(void)
{
--- 0005/arch/arm/mach-shmobile/board-kzm9g.c
+++ work/arch/arm/mach-shmobile/board-kzm9g.c 2014-06-17 16:05:44.000000000 +0900
@@ -44,11 +44,11 @@
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <video/sh_mobile_lcdc.h>
+#include "common.h"
#include "irqs.h"
/*
--- 0005/arch/arm/mach-shmobile/board-lager-reference.c
+++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,11 +22,11 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0005/arch/arm/mach-shmobile/board-lager.c
+++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,7 +45,6 @@
#include <linux/sh_eth.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include <media/soc_camera.h>
#include <asm/mach-types.h>
@@ -57,6 +56,7 @@
#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
/*
--- 0005/arch/arm/mach-shmobile/board-mackerel.c
+++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:05:44.000000000 +0900
@@ -57,10 +57,10 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/common.h>
#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
+#include "common.h"
#include "irqs.h"
#include "sh-gpio.h"
--- 0005/arch/arm/mach-shmobile/board-marzen-reference.c
+++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-06-17 16:06:25.000000000 +0900
@@ -20,9 +20,9 @@
*/
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static void __init marzen_init(void)
--- 0005/arch/arm/mach-shmobile/board-marzen.c
+++ work/arch/arm/mach-shmobile/board-marzen.c 2014-06-17 16:05:44.000000000 +0900
@@ -43,10 +43,10 @@
#include <linux/mfd/tmio.h>
#include <media/soc_camera.h>
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+#include "common.h"
#include "irqs.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
--- 0001/arch/arm/mach-shmobile/clock-r7s72100.c
+++ work/arch/arm/mach-shmobile/clock-r7s72100.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
+#include "common.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
--- 0004/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,7 +22,7 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
+#include "common.h"
#include "clock.h"
#define CPG_BASE 0xe6150000
--- 0004/arch/arm/mach-shmobile/clock-r8a7740.c
+++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include "clock.h"
+#include "common.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
--- 0004/arch/arm/mach-shmobile/clock-r8a7778.c
+++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-06-17 16:05:44.000000000 +0900
@@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
--- 0004/arch/arm/mach-shmobile/clock-r8a7779.c
+++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-06-17 16:06:57.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
/*
* MD1 = 1 MD1 = 0
--- 0004/arch/arm/mach-shmobile/clock-r8a7790.c
+++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0004/arch/arm/mach-shmobile/clock-r8a7791.c
+++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0004/arch/arm/mach-shmobile/clock-sh7372.c
+++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)
--- 0004/arch/arm/mach-shmobile/clock-sh73a0.c
+++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)
--- 0004/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2014-06-17 16:05:44.000000000 +0900
@@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons
#else /* CONFIG_COMMON_CLK */
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{
--- /dev/null
+++ work/arch/arm/mach-shmobile/common.h 2014-06-17 16:05:44.000000000 +0900
@@ -0,0 +1,56 @@
+#ifndef __ARCH_MACH_COMMON_H
+#define __ARCH_MACH_COMMON_H
+
+extern void shmobile_earlytimer_init(void);
+extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
+ unsigned int mult, unsigned int div);
+extern void shmobile_init_delay(void);
+struct twd_local_timer;
+extern void shmobile_setup_console(void);
+extern void shmobile_boot_vector(void);
+extern unsigned long shmobile_boot_fn;
+extern unsigned long shmobile_boot_arg;
+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 int shmobile_smp_cpu_disable(unsigned int cpu);
+extern void shmobile_invalidate_start(void);
+extern void shmobile_boot_scu(void);
+extern void shmobile_smp_scu_prepare_cpus(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 void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus);
+extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
+ struct task_struct *idle);
+extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
+extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
+struct clk;
+extern int shmobile_clk_init(void);
+extern void shmobile_handle_irq_intc(struct pt_regs *);
+extern struct platform_suspend_ops shmobile_suspend_ops;
+struct cpuidle_driver;
+extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
+
+#ifdef CONFIG_SUSPEND
+int shmobile_suspend_init(void);
+#else
+static inline int shmobile_suspend_init(void) { return 0; }
+#endif
+
+#ifdef CONFIG_CPU_IDLE
+int shmobile_cpuidle_init(void);
+#else
+static inline int shmobile_cpuidle_init(void) { return 0; }
+#endif
+
+extern void __iomem *shmobile_scu_base;
+
+static inline void __init shmobile_init_late(void)
+{
+ shmobile_suspend_init();
+ shmobile_cpuidle_init();
+}
+
+#endif /* __ARCH_MACH_COMMON_H */
--- 0001/arch/arm/mach-shmobile/console.c
+++ work/arch/arm/mach-shmobile/console.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <mach/common.h>
#include <asm/mach/map.h>
+#include "common.h"
void __init shmobile_setup_console(void)
{
--- 0001/arch/arm/mach-shmobile/include/mach/common.h
+++ /dev/null 2013-06-03 21:41:10.638032047 +0900
@@ -1,56 +0,0 @@
-#ifndef __ARCH_MACH_COMMON_H
-#define __ARCH_MACH_COMMON_H
-
-extern void shmobile_earlytimer_init(void);
-extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
- unsigned int mult, unsigned int div);
-extern void shmobile_init_delay(void);
-struct twd_local_timer;
-extern void shmobile_setup_console(void);
-extern void shmobile_boot_vector(void);
-extern unsigned long shmobile_boot_fn;
-extern unsigned long shmobile_boot_arg;
-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 int shmobile_smp_cpu_disable(unsigned int cpu);
-extern void shmobile_invalidate_start(void);
-extern void shmobile_boot_scu(void);
-extern void shmobile_smp_scu_prepare_cpus(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 void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus);
-extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
- struct task_struct *idle);
-extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
-extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
-struct clk;
-extern int shmobile_clk_init(void);
-extern void shmobile_handle_irq_intc(struct pt_regs *);
-extern struct platform_suspend_ops shmobile_suspend_ops;
-struct cpuidle_driver;
-extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
-
-#ifdef CONFIG_SUSPEND
-int shmobile_suspend_init(void);
-#else
-static inline int shmobile_suspend_init(void) { return 0; }
-#endif
-
-#ifdef CONFIG_CPU_IDLE
-int shmobile_cpuidle_init(void);
-#else
-static inline int shmobile_cpuidle_init(void) { return 0; }
-#endif
-
-extern void __iomem *shmobile_scu_base;
-
-static inline void __init shmobile_init_late(void)
-{
- shmobile_suspend_init();
- shmobile_cpuidle_init();
-}
-
-#endif /* __ARCH_MACH_COMMON_H */
--- 0001/arch/arm/mach-shmobile/platsmp-apmu.c
+++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2014-06-17 16:05:44.000000000 +0900
@@ -16,7 +16,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
static struct {
void __iomem *iomem;
--- 0001/arch/arm/mach-shmobile/platsmp-scu.c
+++ work/arch/arm/mach-shmobile/platsmp-scu.c 2014-06-17 16:05:44.000000000 +0900
@@ -15,7 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
-#include <mach/common.h>
+#include "common.h"
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
--- 0001/arch/arm/mach-shmobile/platsmp.c
+++ work/arch/arm/mach-shmobile/platsmp.c 2014-06-17 16:05:44.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
extern unsigned long shmobile_smp_fn[];
extern unsigned long shmobile_smp_arg[];
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -11,7 +11,7 @@
#include <linux/console.h>
#include <linux/suspend.h>
#include <mach/pm-rmobile.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_PM
static int r8a7740_pd_a4s_suspend(void)
--- 0001/arch/arm/mach-shmobile/pm-r8a7779.c
+++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,9 +19,9 @@
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
-#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
+#include "common.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/pm-sh7372.c
+++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -25,9 +25,9 @@
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/common.h>
#include <mach/sh7372.h>
#include <mach/pm-rmobile.h>
+#include "common.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
--- 0001/arch/arm/mach-shmobile/pm-sh73a0.c
+++ work/arch/arm/mach-shmobile/pm-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -9,7 +9,7 @@
*/
#include <linux/suspend.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_SUSPEND
static int sh73a0_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-06-17 16:05:44.000000000 +0900
@@ -20,10 +20,10 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
+#include "common.h"
static struct map_desc emev2_io_desc[] __initdata = {
#ifdef CONFIG_SMP
--- 0005/arch/arm/mach-shmobile/setup-r7s72100.c
+++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static struct resource mtu2_resources[] __initdata = {
--- 0005/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,9 +24,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7740.c
+++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/r8a7740.h>
#include <mach/pm-rmobile.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7778.c
+++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-06-17 16:05:44.000000000 +0900
@@ -38,9 +38,9 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
#include <mach/r8a7778.h>
-#include <mach/common.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
#include "irqs.h"
/* SCIF */
--- 0005/arch/arm/mach-shmobile/setup-r8a7779.c
+++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -41,12 +41,12 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
#include "irqs.h"
static struct map_desc r8a7779_io_desc[] __initdata = {
--- 0005/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,9 +26,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7791.c
+++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static const struct resource pfc_resources[] __initconst = {
--- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
+#include "common.h"
#define MODEMR 0xe6160060
--- 0005/arch/arm/mach-shmobile/setup-sh7372.c
+++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -34,11 +34,11 @@
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/sh7372.h>
-#include <mach/common.h>
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-sh73a0.c
+++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0001/arch/arm/mach-shmobile/smp-emev2.c
+++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
+#include "common.h"
#define EMEV2_SCU_BASE 0x1e000000
#define EMEV2_SMU_BASE 0xe0110000
--- 0001/arch/arm/mach-shmobile/smp-r8a7779.c
+++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,13 +23,13 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.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"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
--- 0001/arch/arm/mach-shmobile/smp-r8a7790.c
+++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
+#include "common.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--- 0001/arch/arm/mach-shmobile/smp-r8a7791.c
+++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
+#include "common.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--- 0001/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,10 +22,10 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
#include <mach/sh73a0.h>
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
+#include "common.h"
#define WUPCR IOMEM(0xe6151010)
#define SRESCR IOMEM(0xe6151018)
WARNING: multiple messages have this Message-ID (diff)
From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 05/08] ARM: shmobile: Move common.h
Date: Tue, 17 Jun 2014 16:47:37 +0900 [thread overview]
Message-ID: <20140617074737.30008.85029.sendpatchset@w520> (raw)
In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520>
From: Magnus Damm <damm+renesas@opensource.se>
Change location for common.h so it can be used as #include "common.h"
instead of the old style #include <mach/common.h>.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
Changes since V1:
- rebased to v3.16-rc1
arch/arm/mach-shmobile/board-ape6evm-reference.c | 2
arch/arm/mach-shmobile/board-ape6evm.c | 2
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 2
arch/arm/mach-shmobile/board-armadillo800eva.c | 2
arch/arm/mach-shmobile/board-bockw-reference.c | 2
arch/arm/mach-shmobile/board-bockw.c | 2
arch/arm/mach-shmobile/board-genmai-reference.c | 2
arch/arm/mach-shmobile/board-genmai.c | 2
arch/arm/mach-shmobile/board-koelsch-reference.c | 2
arch/arm/mach-shmobile/board-koelsch.c | 2
arch/arm/mach-shmobile/board-kzm9g-reference.c | 2
arch/arm/mach-shmobile/board-kzm9g.c | 2
arch/arm/mach-shmobile/board-lager-reference.c | 2
arch/arm/mach-shmobile/board-lager.c | 2
arch/arm/mach-shmobile/board-mackerel.c | 2
arch/arm/mach-shmobile/board-marzen-reference.c | 2
arch/arm/mach-shmobile/board-marzen.c | 2
arch/arm/mach-shmobile/clock-r7s72100.c | 2
arch/arm/mach-shmobile/clock-r8a73a4.c | 2
arch/arm/mach-shmobile/clock-r8a7740.c | 2
arch/arm/mach-shmobile/clock-r8a7778.c | 2
arch/arm/mach-shmobile/clock-r8a7779.c | 2
arch/arm/mach-shmobile/clock-r8a7790.c | 2
arch/arm/mach-shmobile/clock-r8a7791.c | 2
arch/arm/mach-shmobile/clock-sh7372.c | 2
arch/arm/mach-shmobile/clock-sh73a0.c | 2
arch/arm/mach-shmobile/clock.c | 2
arch/arm/mach-shmobile/common.h | 56 ++++++++++++++
arch/arm/mach-shmobile/console.c | 2
arch/arm/mach-shmobile/include/mach/common.h | 56 --------------
arch/arm/mach-shmobile/platsmp-apmu.c | 2
arch/arm/mach-shmobile/platsmp-scu.c | 2
arch/arm/mach-shmobile/platsmp.c | 2
arch/arm/mach-shmobile/pm-r8a7740.c | 2
arch/arm/mach-shmobile/pm-r8a7779.c | 2
arch/arm/mach-shmobile/pm-sh7372.c | 2
arch/arm/mach-shmobile/pm-sh73a0.c | 2
arch/arm/mach-shmobile/setup-emev2.c | 2
arch/arm/mach-shmobile/setup-r7s72100.c | 2
arch/arm/mach-shmobile/setup-r8a73a4.c | 2
arch/arm/mach-shmobile/setup-r8a7740.c | 2
arch/arm/mach-shmobile/setup-r8a7778.c | 2
arch/arm/mach-shmobile/setup-r8a7779.c | 2
arch/arm/mach-shmobile/setup-r8a7790.c | 2
arch/arm/mach-shmobile/setup-r8a7791.c | 2
arch/arm/mach-shmobile/setup-rcar-gen2.c | 2
arch/arm/mach-shmobile/setup-sh7372.c | 2
arch/arm/mach-shmobile/setup-sh73a0.c | 2
arch/arm/mach-shmobile/smp-emev2.c | 2
arch/arm/mach-shmobile/smp-r8a7779.c | 2
arch/arm/mach-shmobile/smp-r8a7790.c | 2
arch/arm/mach-shmobile/smp-r8a7791.c | 2
arch/arm/mach-shmobile/smp-sh73a0.c | 2
53 files changed, 107 insertions(+), 107 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ work/arch/arm/mach-shmobile/board-ape6evm-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
static void __init ape6evm_add_standard_devices(void)
{
--- 0005/arch/arm/mach-shmobile/board-ape6evm.c
+++ work/arch/arm/mach-shmobile/board-ape6evm.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,10 +33,10 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* LEDS */
--- 0001/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ work/arch/arm/mach-shmobile/board-armadillo800eva-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,10 +24,10 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
/*
* CON1 Camera Module
--- 0005/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,7 +45,6 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
@@ -60,6 +59,7 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
#include "sh-gpio.h"
--- 0001/arch/arm/mach-shmobile/board-bockw-reference.c
+++ work/arch/arm/mach-shmobile/board-bockw-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,9 +19,9 @@
*/
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
+#include "common.h"
/*
* see board-bock.c for checking detail of dip-switch
--- 0005/arch/arm/mach-shmobile/board-bockw.c
+++ work/arch/arm/mach-shmobile/board-bockw.c 2014-06-17 16:05:44.000000000 +0900
@@ -35,11 +35,11 @@
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
#include <media/soc_camera.h>
-#include <mach/common.h>
#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
#define FPGA 0x18200000
--- 0004/arch/arm/mach-shmobile/board-genmai-reference.c
+++ work/arch/arm/mach-shmobile/board-genmai-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -20,11 +20,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
/*
* This is a really crude hack to provide clkdev support to platform
--- 0005/arch/arm/mach-shmobile/board-genmai.c
+++ work/arch/arm/mach-shmobile/board-genmai.c 2014-06-17 16:05:44.000000000 +0900
@@ -25,10 +25,10 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* Ether */
--- 0005/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,11 +23,11 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7791.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0005/arch/arm/mach-shmobile/board-koelsch.c
+++ work/arch/arm/mach-shmobile/board-koelsch.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,11 +45,11 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0001/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ work/arch/arm/mach-shmobile/board-kzm9g-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/input.h>
#include <linux/of_platform.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+#include "common.h"
static void __init kzm_init(void)
{
--- 0005/arch/arm/mach-shmobile/board-kzm9g.c
+++ work/arch/arm/mach-shmobile/board-kzm9g.c 2014-06-17 16:05:44.000000000 +0900
@@ -44,11 +44,11 @@
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <video/sh_mobile_lcdc.h>
+#include "common.h"
#include "irqs.h"
/*
--- 0005/arch/arm/mach-shmobile/board-lager-reference.c
+++ work/arch/arm/mach-shmobile/board-lager-reference.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,11 +22,11 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
#include "clock.h"
+#include "common.h"
#include "irqs.h"
/* DU */
--- 0005/arch/arm/mach-shmobile/board-lager.c
+++ work/arch/arm/mach-shmobile/board-lager.c 2014-06-17 16:05:44.000000000 +0900
@@ -45,7 +45,6 @@
#include <linux/sh_eth.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include <media/soc_camera.h>
#include <asm/mach-types.h>
@@ -57,6 +56,7 @@
#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+#include "common.h"
#include "irqs.h"
/*
--- 0005/arch/arm/mach-shmobile/board-mackerel.c
+++ work/arch/arm/mach-shmobile/board-mackerel.c 2014-06-17 16:05:44.000000000 +0900
@@ -57,10 +57,10 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/common.h>
#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
+#include "common.h"
#include "irqs.h"
#include "sh-gpio.h"
--- 0005/arch/arm/mach-shmobile/board-marzen-reference.c
+++ work/arch/arm/mach-shmobile/board-marzen-reference.c 2014-06-17 16:06:25.000000000 +0900
@@ -20,9 +20,9 @@
*/
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static void __init marzen_init(void)
--- 0005/arch/arm/mach-shmobile/board-marzen.c
+++ work/arch/arm/mach-shmobile/board-marzen.c 2014-06-17 16:05:44.000000000 +0900
@@ -43,10 +43,10 @@
#include <linux/mfd/tmio.h>
#include <media/soc_camera.h>
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+#include "common.h"
#include "irqs.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
--- 0001/arch/arm/mach-shmobile/clock-r7s72100.c
+++ work/arch/arm/mach-shmobile/clock-r7s72100.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
+#include "common.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
--- 0004/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ work/arch/arm/mach-shmobile/clock-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,7 +22,7 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
+#include "common.h"
#include "clock.h"
#define CPG_BASE 0xe6150000
--- 0004/arch/arm/mach-shmobile/clock-r8a7740.c
+++ work/arch/arm/mach-shmobile/clock-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r8a7740.h>
#include "clock.h"
+#include "common.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
--- 0004/arch/arm/mach-shmobile/clock-r8a7778.c
+++ work/arch/arm/mach-shmobile/clock-r8a7778.c 2014-06-17 16:05:44.000000000 +0900
@@ -39,8 +39,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
#define MSTPCR0 IOMEM(0xffc80030)
#define MSTPCR1 IOMEM(0xffc80034)
--- 0004/arch/arm/mach-shmobile/clock-r8a7779.c
+++ work/arch/arm/mach-shmobile/clock-r8a7779.c 2014-06-17 16:06:57.000000000 +0900
@@ -23,8 +23,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
/*
* MD1 = 1 MD1 = 0
--- 0004/arch/arm/mach-shmobile/clock-r8a7790.c
+++ work/arch/arm/mach-shmobile/clock-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0004/arch/arm/mach-shmobile/clock-r8a7791.c
+++ work/arch/arm/mach-shmobile/clock-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include "clock.h"
+#include "common.h"
/*
* MD EXTAL PLL0 PLL1 PLL3
--- 0004/arch/arm/mach-shmobile/clock-sh7372.c
+++ work/arch/arm/mach-shmobile/clock-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -21,8 +21,8 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
/* SH7372 registers */
#define FRQCRA IOMEM(0xe6150000)
--- 0004/arch/arm/mach-shmobile/clock-sh73a0.c
+++ work/arch/arm/mach-shmobile/clock-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,8 +22,8 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <asm/processor.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
#define FRQCRA IOMEM(0xe6150000)
#define FRQCRB IOMEM(0xe6150004)
--- 0004/arch/arm/mach-shmobile/clock.c
+++ work/arch/arm/mach-shmobile/clock.c 2014-06-17 16:05:44.000000000 +0900
@@ -49,8 +49,8 @@ void __init shmobile_clk_workaround(cons
#else /* CONFIG_COMMON_CLK */
#include <linux/sh_clk.h>
#include <linux/export.h>
-#include <mach/common.h>
#include "clock.h"
+#include "common.h"
unsigned long shmobile_fixed_ratio_clk_recalc(struct clk *clk)
{
--- /dev/null
+++ work/arch/arm/mach-shmobile/common.h 2014-06-17 16:05:44.000000000 +0900
@@ -0,0 +1,56 @@
+#ifndef __ARCH_MACH_COMMON_H
+#define __ARCH_MACH_COMMON_H
+
+extern void shmobile_earlytimer_init(void);
+extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
+ unsigned int mult, unsigned int div);
+extern void shmobile_init_delay(void);
+struct twd_local_timer;
+extern void shmobile_setup_console(void);
+extern void shmobile_boot_vector(void);
+extern unsigned long shmobile_boot_fn;
+extern unsigned long shmobile_boot_arg;
+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 int shmobile_smp_cpu_disable(unsigned int cpu);
+extern void shmobile_invalidate_start(void);
+extern void shmobile_boot_scu(void);
+extern void shmobile_smp_scu_prepare_cpus(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 void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus);
+extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
+ struct task_struct *idle);
+extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
+extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
+struct clk;
+extern int shmobile_clk_init(void);
+extern void shmobile_handle_irq_intc(struct pt_regs *);
+extern struct platform_suspend_ops shmobile_suspend_ops;
+struct cpuidle_driver;
+extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
+
+#ifdef CONFIG_SUSPEND
+int shmobile_suspend_init(void);
+#else
+static inline int shmobile_suspend_init(void) { return 0; }
+#endif
+
+#ifdef CONFIG_CPU_IDLE
+int shmobile_cpuidle_init(void);
+#else
+static inline int shmobile_cpuidle_init(void) { return 0; }
+#endif
+
+extern void __iomem *shmobile_scu_base;
+
+static inline void __init shmobile_init_late(void)
+{
+ shmobile_suspend_init();
+ shmobile_cpuidle_init();
+}
+
+#endif /* __ARCH_MACH_COMMON_H */
--- 0001/arch/arm/mach-shmobile/console.c
+++ work/arch/arm/mach-shmobile/console.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,8 +19,8 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
-#include <mach/common.h>
#include <asm/mach/map.h>
+#include "common.h"
void __init shmobile_setup_console(void)
{
--- 0001/arch/arm/mach-shmobile/include/mach/common.h
+++ /dev/null 2013-06-03 21:41:10.638032047 +0900
@@ -1,56 +0,0 @@
-#ifndef __ARCH_MACH_COMMON_H
-#define __ARCH_MACH_COMMON_H
-
-extern void shmobile_earlytimer_init(void);
-extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
- unsigned int mult, unsigned int div);
-extern void shmobile_init_delay(void);
-struct twd_local_timer;
-extern void shmobile_setup_console(void);
-extern void shmobile_boot_vector(void);
-extern unsigned long shmobile_boot_fn;
-extern unsigned long shmobile_boot_arg;
-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 int shmobile_smp_cpu_disable(unsigned int cpu);
-extern void shmobile_invalidate_start(void);
-extern void shmobile_boot_scu(void);
-extern void shmobile_smp_scu_prepare_cpus(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 void shmobile_smp_apmu_prepare_cpus(unsigned int max_cpus);
-extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
- struct task_struct *idle);
-extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
-extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
-struct clk;
-extern int shmobile_clk_init(void);
-extern void shmobile_handle_irq_intc(struct pt_regs *);
-extern struct platform_suspend_ops shmobile_suspend_ops;
-struct cpuidle_driver;
-extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
-
-#ifdef CONFIG_SUSPEND
-int shmobile_suspend_init(void);
-#else
-static inline int shmobile_suspend_init(void) { return 0; }
-#endif
-
-#ifdef CONFIG_CPU_IDLE
-int shmobile_cpuidle_init(void);
-#else
-static inline int shmobile_cpuidle_init(void) { return 0; }
-#endif
-
-extern void __iomem *shmobile_scu_base;
-
-static inline void __init shmobile_init_late(void)
-{
- shmobile_suspend_init();
- shmobile_cpuidle_init();
-}
-
-#endif /* __ARCH_MACH_COMMON_H */
--- 0001/arch/arm/mach-shmobile/platsmp-apmu.c
+++ work/arch/arm/mach-shmobile/platsmp-apmu.c 2014-06-17 16:05:44.000000000 +0900
@@ -16,7 +16,7 @@
#include <asm/cacheflush.h>
#include <asm/cp15.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
static struct {
void __iomem *iomem;
--- 0001/arch/arm/mach-shmobile/platsmp-scu.c
+++ work/arch/arm/mach-shmobile/platsmp-scu.c 2014-06-17 16:05:44.000000000 +0900
@@ -15,7 +15,7 @@
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
-#include <mach/common.h>
+#include "common.h"
static int shmobile_smp_scu_notifier_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
--- 0001/arch/arm/mach-shmobile/platsmp.c
+++ work/arch/arm/mach-shmobile/platsmp.c 2014-06-17 16:05:44.000000000 +0900
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
+#include "common.h"
extern unsigned long shmobile_smp_fn[];
extern unsigned long shmobile_smp_arg[];
--- 0001/arch/arm/mach-shmobile/pm-r8a7740.c
+++ work/arch/arm/mach-shmobile/pm-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -11,7 +11,7 @@
#include <linux/console.h>
#include <linux/suspend.h>
#include <mach/pm-rmobile.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_PM
static int r8a7740_pd_a4s_suspend(void)
--- 0001/arch/arm/mach-shmobile/pm-r8a7779.c
+++ work/arch/arm/mach-shmobile/pm-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -19,9 +19,9 @@
#include <linux/interrupt.h>
#include <linux/console.h>
#include <asm/io.h>
-#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7779.h>
+#include "common.h"
/* SYSC */
#define SYSCIER 0x0c
--- 0001/arch/arm/mach-shmobile/pm-sh7372.c
+++ work/arch/arm/mach-shmobile/pm-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -25,9 +25,9 @@
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/common.h>
#include <mach/sh7372.h>
#include <mach/pm-rmobile.h>
+#include "common.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
--- 0001/arch/arm/mach-shmobile/pm-sh73a0.c
+++ work/arch/arm/mach-shmobile/pm-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -9,7 +9,7 @@
*/
#include <linux/suspend.h>
-#include <mach/common.h>
+#include "common.h"
#ifdef CONFIG_SUSPEND
static int sh73a0_enter_suspend(suspend_state_t suspend_state)
--- 0001/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2014-06-17 16:05:44.000000000 +0900
@@ -20,10 +20,10 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/of_platform.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
+#include "common.h"
static struct map_desc emev2_io_desc[] __initdata = {
#ifdef CONFIG_SMP
--- 0005/arch/arm/mach-shmobile/setup-r7s72100.c
+++ work/arch/arm/mach-shmobile/setup-r7s72100.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r7s72100.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static struct resource mtu2_resources[] __initdata = {
--- 0005/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ work/arch/arm/mach-shmobile/setup-r8a73a4.c 2014-06-17 16:05:44.000000000 +0900
@@ -24,9 +24,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a73a4.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7740.c
+++ work/arch/arm/mach-shmobile/setup-r8a7740.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/r8a7740.h>
#include <mach/pm-rmobile.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7778.c
+++ work/arch/arm/mach-shmobile/setup-r8a7778.c 2014-06-17 16:05:44.000000000 +0900
@@ -38,9 +38,9 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
#include <mach/r8a7778.h>
-#include <mach/common.h>
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
#include "irqs.h"
/* SCIF */
--- 0005/arch/arm/mach-shmobile/setup-r8a7779.c
+++ work/arch/arm/mach-shmobile/setup-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -41,12 +41,12 @@
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
#include <mach/r8a7779.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/hardware/cache-l2x0.h>
+#include "common.h"
#include "irqs.h"
static struct map_desc r8a7779_io_desc[] __initdata = {
--- 0005/arch/arm/mach-shmobile/setup-r8a7790.c
+++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,9 +26,9 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a7790.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-r8a7791.c
+++ work/arch/arm/mach-shmobile/setup-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -26,10 +26,10 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
+#include "common.h"
#include "irqs.h"
static const struct resource pfc_resources[] __initconst = {
--- 0001/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ work/arch/arm/mach-shmobile/setup-rcar-gen2.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,9 +22,9 @@
#include <linux/clocksource.h>
#include <linux/io.h>
#include <linux/kernel.h>
-#include <mach/common.h>
#include <mach/rcar-gen2.h>
#include <asm/mach/arch.h>
+#include "common.h"
#define MODEMR 0xe6160060
--- 0005/arch/arm/mach-shmobile/setup-sh7372.c
+++ work/arch/arm/mach-shmobile/setup-sh7372.c 2014-06-17 16:05:44.000000000 +0900
@@ -34,11 +34,11 @@
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/sh7372.h>
-#include <mach/common.h>
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0005/arch/arm/mach-shmobile/setup-sh73a0.c
+++ work/arch/arm/mach-shmobile/setup-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -33,11 +33,11 @@
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
#include <mach/sh73a0.h>
-#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+#include "common.h"
#include "dma-register.h"
#include "irqs.h"
--- 0001/arch/arm/mach-shmobile/smp-emev2.c
+++ work/arch/arm/mach-shmobile/smp-emev2.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,9 +23,9 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
+#include "common.h"
#define EMEV2_SCU_BASE 0x1e000000
#define EMEV2_SMU_BASE 0xe0110000
--- 0001/arch/arm/mach-shmobile/smp-r8a7779.c
+++ work/arch/arm/mach-shmobile/smp-r8a7779.c 2014-06-17 16:05:44.000000000 +0900
@@ -23,13 +23,13 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.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"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
--- 0001/arch/arm/mach-shmobile/smp-r8a7790.c
+++ work/arch/arm/mach-shmobile/smp-r8a7790.c 2014-06-17 16:05:44.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
#include <mach/pm-rcar.h>
#include <mach/r8a7790.h>
+#include "common.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--- 0001/arch/arm/mach-shmobile/smp-r8a7791.c
+++ work/arch/arm/mach-shmobile/smp-r8a7791.c 2014-06-17 16:05:44.000000000 +0900
@@ -18,9 +18,9 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <asm/smp_plat.h>
-#include <mach/common.h>
#include <mach/r8a7791.h>
#include <mach/rcar-gen2.h>
+#include "common.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--- 0001/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2014-06-17 16:05:44.000000000 +0900
@@ -22,10 +22,10 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/common.h>
#include <mach/sh73a0.h>
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
+#include "common.h"
#define WUPCR IOMEM(0xe6151010)
#define SRESCR IOMEM(0xe6151018)
next prev parent reply other threads:[~2014-06-17 7:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-17 7:46 [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Magnus Damm
2014-06-17 7:46 ` Magnus Damm
2014-06-17 7:47 ` [PATCH v2 01/08] ARM: shmobile: Move intc.h, cleanup sh_intc.h usage Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-17 7:47 ` [PATCH v2 02/08] ARM: shmobile: Move dma-register.h Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-17 7:47 ` [PATCH v2 03/08] ARM: shmobile: Move clock.h Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-17 7:47 ` Magnus Damm [this message]
2014-06-17 7:47 ` [PATCH v2 05/08] ARM: shmobile: Move common.h Magnus Damm
2014-06-17 7:47 ` [PATCH v2 06/08] ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-17 7:47 ` [PATCH v2 07/08] ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-17 7:48 ` [PATCH v2 08/08] ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case Magnus Damm
2014-06-17 7:48 ` Magnus Damm
2014-06-17 11:05 ` [PATCH v2 00/08] ARM: shmobile: Rework include path V2 Arnd Bergmann
2014-06-17 11:05 ` Arnd Bergmann
2014-06-17 12:21 ` Simon Horman
2014-06-17 12:21 ` Simon Horman
2014-06-17 7:47 [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl Magnus Damm
2014-06-17 7:47 ` Magnus Damm
2014-06-18 14:55 ` Simon Horman
2014-06-18 14:55 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140617074737.30008.85029.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.